summaryrefslogtreecommitdiff
path: root/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss
diff options
context:
space:
mode:
Diffstat (limited to 'xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss')
-rw-r--r--xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss156
1 files changed, 75 insertions, 81 deletions
diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss
index 11e5c01..5d9093a 100644
--- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss
+++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss
@@ -48,11 +48,11 @@
// content for the user's viewport.
.navbar-collapse {
- overflow-x: visible;
padding-right: $navbar-padding-horizontal;
- padding-left: $navbar-padding-horizontal;
+ padding-left: $navbar-padding-horizontal;
+ overflow-x: visible;
border-top: 1px solid transparent;
- box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
@include clearfix;
-webkit-overflow-scrolling: touch;
@@ -81,8 +81,8 @@
.navbar-fixed-top &,
.navbar-static-top &,
.navbar-fixed-bottom & {
- padding-left: 0;
padding-right: 0;
+ padding-left: 0;
}
}
}
@@ -96,6 +96,27 @@
max-height: 200px;
}
}
+
+ // Fix the top/bottom navbars when screen real estate supports it
+ position: fixed;
+ right: 0;
+ left: 0;
+ z-index: $zindex-navbar-fixed;
+
+ // Undo the rounded corners
+ @media (min-width: $grid-float-breakpoint) {
+ border-radius: 0;
+ }
+}
+
+.navbar-fixed-top {
+ top: 0;
+ border-width: 0 0 1px;
+}
+.navbar-fixed-bottom {
+ bottom: 0;
+ margin-bottom: 0; // override .navbar defaults
+ border-width: 1px 0 0;
}
@@ -108,11 +129,11 @@
> .navbar-header,
> .navbar-collapse {
margin-right: -$navbar-padding-horizontal;
- margin-left: -$navbar-padding-horizontal;
+ margin-left: -$navbar-padding-horizontal;
@media (min-width: $grid-float-breakpoint) {
margin-right: 0;
- margin-left: 0;
+ margin-left: 0;
}
}
}
@@ -134,38 +155,15 @@
}
}
-// Fix the top/bottom navbars when screen real estate supports it
-.navbar-fixed-top,
-.navbar-fixed-bottom {
- position: fixed;
- right: 0;
- left: 0;
- z-index: $zindex-navbar-fixed;
-
- // Undo the rounded corners
- @media (min-width: $grid-float-breakpoint) {
- border-radius: 0;
- }
-}
-.navbar-fixed-top {
- top: 0;
- border-width: 0 0 1px;
-}
-.navbar-fixed-bottom {
- bottom: 0;
- margin-bottom: 0; // override .navbar defaults
- border-width: 1px 0 0;
-}
-
// Brand/project name
.navbar-brand {
float: left;
+ height: $navbar-height;
padding: $navbar-padding-vertical $navbar-padding-horizontal;
font-size: $font-size-large;
line-height: $line-height-computed;
- height: $navbar-height;
&:hover,
&:focus {
@@ -193,8 +191,8 @@
.navbar-toggle {
position: relative;
float: right;
- margin-right: $navbar-padding-horizontal;
padding: 9px 10px;
+ margin-right: $navbar-padding-horizontal;
@include navbar-vertical-align(34px);
background-color: transparent;
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
@@ -233,7 +231,7 @@
margin: ($navbar-padding-vertical / 2) (-$navbar-padding-horizontal);
> li > a {
- padding-top: 10px;
+ padding-top: 10px;
padding-bottom: 10px;
line-height: $line-height-computed;
}
@@ -270,7 +268,7 @@
> li {
float: left;
> a {
- padding-top: $navbar-padding-vertical;
+ padding-top: $navbar-padding-vertical;
padding-bottom: $navbar-padding-vertical;
}
}
@@ -284,12 +282,12 @@
// our navbars.
.navbar-form {
- margin-left: -$navbar-padding-horizontal;
- margin-right: -$navbar-padding-horizontal;
padding: 10px $navbar-padding-horizontal;
+ margin-right: -$navbar-padding-horizontal;
+ margin-left: -$navbar-padding-horizontal;
border-top: 1px solid transparent;
border-bottom: 1px solid transparent;
- $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+ $shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
@include box-shadow($shadow);
// Mixin behavior for optimum display
@@ -311,11 +309,11 @@
// Undo 100% width for pull classes
@media (min-width: $grid-float-breakpoint) {
width: auto;
- border: 0;
- margin-left: 0;
- margin-right: 0;
padding-top: 0;
padding-bottom: 0;
+ margin-right: 0;
+ margin-left: 0;
+ border: 0;
@include box-shadow(none);
}
}
@@ -361,8 +359,8 @@
@media (min-width: $grid-float-breakpoint) {
float: left;
- margin-left: $navbar-padding-horizontal;
margin-right: $navbar-padding-horizontal;
+ margin-left: $navbar-padding-horizontal;
}
}
@@ -437,33 +435,15 @@
background-color: $navbar-default-link-disabled-bg;
}
}
- }
-
- .navbar-toggle {
- border-color: $navbar-default-toggle-border-color;
- &:hover,
- &:focus {
- background-color: $navbar-default-toggle-hover-bg;
- }
- .icon-bar {
- background-color: $navbar-default-toggle-icon-bar-bg;
- }
- }
- .navbar-collapse,
- .navbar-form {
- border-color: $navbar-default-border;
- }
-
- // Dropdown menu items
- .navbar-nav {
+ // Dropdown menu items
// Remove background color from open dropdown
> .open > a {
&,
&:hover,
&:focus {
- background-color: $navbar-default-link-active-bg;
color: $navbar-default-link-active-color;
+ background-color: $navbar-default-link-active-bg;
}
}
@@ -498,6 +478,22 @@
}
}
+ .navbar-toggle {
+ border-color: $navbar-default-toggle-border-color;
+ &:hover,
+ &:focus {
+ background-color: $navbar-default-toggle-hover-bg;
+ }
+ .icon-bar {
+ background-color: $navbar-default-toggle-icon-bar-bg;
+ }
+ }
+
+ .navbar-collapse,
+ .navbar-form {
+ border-color: $navbar-default-border;
+ }
+
// Links in navbars
//
@@ -571,33 +567,14 @@
background-color: $navbar-inverse-link-disabled-bg;
}
}
- }
-
- // Darken the responsive nav toggle
- .navbar-toggle {
- border-color: $navbar-inverse-toggle-border-color;
- &:hover,
- &:focus {
- background-color: $navbar-inverse-toggle-hover-bg;
- }
- .icon-bar {
- background-color: $navbar-inverse-toggle-icon-bar-bg;
- }
- }
- .navbar-collapse,
- .navbar-form {
- border-color: darken($navbar-inverse-bg, 7%);
- }
-
- // Dropdowns
- .navbar-nav {
+ // Dropdowns
> .open > a {
&,
&:hover,
&:focus {
- background-color: $navbar-inverse-link-active-bg;
color: $navbar-inverse-link-active-color;
+ background-color: $navbar-inverse-link-active-bg;
}
}
@@ -638,6 +615,23 @@
}
}
+ // Darken the responsive nav toggle
+ .navbar-toggle {
+ border-color: $navbar-inverse-toggle-border-color;
+ &:hover,
+ &:focus {
+ background-color: $navbar-inverse-toggle-hover-bg;
+ }
+ .icon-bar {
+ background-color: $navbar-inverse-toggle-icon-bar-bg;
+ }
+ }
+
+ .navbar-collapse,
+ .navbar-form {
+ border-color: darken($navbar-inverse-bg, 7%);
+ }
+
.navbar-link {
color: $navbar-inverse-link-color;
&:hover {