aboutsummaryrefslogtreecommitdiff
path: root/scss/_navbar.scss
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-12-29 13:40:19 -0800
committerChris Rebert <[email protected]>2015-01-06 17:47:13 -0800
commitcbb3b1ff9aa4d16888697d18ff6764689d7c29eb (patch)
treefd6967af659f3ab0cb7ccd72b42e5498f299a4a5 /scss/_navbar.scss
parent746e09f8ae5b6601db5e965cd71c632b4e42827a (diff)
downloadbootstrap-cbb3b1ff9aa4d16888697d18ff6764689d7c29eb.tar.xz
bootstrap-cbb3b1ff9aa4d16888697d18ff6764689d7c29eb.zip
Kill scss/mixins/_media-queries.scss
replaced media-xs => media-breakpoint-down(xs) replaced media-sm => media-breakpoint-up(sm) replaced media-sm-max => media-breakpoint-only(sm) replaced media-md => media-breakpoint-up(md) replaced media-md-max => media-breakpoint-only(md) replaced media-lg => media-breakpoint-up(lg)
Diffstat (limited to 'scss/_navbar.scss')
-rw-r--r--scss/_navbar.scss14
1 files changed, 7 insertions, 7 deletions
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index b163dad9c..2c12049a0 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -14,7 +14,7 @@
margin-bottom: $navbar-margin-bottom;
@include clearfix;
- @include media-sm {
+ @include media-breakpoint-up(sm) {
@include border-radius($navbar-border-radius);
}
}
@@ -30,7 +30,7 @@
.navbar-static-top {
z-index: $zindex-navbar;
- @include media-sm {
+ @include media-breakpoint-up(sm) {
@include border-radius(0);
}
}
@@ -45,7 +45,7 @@
margin-bottom: 0; // override .navbar defaults
// Undo the rounded corners
- @include media-sm {
+ @include media-breakpoint-up(sm) {
@include border-radius(0);
}
}
@@ -119,7 +119,7 @@
@extend .form-inline;
.form-group {
- @include media-sm {
+ @include media-breakpoint-up(sm) {
margin-bottom: 5px;
&:last-child {
@@ -132,7 +132,7 @@
// @include navbar-vertical-align($input-height-base);
// Undo 100% width for pull classes
- @include media-sm {
+ @include media-breakpoint-up(sm) {
width: auto;
padding-top: 0;
padding-bottom: 0;
@@ -181,7 +181,7 @@
.navbar-text {
// @include navbar-vertical-align($line-height-computed);
- @include media-sm {
+ @include media-breakpoint-up(sm) {
float: left;
margin-right: $navbar-padding-horizontal;
margin-left: $navbar-padding-horizontal;
@@ -197,7 +197,7 @@
//
// Declared after the navbar components to ensure more specificity on the margins.
-@include media-sm {
+@include media-breakpoint-up(sm) {
.navbar-left {
@include pull-left();
}