2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00

clean up dup css in responsive, fix navbar dropdown caret

This commit is contained in:
Mark Otto
2012-01-08 13:21:44 -08:00
parent 1ef9cbc6e4
commit cb9be7bd0c
7 changed files with 31 additions and 32 deletions
+4 -2
View File
@@ -182,11 +182,13 @@
.pills .dropdown-menu {
.border-radius(4px);
}
.nav .dropdown-toggle .caret {
.tabs .dropdown-toggle .caret,
.pills .dropdown-toggle .caret {
border-top-color: @linkColor;
margin-top: 6px;
}
.nav .dropdown-toggle:hover .caret {
.tabs .dropdown-toggle:hover .caret,
.pills .dropdown-toggle:hover .caret {
border-top-color: @linkColorHover;
}
.nav .open .dropdown-toggle {
+5 -11
View File
@@ -67,7 +67,6 @@
.opacity(100);
content: "↓";
}
.nav:hover > li {
display: block;
}
@@ -76,13 +75,6 @@
}
}
// Resize modals
.modal {
width: auto;
margin: 0;
&.fade.in { top: auto; }
}
// Remove the horizontal form styles
.horizontal-form .control-group > label {
float: none;
@@ -110,10 +102,12 @@
left: 20px;
right: 20px;
width: auto;
.close {
padding: 10px;
}
&.fade.in { top: auto; }
}
.modal-header .close {
padding: 10px;
}
}
+8 -2
View File
@@ -39,8 +39,14 @@ body {
.sidebar-right { padding-right: @fluidSidebarWidth + 40; }
// Float the sidebars accordingly
.sidebar-left .fluid-sidebar { float: left; margin-left: (@fluidSidebarWidth + 20) * -1; }
.sidebar-right .fluid-sidebar { float: right; margin-right: (@fluidSidebarWidth + 20) * -1; }
.sidebar-left .fluid-sidebar {
float: left;
margin-left: (@fluidSidebarWidth + 20) * -1;
}
.sidebar-right .fluid-sidebar {
float: right;
margin-right: (@fluidSidebarWidth + 20) * -1;
}
// The main content area
.fluid-content {