aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
Diffstat (limited to 'less')
-rw-r--r--less/mixins.less1
-rw-r--r--less/navbar.less9
-rw-r--r--less/scaffolding.less2
-rw-r--r--less/utilities.less3
4 files changed, 13 insertions, 2 deletions
diff --git a/less/mixins.less b/less/mixins.less
index 68fbb5829..b6352831f 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -580,6 +580,7 @@
// Set the container width, and override it for fixed navbars in media queries
.container,
+ .navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container { .span(@gridColumns); }
diff --git a/less/navbar.less b/less/navbar.less
index 3a7e074b2..70501e459 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -165,6 +165,10 @@
left: 0;
z-index: @zindexFixedNavbar;
margin-bottom: 0; // remove 18px margin for default navbar
+}
+.navbar-fixed-top,
+.navbar-fixed-bottom,
+.navbar-static-top {
.navbar-inner {
border: 0;
}
@@ -177,6 +181,8 @@
}
// Reset container width
+// Required here as we reset the width earlier on and the grid mixins don't override early enough
+.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
#grid > .core > .span(@gridColumns);
@@ -185,6 +191,9 @@
// Fixed to top
.navbar-fixed-top {
top: 0;
+}
+.navbar-fixed-top,
+.navbar-static-top {
.navbar-inner {
.box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)");
}
diff --git a/less/scaffolding.less b/less/scaffolding.less
index fe63c7cac..342dcf705 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -48,4 +48,4 @@ a:hover {
.img-circle {
.border-radius(500px);
-} \ No newline at end of file
+}
diff --git a/less/utilities.less b/less/utilities.less
index 5eef70fe7..314b4ffdb 100644
--- a/less/utilities.less
+++ b/less/utilities.less
@@ -24,6 +24,7 @@
visibility: hidden;
}
+// For Affix plugin
.affix {
position: fixed;
-} \ No newline at end of file
+}