Commit 6a4ca171 by niskac

updated bootstrap less files

parent e2ec139b
...@@ -4,13 +4,11 @@ ...@@ -4,13 +4,11 @@
.breadcrumb { .breadcrumb {
padding: 7px 14px; padding: 8px 15px;
margin: 0 0 @baseLineHeight; margin: 0 0 @baseLineHeight;
list-style: none; list-style: none;
#gradient > .vertical(@white, #f5f5f5); background-color: #f5f5f5;
border: 1px solid #ddd; .border-radius(4px);
.border-radius(3px);
.box-shadow(inset 0 1px 0 @white);
li { li {
display: inline-block; display: inline-block;
.ie7-inline-block(); .ie7-inline-block();
...@@ -18,9 +16,9 @@ ...@@ -18,9 +16,9 @@
} }
.divider { .divider {
padding: 0 5px; padding: 0 5px;
color: @grayLight; color: #ccc;
} }
.active a { .active {
color: @grayDark; color: @grayLight;
} }
} }
...@@ -34,11 +34,13 @@ ...@@ -34,11 +34,13 @@
} }
.btn-group > .btn, .btn-group > .btn,
.btn-group > .dropdown-menu { .btn-group > .dropdown-menu {
font-size: 13px; // redeclare as part 2 of font-size inline-block hack font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
} }
// Reset fonts for other sizes // Reset fonts for other sizes
.btn-group > .btn-mini, .btn-group > .btn-mini {
font-size: 11px;
}
.btn-group > .btn-small { .btn-group > .btn-small {
font-size: 12px; font-size: 12px;
} }
...@@ -106,22 +108,22 @@ ...@@ -106,22 +108,22 @@
// ---------------------- // ----------------------
// Give the line between buttons some depth // Give the line between buttons some depth
.btn-group > .dropdown-toggle { .btn-group > .btn + .dropdown-toggle {
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
.box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
*padding-top: 4px; *padding-top: 4px;
*padding-bottom: 4px; *padding-bottom: 4px;
} }
.btn-group > .btn-mini.dropdown-toggle { .btn-group > .btn-mini + .dropdown-toggle {
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
} }
.btn-group > .btn-small.dropdown-toggle { .btn-group > .btn-small + .dropdown-toggle {
*padding-top: 4px; *padding-top: 4px;
*padding-bottom: 4px; *padding-bottom: 4px;
} }
.btn-group > .btn-large.dropdown-toggle { .btn-group > .btn-large + .dropdown-toggle {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
} }
...@@ -162,22 +164,16 @@ ...@@ -162,22 +164,16 @@
// Reposition the caret // Reposition the caret
.btn .caret { .btn .caret {
margin-top: 7px; margin-top: 8px;
margin-left: 0; margin-left: 0;
} }
.btn:hover .caret,
.open.btn-group .caret {
.opacity(100);
}
// Carets in other button sizes // Carets in other button sizes
.btn-mini .caret { .btn-mini .caret,
margin-top: 5px; .btn-small .caret,
} .btn-large .caret {
.btn-small .caret {
margin-top: 6px; margin-top: 6px;
} }
.btn-large .caret { .btn-large .caret {
margin-top: 6px;
border-left-width: 5px; border-left-width: 5px;
border-right-width: 5px; border-right-width: 5px;
border-top-width: 5px; border-top-width: 5px;
...@@ -200,7 +196,6 @@ ...@@ -200,7 +196,6 @@
.caret { .caret {
border-top-color: @white; border-top-color: @white;
border-bottom-color: @white; border-bottom-color: @white;
.opacity(75);
} }
} }
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
.ie7-inline-block(); .ie7-inline-block();
padding: 4px 14px; padding: 4px 14px;
margin-bottom: 0; // For input.btn margin-bottom: 0; // For input.btn
font-size: 13px; font-size: @baseFontSize;
line-height: 20px; line-height: @baseLineHeight;
*line-height: 20px; *line-height: @baseLineHeight;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
// Mini // Mini
.btn-mini { .btn-mini {
padding: 2px 6px; padding: 2px 6px;
font-size: @baseFontSize - 2px; font-size: @baseFontSize - 3px;
line-height: @baseLineHeight - 4px; line-height: @baseLineHeight - 4px;
} }
...@@ -107,6 +107,9 @@ ...@@ -107,6 +107,9 @@
padding-right: 0; padding-right: 0;
.box-sizing(border-box); .box-sizing(border-box);
} }
.btn-block + .btn-block {
margin-top: 5px;
}
// Alternate buttons // Alternate buttons
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
border-right: 4px solid transparent; border-right: 4px solid transparent;
border-left: 4px solid transparent; border-left: 4px solid transparent;
content: ""; content: "";
.opacity(30);
} }
// Place the caret // Place the caret
...@@ -36,15 +35,6 @@ ...@@ -36,15 +35,6 @@
margin-top: 8px; margin-top: 8px;
margin-left: 2px; margin-left: 2px;
} }
.dropdown a:focus .caret,
.dropdown a:hover .caret,
.open .caret {
.opacity(100);
}
.navbar .nav .open > a {
color: @navbarLinkColorActive;
}
// The dropdown menu (ul) // The dropdown menu (ul)
// ---------------------- // ----------------------
...@@ -57,7 +47,7 @@ ...@@ -57,7 +47,7 @@
float: left; float: left;
min-width: 160px; min-width: 160px;
padding: 5px 0; padding: 5px 0;
margin: 1px 0 0; // override default ul margin: 2px 0 0; // override default ul
list-style: none; list-style: none;
background-color: @dropdownBackground; background-color: @dropdownBackground;
border: 1px solid #ccc; // Fallback for IE7-8 border: 1px solid #ccc; // Fallback for IE7-8
......
...@@ -118,8 +118,7 @@ input[type="color"], ...@@ -118,8 +118,7 @@ input[type="color"],
background-color: @inputBackground; background-color: @inputBackground;
border: 1px solid @inputBorder; border: 1px solid @inputBorder;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@transition: border linear .2s, box-shadow linear .2s; .transition(~"border linear .2s, box-shadow linear .2s");
.transition(@transition);
// Focus state // Focus state
&:focus { &:focus {
...@@ -280,6 +279,10 @@ textarea[class*="span"], ...@@ -280,6 +279,10 @@ textarea[class*="span"],
.input-append .uneditable-input[class*="span"], .input-append .uneditable-input[class*="span"],
.input-prepend input[class*="span"], .input-prepend input[class*="span"],
.input-prepend .uneditable-input[class*="span"], .input-prepend .uneditable-input[class*="span"],
.row-fluid input[class*="span"],
.row-fluid select[class*="span"],
.row-fluid textarea[class*="span"],
.row-fluid .uneditable-input[class*="span"],
.row-fluid .input-prepend [class*="span"], .row-fluid .input-prepend [class*="span"],
.row-fluid .input-append [class*="span"] { .row-fluid .input-append [class*="span"] {
display: inline-block; display: inline-block;
......
...@@ -7,4 +7,15 @@ ...@@ -7,4 +7,15 @@
#grid > .core(@gridColumnWidth, @gridGutterWidth); #grid > .core(@gridColumnWidth, @gridGutterWidth);
// Fluid (940px) // Fluid (940px)
#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth); #grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
\ No newline at end of file
// Reset utility classes due to specificity
[class*="span"].hide,
.row-fluid [class*="span"].hide {
display: none;
}
[class*="span"].pull-right,
.row-fluid [class*="span"].pull-right {
float: right;
}
...@@ -55,3 +55,18 @@ a { ...@@ -55,3 +55,18 @@ a {
&-inverse { background-color: @grayDark; } &-inverse { background-color: @grayDark; }
&-inverse[href] { background-color: darken(@grayDark, 10%); } &-inverse[href] { background-color: darken(@grayDark, 10%); }
} }
// Quick fix for labels/badges in buttons
.btn {
.label,
.badge {
position: relative;
top: -1px;
}
}
.btn-mini {
.label,
.badge {
top: 0;
}
}
...@@ -65,10 +65,6 @@ ...@@ -65,10 +65,6 @@
.ie7-restore-right-whitespace() { .ie7-restore-right-whitespace() {
*margin-right: .3em; *margin-right: .3em;
&:last-child {
*margin-left: 0;
}
} }
// Sizing shortcuts // Sizing shortcuts
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
// TABLETS AND BELOW // TABLETS AND BELOW
// ----------------- // -----------------
@media (max-width: 979px) { @media (max-width: @navbarCollapseWidth) {
// UNFIX THE TOPBAR // UNFIX THE TOPBAR
// ---------------- // ----------------
......
...@@ -79,7 +79,7 @@ table { ...@@ -79,7 +79,7 @@ table {
.table-bordered { .table-bordered {
border: 1px solid @tableBorder; border: 1px solid @tableBorder;
border-collapse: separate; // Done so we can round those corners! border-collapse: separate; // Done so we can round those corners!
*border-collapse: collapsed; // IE7 can't round corners anyway *border-collapse: collapse; // IE7 can't round corners anyway
border-left: 0; border-left: 0;
.border-radius(4px); .border-radius(4px);
th, th,
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
// ------------------------- // -------------------------
@btnBackground: @white; @btnBackground: @white;
@btnBackgroundHighlight: darken(@white, 10%); @btnBackgroundHighlight: darken(@white, 10%);
@btnBorder: #ccc; @btnBorder: #bbb;
@btnPrimaryBackground: @linkColor; @btnPrimaryBackground: @linkColor;
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%); @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%);
...@@ -154,16 +154,19 @@ ...@@ -154,16 +154,19 @@
// Navbar // Navbar
// ------------------------- // -------------------------
@navbarHeight: 40px; @navbarCollapseWidth: 979px;
@navbarBackground: #111;
@navbarBackgroundHighlight: #222;
@navbarText: @grayLight; @navbarHeight: 40px;
@navbarLinkColor: @grayLight; @navbarBackground: darken(@navbarBackgroundHighlight, 5%);
@navbarLinkColorHover: @white; @navbarBackgroundHighlight: #ffffff;
@navbarLinkColorActive: @navbarLinkColorHover; @navbarBorder: darken(@navbarBackground, 12%);
@navbarText: @gray;
@navbarLinkColor: @gray;
@navbarLinkColorHover: @grayDark;
@navbarLinkColorActive: @gray;
@navbarLinkBackgroundHover: transparent; @navbarLinkBackgroundHover: transparent;
@navbarLinkBackgroundActive: @navbarBackground; @navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
@navbarSearchBackground: lighten(@navbarBackground, 25%); @navbarSearchBackground: lighten(@navbarBackground, 25%);
@navbarSearchBackgroundFocus: @white; @navbarSearchBackgroundFocus: @white;
...@@ -171,6 +174,26 @@ ...@@ -171,6 +174,26 @@
@navbarSearchPlaceholderColor: #ccc; @navbarSearchPlaceholderColor: #ccc;
@navbarBrandColor: @navbarLinkColor; @navbarBrandColor: @navbarLinkColor;
// Inverted navbar
@navbarInverseBackground: #111111;
@navbarInverseBackgroundHighlight: #222222;
@navbarInverseBorder: #252525;
@navbarInverseText: @grayLight;
@navbarInverseLinkColor: @grayLight;
@navbarInverseLinkColorHover: @white;
@navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
@navbarInverseLinkBackgroundHover: transparent;
@navbarInverseLinkBackgroundActive: @navbarInverseBackground;
@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
@navbarInverseSearchBackgroundFocus: @white;
@navbarInverseSearchBorder: @navbarInverseBackground;
@navbarInverseSearchPlaceholderColor: #ccc;
@navbarInverseBrandColor: @navbarInverseLinkColor;
// Hero unit // Hero unit
// ------------------------- // -------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment