From 5f821ef6d7dbdafb2552499987c737636767bf70 Mon Sep 17 00:00:00 2001
From: AlasdairSwan <aswan@edx.org>
Date: Mon, 14 May 2018 14:22:04 -0400
Subject: [PATCH] LEARNER-5273 Update how the mobile menu interacts with the
cookie policy banner
---
lms/static/sass/_header.scss | 12 ++++++++++++
package-lock.json | 6 +++---
package.json | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/lms/static/sass/_header.scss b/lms/static/sass/_header.scss
index bcff51bfb55..bb4e6d415db 100644
--- a/lms/static/sass/_header.scss
+++ b/lms/static/sass/_header.scss
@@ -6,6 +6,7 @@
.global-header {
box-sizing: border-box;
width: 100%;
+ position: relative;
overflow: hidden;
padding-bottom: $baseline/2;
border-bottom: 1px solid theme-color("primary");
@@ -13,6 +14,10 @@
background: theme-color("inverse");
line-height: 1.5;
+ @include media-breakpoint-up(lg) {
+ position: inherit;
+ }
+
/*
Logo and course identification block
*/
@@ -66,6 +71,12 @@
}
}
+ .edx-cookie-banner-wrapper {
+ .edx-cookie-banner {
+ min-width: 0;
+ }
+ }
+
/*
Main navigation buttons for Courses, programs, profile and explore buttons.
@@ -241,6 +252,7 @@
@include media-breakpoint-down(md) {
.main-header {
height: $header-logo-height;
+ position: inherit;
}
// Display the menu icon and allow for transition to an X on click
diff --git a/package-lock.json b/package-lock.json
index aed17ff93f3..57846c08983 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@edx/cookie-policy-banner": {
- "version": "1.1.7",
- "resolved": "https://registry.npmjs.org/@edx/cookie-policy-banner/-/cookie-policy-banner-1.1.7.tgz",
- "integrity": "sha512-Zzyg8LHjWFQrc8xMR3vJEMgKtMiHdiZ8BuwnLFhc4AUsVVzIBIYsbgSf7gXr4XC+0WRcT4uoKcMaTJ5xitWaHw==",
+ "version": "1.1.8",
+ "resolved": "https://registry.npmjs.org/@edx/cookie-policy-banner/-/cookie-policy-banner-1.1.8.tgz",
+ "integrity": "sha512-vDofWvpEZTCKJA9Ehg+y/EEEtdeEhcUnIIcg9WW8NLYVHcTpbTuKHwi9w63tY5bRyOyJ+KS4pemFQRFM7C5Qjw==",
"requires": {
"@edx/edx-bootstrap": "0.4.3",
"@edx/paragon": "2.6.4",
diff --git a/package.json b/package.json
index feddfef3c0b..21809280236 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "edx",
"version": "0.1.0",
"dependencies": {
- "@edx/cookie-policy-banner": "1.1.7",
+ "@edx/cookie-policy-banner": "1.1.8",
"@edx/edx-bootstrap": "0.4.3",
"@edx/paragon": "2.6.4",
"@edx/studio-frontend": "1.9.9",
--
GitLab