aboutsummaryrefslogtreecommitdiffstats
path: root/site/static
diff options
context:
space:
mode:
authorWalt Miner <wminer@linuxfoundation.org>2019-08-06 08:32:23 -0500
committerGitHub <noreply@github.com>2019-08-06 08:32:23 -0500
commit3b0d13c64f33a034ffeeedb97389a7526147b415 (patch)
treeb177ad7b46004a97de8f31a33d884b2ec20c8c1f /site/static
parent9250191725be32377574351e889cc9b860f260fb (diff)
parent035c8682f2851e0300c5fcace507e9823a24cdc8 (diff)
Merge pull request #6 from glunardi/master
Fixes SPEC-2317. Updates screen widths, hides search when needed
Diffstat (limited to 'site/static')
-rw-r--r--site/static/styles/scss/bootstrap/_navbar.scss6
-rw-r--r--site/static/styles/scss/bootstrap/_variables.scss6
2 files changed, 9 insertions, 3 deletions
diff --git a/site/static/styles/scss/bootstrap/_navbar.scss b/site/static/styles/scss/bootstrap/_navbar.scss
index 11e5c01..40ac898 100644
--- a/site/static/styles/scss/bootstrap/_navbar.scss
+++ b/site/static/styles/scss/bootstrap/_navbar.scss
@@ -60,6 +60,8 @@
overflow-y: auto;
}
+ .nav_bar_right { display: none; }
+
@media (min-width: $grid-float-breakpoint) {
width: auto;
border-top: 0;
@@ -76,6 +78,10 @@
overflow-y: visible;
}
+ @media (min-width: $screen-lg-min) {
+ .nav_bar_right { display: block; }
+ }
+
// Undo the collapse side padding for navbars with containers to ensure
// alignment of right-aligned contents.
.navbar-fixed-top &,
diff --git a/site/static/styles/scss/bootstrap/_variables.scss b/site/static/styles/scss/bootstrap/_variables.scss
index e049685..cc8434e 100644
--- a/site/static/styles/scss/bootstrap/_variables.scss
+++ b/site/static/styles/scss/bootstrap/_variables.scss
@@ -297,21 +297,21 @@ $screen-phone: $screen-xs-min !default;
// Small screen / tablet
//** Deprecated `$screen-sm` as of v3.0.1
-$screen-sm: 768px !default;
+$screen-sm: 1056px !default;
$screen-sm-min: $screen-sm !default;
//** Deprecated `$screen-tablet` as of v3.0.1
$screen-tablet: $screen-sm-min !default;
// Medium screen / desktop
//** Deprecated `$screen-md` as of v3.0.1
-$screen-md: 992px !default;
+$screen-md: 1056px !default;
$screen-md-min: $screen-md !default;
//** Deprecated `$screen-desktop` as of v3.0.1
$screen-desktop: $screen-md-min !default;
// Large screen / wide desktop
//** Deprecated `$screen-lg` as of v3.0.1
-$screen-lg: 1200px !default;
+$screen-lg: 1371px !default;
$screen-lg-min: $screen-lg !default;
//** Deprecated `$screen-lg-desktop` as of v3.0.1
$screen-lg-desktop: $screen-lg-min !default;