Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2013-08-19 19:54:40 +0400
committerMark Otto <otto@github.com>2013-08-19 19:54:40 +0400
commitf497b5e1f51be88a1e96773d5b57f7c2c522f11f (patch)
tree5394853bad32803dc1c56086b39dcf88ce6ae9f8 /less
parenta9297c7ad2b53014ff5111824646879776535fa2 (diff)
move dropdown change from navbar to dropdowns to fix customizer compiling
Diffstat (limited to 'less')
-rw-r--r--less/dropdowns.less14
-rw-r--r--less/navbar.less7
2 files changed, 15 insertions, 6 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 53aab0267d..96af127a5c 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -177,3 +177,17 @@
margin-bottom: 1px;
}
}
+
+
+// Component alignment
+//
+// Reiterate per navbar.less and the modified component alignment there.
+
+@media (min-width: @grid-float-breakpoint) {
+ .navbar-right {
+ .dropdown-menu {
+ .pull-right > .dropdown-menu();
+ }
+ }
+}
+
diff --git a/less/navbar.less b/less/navbar.less
index cff2abef5e..a355198940 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -259,12 +259,7 @@
@media (min-width: @grid-float-breakpoint) {
.navbar-left { .pull-left(); }
- .navbar-right {
- .pull-right();
- .dropdown-menu {
- .pull-right > .dropdown-menu();
- }
- }
+ .navbar-right { .pull-right(); }
}