kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

move dropdown change from navbar to dropdowns to fix customizer compiling

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dist/css/bootstrap.css vendored
View file

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

2
dist/css/bootstrap.min.css vendored
View file

File diff suppressed because one or more lines are too long

14
less/dropdowns.less
View file

@ -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();
}
}
}

7
less/navbar.less
View file

@ -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(); }
}