1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 19:31:35 +02:00

move dropdown change from navbar to dropdowns to fix customizer compiling

This commit is contained in:
Mark Otto
2013-08-19 08:54:40 -07:00
parent a9297c7ad2
commit f497b5e1f5
4 changed files with 23 additions and 11 deletions

View File

@@ -3339,6 +3339,13 @@ input[type="button"].btn-block {
margin-bottom: 1px; margin-bottom: 1px;
} }
@media (min-width: 768px) {
.navbar-right .dropdown-menu {
right: 0;
left: auto;
}
}
.btn-default .caret { .btn-default .caret {
border-top-color: #333333; border-top-color: #333333;
} }
@@ -4273,10 +4280,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-right { .navbar-right {
float: right !important; float: right !important;
} }
.navbar-right .dropdown-menu {
right: 0;
left: auto;
}
} }
.navbar-form { .navbar-form {

File diff suppressed because one or more lines are too long

View File

@@ -177,3 +177,17 @@
margin-bottom: 1px; 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();
}
}
}

View File

@@ -259,12 +259,7 @@
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
.navbar-left { .pull-left(); } .navbar-left { .pull-left(); }
.navbar-right { .navbar-right { .pull-right(); }
.pull-right();
.dropdown-menu {
.pull-right > .dropdown-menu();
}
}
} }