mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-11 08:04:59 +02:00
Code Issues Releases Wiki Activity

more vars changed, remove @white var

Browse Source
This commit is contained in:
Mark Otto
2012-11-30 15:05:23 -08:00
parent b0e2b5813d
commit 9239bfbc7b
17 changed files with 152 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
docs/assets/css/bootstrap.css vendored
View File

@@ -607,7 +607,7 @@ hr {
margin: 20px 0; margin: 20px 0;
border: 0; border: 0;
border-top: 1px solid #eeeeee; border-top: 1px solid #eeeeee;
border-bottom: 1px solid #ffffff; border-bottom: 1px solid #fff;
} }
abbr[title], abbr[title],
@@ -1418,7 +1418,7 @@ select:focus:invalid:focus {
font-weight: normal; font-weight: normal;
line-height: 20px; line-height: 20px;
text-align: center; text-align: center;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #fff;
background-color: #eeeeee; background-color: #eeeeee;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
@@ -3301,8 +3301,8 @@ input[type="button"].btn-block {
.btn-info .caret, .btn-info .caret,
.btn-success .caret, .btn-success .caret,
.btn-inverse .caret { .btn-inverse .caret {
border-top-color: #ffffff; border-top-color: #fff;
border-bottom-color: #ffffff; border-bottom-color: #fff;
} }
.btn-group-vertical { .btn-group-vertical {
@@ -3495,7 +3495,7 @@ input[type="button"].btn-block {
.nav-pills > .active > a, .nav-pills > .active > a,
.nav-pills > .active > a:hover { .nav-pills > .active > a:hover {
color: #ffffff; color: #fff;
background-color: #0088cc; background-color: #0088cc;
} }
@@ -3597,7 +3597,7 @@ input[type="button"].btn-block {
.nav-tabs .open .dropdown-toggle, .nav-tabs .open .dropdown-toggle,
.nav-pills .open .dropdown-toggle, .nav-pills .open .dropdown-toggle,
.nav > li.dropdown.open.active > a:hover { .nav > li.dropdown.open.active > a:hover {
color: #ffffff; color: #fff;
background-color: #999999; background-color: #999999;
border-color: #999999; border-color: #999999;
} }
@@ -3605,8 +3605,8 @@ input[type="button"].btn-block {
.nav li.dropdown.open .caret, .nav li.dropdown.open .caret,
.nav li.dropdown.open.active .caret, .nav li.dropdown.open.active .caret,
.nav li.dropdown.open a:hover .caret { .nav li.dropdown.open a:hover .caret {
border-top-color: #ffffff; border-top-color: #fff;
border-bottom-color: #ffffff; border-bottom-color: #fff;
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
} }
@@ -4111,7 +4111,7 @@ input[type="button"].btn-block {
} }
.navbar-inverse .navbar-search .search-query { .navbar-inverse .navbar-search .search-query {
color: #ffffff; color: #fff;
background-color: #515151; background-color: #515151;
border-color: #111111; border-color: #111111;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
@@ -4138,7 +4138,7 @@ input[type="button"].btn-block {
.navbar-inverse .navbar-search .search-query.focused { .navbar-inverse .navbar-search .search-query.focused {
padding: 5px 15px; padding: 5px 15px;
color: #333333; color: #333333;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #fff;
background-color: #ffffff; background-color: #ffffff;
border: 0; border: 0;
outline: 0; outline: 0;
@@ -4186,7 +4186,7 @@ input[type="button"].btn-block {
.breadcrumb li { .breadcrumb li {
display: inline-block; display: inline-block;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #fff;
} }
.breadcrumb li:after { .breadcrumb li:after {
@@ -4419,7 +4419,7 @@ input[type="button"].btn-block {
z-index: 1050; z-index: 1050;
width: 560px; width: 560px;
margin-left: -280px; margin-left: -280px;
background-color: #ffffff; background-color: #fff;
border: 1px solid #999; border: 1px solid #999;
border: 1px solid rgba(0, 0, 0, 0.3); border: 1px solid rgba(0, 0, 0, 0.3);
border-radius: 6px; border-radius: 6px;
@@ -4859,7 +4859,7 @@ a.thumbnail:hover {
font-size: 11.844px; font-size: 11.844px;
font-weight: bold; font-weight: bold;
line-height: 14px; line-height: 14px;
color: #ffffff; color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
white-space: nowrap; white-space: nowrap;
vertical-align: baseline; vertical-align: baseline;
@@ -4883,7 +4883,7 @@ a.thumbnail:hover {
a.label:hover, a.label:hover,
a.badge:hover { a.badge:hover {
color: #ffffff; color: #fff;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
@@ -5016,7 +5016,7 @@ a.badge:hover {
width: 0; width: 0;
height: 100%; height: 100%;
font-size: 12px; font-size: 12px;
color: #ffffff; color: #fff;
text-align: center; text-align: center;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #0e90d2; background-color: #0e90d2;
@@ -5281,7 +5281,7 @@ a.badge:hover {
} }
.carousel-control:hover { .carousel-control:hover {
color: #ffffff; color: #fff;
text-decoration: none; text-decoration: none;
opacity: 0.9; opacity: 0.9;
filter: alpha(opacity=90); filter: alpha(opacity=90);
@@ -5318,7 +5318,7 @@ a.badge:hover {
.carousel-caption h3, .carousel-caption h3,
.carousel-caption p { .carousel-caption p {
line-height: 20px; line-height: 20px;
color: #ffffff; color: #fff;
} }
.carousel-caption h3 { .carousel-caption h3 {

38
docs/customize.html
View File

@@ -238,7 +238,7 @@
<div class="span3"> <div class="span3">
<h3>Scaffolding</h3> <h3>Scaffolding</h3>
<label>@body-background</label> <label>@body-background</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@text-color</label> <label>@text-color</label>
<input type="text" class="span3" placeholder="@grayDark"> <input type="text" class="span3" placeholder="@grayDark">
@@ -303,8 +303,6 @@
<label>@line-height-base</label> <label>@line-height-base</label>
<input type="text" class="span3" placeholder="20px"> <input type="text" class="span3" placeholder="20px">
<label>@altFontFamily</label>
<input type="text" class="span3" placeholder="@font-family-serif">
<label>@headings-font-family</label> <label>@headings-font-family</label>
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@headings-font-weight</label> <label>@headings-font-weight</label>
@@ -341,32 +339,32 @@
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<h3>Tables</h3> <h3>Tables</h3>
<label>@tableBackground</label> <label>@table-background</label>
<input type="text" class="span3" placeholder="transparent"> <input type="text" class="span3" placeholder="transparent">
<label>@tableBackgroundAccent</label> <label>@table-background-accent</label>
<input type="text" class="span3" placeholder="#f9f9f9"> <input type="text" class="span3" placeholder="#f9f9f9">
<label>@tableBackgroundHover</label> <label>@table-background-hover</label>
<input type="text" class="span3" placeholder="#f5f5f5"> <input type="text" class="span3" placeholder="#f5f5f5">
<label>@tableBorder</label> <label>@table-border</label>
<input type="text" class="span3" placeholder="#ddd"> <input type="text" class="span3" placeholder="#ddd">
<h3>Forms</h3> <h3>Forms</h3>
<label>@placeholderText</label> <label>@placeholderText</label>
<input type="text" class="span3" placeholder="@grayLight"> <input type="text" class="span3" placeholder="@grayLight">
<label>@inputBackground</label> <label>@input-background</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@inputBorder</label> <label>@input-border</label>
<input type="text" class="span3" placeholder="#ccc"> <input type="text" class="span3" placeholder="#ccc">
<label>@inputBorderRadius</label> <label>@input-border-radius</label>
<input type="text" class="span3" placeholder="3px"> <input type="text" class="span3" placeholder="3px">
<label>@inputDisabledBackground</label> <label>@input-background-disabled</label>
<input type="text" class="span3" placeholder="@grayLighter"> <input type="text" class="span3" placeholder="@grayLighter">
<label>@formActionsBackground</label> <label>@form-actions-background</label>
<input type="text" class="span3" placeholder="#f5f5f5"> <input type="text" class="span3" placeholder="#f5f5f5">
<label>@btnPrimaryBackground</label> <label>@btn-backround-primary</label>
<input type="text" class="span3" placeholder="@link-color"> <input type="text" class="span3" placeholder="@link-color">
<label>@btnPrimaryBackgroundHighlight</label> <label>@btn-backround-primary-highlight</label>
<input type="text" class="span3" placeholder="darken(@white, 10%)"> <input type="text" class="span3" placeholder="darken(#fff, 10%)">
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
@@ -403,7 +401,7 @@
<label>@navbarLinkColor</label> <label>@navbarLinkColor</label>
<input type="text" class="span3" placeholder="@grayLight"> <input type="text" class="span3" placeholder="@grayLight">
<label>@navbarLinkColorHover</label> <label>@navbarLinkColorHover</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@navbarLinkColorActive</label> <label>@navbarLinkColorActive</label>
<input type="text" class="span3" placeholder="@navbarLinkColorHover"> <input type="text" class="span3" placeholder="@navbarLinkColorHover">
<label>@navbarLinkBackgroundHover</label> <label>@navbarLinkBackgroundHover</label>
@@ -413,7 +411,7 @@
<label>@navbarSearchBackground</label> <label>@navbarSearchBackground</label>
<input type="text" class="span3" placeholder="lighten(@navbarBackground, 25%)"> <input type="text" class="span3" placeholder="lighten(@navbarBackground, 25%)">
<label>@navbarSearchBackgroundFocus</label> <label>@navbarSearchBackgroundFocus</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@navbarSearchBorder</label> <label>@navbarSearchBorder</label>
<input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)"> <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
<label>@navbarSearchPlaceholderColor</label> <label>@navbarSearchPlaceholderColor</label>
@@ -426,13 +424,13 @@
<h3>Dropdowns</h3> <h3>Dropdowns</h3>
<label>@dropdownBackground</label> <label>@dropdownBackground</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@dropdownBorder</label> <label>@dropdownBorder</label>
<input type="text" class="span3" placeholder="rgba(0,0,0,.2)"> <input type="text" class="span3" placeholder="rgba(0,0,0,.2)">
<label>@dropdownLinkColor</label> <label>@dropdownLinkColor</label>
<input type="text" class="span3" placeholder="@grayDark"> <input type="text" class="span3" placeholder="@grayDark">
<label>@dropdownLinkColorHover</label> <label>@dropdownLinkColorHover</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@dropdownLinkBackgroundHover</label> <label>@dropdownLinkBackgroundHover</label>
<input type="text" class="span3" placeholder="@link-color"> <input type="text" class="span3" placeholder="@link-color">
</div><!-- /span --> </div><!-- /span -->

36
docs/templates/pages/customize.mustache vendored
View File

@@ -170,7 +170,7 @@
<div class="span3"> <div class="span3">
<h3>{{_i}}Scaffolding{{/i}}</h3> <h3>{{_i}}Scaffolding{{/i}}</h3>
<label>@body-background</label> <label>@body-background</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@text-color</label> <label>@text-color</label>
<input type="text" class="span3" placeholder="@grayDark"> <input type="text" class="span3" placeholder="@grayDark">
@@ -271,32 +271,32 @@
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<h3>{{_i}}Tables{{/i}}</h3> <h3>{{_i}}Tables{{/i}}</h3>
<label>@tableBackground</label> <label>@table-background</label>
<input type="text" class="span3" placeholder="transparent"> <input type="text" class="span3" placeholder="transparent">
<label>@tableBackgroundAccent</label> <label>@table-background-accent</label>
<input type="text" class="span3" placeholder="#f9f9f9"> <input type="text" class="span3" placeholder="#f9f9f9">
<label>@tableBackgroundHover</label> <label>@table-background-hover</label>
<input type="text" class="span3" placeholder="#f5f5f5"> <input type="text" class="span3" placeholder="#f5f5f5">
<label>@tableBorder</label> <label>@table-border</label>
<input type="text" class="span3" placeholder="#ddd"> <input type="text" class="span3" placeholder="#ddd">
<h3>{{_i}}Forms{{/i}}</h3> <h3>{{_i}}Forms{{/i}}</h3>
<label>@placeholderText</label> <label>@placeholderText</label>
<input type="text" class="span3" placeholder="@grayLight"> <input type="text" class="span3" placeholder="@grayLight">
<label>@inputBackground</label> <label>@input-background</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@inputBorder</label> <label>@input-border</label>
<input type="text" class="span3" placeholder="#ccc"> <input type="text" class="span3" placeholder="#ccc">
<label>@inputBorderRadius</label> <label>@input-border-radius</label>
<input type="text" class="span3" placeholder="3px"> <input type="text" class="span3" placeholder="3px">
<label>@inputDisabledBackground</label> <label>@input-background-disabled</label>
<input type="text" class="span3" placeholder="@grayLighter"> <input type="text" class="span3" placeholder="@grayLighter">
<label>@formActionsBackground</label> <label>@form-actions-background</label>
<input type="text" class="span3" placeholder="#f5f5f5"> <input type="text" class="span3" placeholder="#f5f5f5">
<label>@btnPrimaryBackground</label> <label>@btn-backround-primary</label>
<input type="text" class="span3" placeholder="@link-color"> <input type="text" class="span3" placeholder="@link-color">
<label>@btnPrimaryBackgroundHighlight</label> <label>@btn-backround-primary-highlight</label>
<input type="text" class="span3" placeholder="darken(@white, 10%)"> <input type="text" class="span3" placeholder="darken(#fff, 10%)">
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
@@ -333,7 +333,7 @@
<label>@navbarLinkColor</label> <label>@navbarLinkColor</label>
<input type="text" class="span3" placeholder="@grayLight"> <input type="text" class="span3" placeholder="@grayLight">
<label>@navbarLinkColorHover</label> <label>@navbarLinkColorHover</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@navbarLinkColorActive</label> <label>@navbarLinkColorActive</label>
<input type="text" class="span3" placeholder="@navbarLinkColorHover"> <input type="text" class="span3" placeholder="@navbarLinkColorHover">
<label>@navbarLinkBackgroundHover</label> <label>@navbarLinkBackgroundHover</label>
@@ -343,7 +343,7 @@
<label>@navbarSearchBackground</label> <label>@navbarSearchBackground</label>
<input type="text" class="span3" placeholder="lighten(@navbarBackground, 25%)"> <input type="text" class="span3" placeholder="lighten(@navbarBackground, 25%)">
<label>@navbarSearchBackgroundFocus</label> <label>@navbarSearchBackgroundFocus</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@navbarSearchBorder</label> <label>@navbarSearchBorder</label>
<input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)"> <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
<label>@navbarSearchPlaceholderColor</label> <label>@navbarSearchPlaceholderColor</label>
@@ -356,13 +356,13 @@
<h3>{{_i}}Dropdowns{{/i}}</h3> <h3>{{_i}}Dropdowns{{/i}}</h3>
<label>@dropdownBackground</label> <label>@dropdownBackground</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@dropdownBorder</label> <label>@dropdownBorder</label>
<input type="text" class="span3" placeholder="rgba(0,0,0,.2)"> <input type="text" class="span3" placeholder="rgba(0,0,0,.2)">
<label>@dropdownLinkColor</label> <label>@dropdownLinkColor</label>
<input type="text" class="span3" placeholder="@grayDark"> <input type="text" class="span3" placeholder="@grayDark">
<label>@dropdownLinkColorHover</label> <label>@dropdownLinkColorHover</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="#fff">
<label>@dropdownLinkBackgroundHover</label> <label>@dropdownLinkBackgroundHover</label>
<input type="text" class="span3" placeholder="@link-color"> <input type="text" class="span3" placeholder="@link-color">
</div><!-- /span --> </div><!-- /span -->

2
less/breadcrumbs.less
View File

@@ -11,7 +11,7 @@
border-radius: @border-radius-base; border-radius: @border-radius-base;
li { li {
display: inline-block; display: inline-block;
text-shadow: 0 1px 0 @white; text-shadow: 0 1px 0 #fff;
&:after { &:after {
display: inline-block; display: inline-block;
content: "\00a0 /"; // Unicode space added since inline-block means non-collapsing white-space content: "\00a0 /"; // Unicode space added since inline-block means non-collapsing white-space

18
less/button-groups.less
View File

@@ -123,25 +123,25 @@
// Keep the hover's background when dropdown is open // Keep the hover's background when dropdown is open
.btn.dropdown-toggle { .btn.dropdown-toggle {
background-color: @btnBackgroundHighlight; background-color: @btn-background-highlight;
} }
.btn-primary.dropdown-toggle { .btn-primary.dropdown-toggle {
background-color: @btnPrimaryBackgroundHighlight; background-color: @btn-backround-primary-highlight;
} }
.btn-warning.dropdown-toggle { .btn-warning.dropdown-toggle {
background-color: @btnWarningBackgroundHighlight; background-color: @btn-backround-warning-highlight;
} }
.btn-danger.dropdown-toggle { .btn-danger.dropdown-toggle {
background-color: @btnDangerBackgroundHighlight; background-color: @btn-backround-danger-highlight;
} }
.btn-success.dropdown-toggle { .btn-success.dropdown-toggle {
background-color: @btnSuccessBackgroundHighlight; background-color: @btn-backround-success-highlight;
} }
.btn-info.dropdown-toggle { .btn-info.dropdown-toggle {
background-color: @btnInfoBackgroundHighlight; background-color: @btn-backround-info-highlight;
} }
.btn-inverse.dropdown-toggle { .btn-inverse.dropdown-toggle {
background-color: @btnInverseBackgroundHighlight; background-color: @btn-backround-inverse-highlight;
} }
} }
@@ -177,8 +177,8 @@
.btn-success, .btn-success,
.btn-inverse { .btn-inverse {
.caret { .caret {
border-top-color: @white; border-top-color: #fff;
border-bottom-color: @white; border-bottom-color: #fff;
} }
} }

18
less/buttons.less
View File

@@ -16,9 +16,9 @@
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
.buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75)); .buttonBackground(@btn-background, @btn-background-highlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
border: 1px solid @btnBorder; border: 1px solid @btn-border;
border-bottom-color: darken(@btnBorder, 10%); border-bottom-color: darken(@btn-border, 10%);
border-radius: @border-radius-base; border-radius: @border-radius-base;
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
@@ -139,27 +139,27 @@ input[type="button"] {
border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25);
} }
.btn-primary { .btn-primary {
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight); .buttonBackground(@btn-backround-primary, @btn-backround-primary-highlight);
} }
// Warning appears are orange // Warning appears are orange
.btn-warning { .btn-warning {
.buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight); .buttonBackground(@btn-backround-warning, @btn-backround-warning-highlight);
} }
// Danger and error appear as red // Danger and error appear as red
.btn-danger { .btn-danger {
.buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight); .buttonBackground(@btn-backround-danger, @btn-backround-danger-highlight);
} }
// Success appears as green // Success appears as green
.btn-success { .btn-success {
.buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight); .buttonBackground(@btn-backround-success, @btn-backround-success-highlight);
} }
// Info appears as a neutral blue // Info appears as a neutral blue
.btn-info { .btn-info {
.buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight); .buttonBackground(@btn-backround-info, @btn-backround-info-highlight);
} }
// Inverse appears as dark gray // Inverse appears as dark gray
.btn-inverse { .btn-inverse {
.buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight); .buttonBackground(@btn-backround-inverse, @btn-backround-inverse-highlight);
} }

4
less/carousel.less
View File

@@ -96,7 +96,7 @@
// Hover state // Hover state
&:hover { &:hover {
color: @white; color: #fff;
text-decoration: none; text-decoration: none;
.opacity(90); .opacity(90);
} }
@@ -136,7 +136,7 @@
} }
.carousel-caption h3, .carousel-caption h3,
.carousel-caption p { .carousel-caption p {
color: @white; color: #fff;
line-height: @line-height-base; line-height: @line-height-base;
} }
.carousel-caption h3 { .carousel-caption h3 {

50
less/forms.less
View File

@@ -57,16 +57,16 @@ input[type="color"],
.uneditable-input { .uneditable-input {
display: inline-block; display: inline-block;
.box-sizing(border-box); // Makes inputs behave like true block-level elements .box-sizing(border-box); // Makes inputs behave like true block-level elements
min-height: @inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border) min-height: @input-height; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
padding: 6px 9px; padding: 6px 9px;
margin-bottom: @line-height-base / 2; margin-bottom: @line-height-base / 2;
font-size: @font-size-base; font-size: @font-size-base;
line-height: @line-height-base; line-height: @line-height-base;
color: @gray; color: @gray;
vertical-align: middle; vertical-align: middle;
background-color: @inputBackground; background-color: @input-background;
border: 1px solid @inputBorder; border: 1px solid @input-border;
border-radius: @inputBorderRadius; border-radius: @input-border-radius;
.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");
} }
@@ -133,14 +133,14 @@ input[type="checkbox"] {
// Set the height of select and file controls to match text inputs // Set the height of select and file controls to match text inputs
select, select,
input[type="file"] { input[type="file"] {
height: @inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size. TODO: Check if this is still needed when dropping IE7 support */ height: @input-height; /* In IE7, the height of the select element cannot be changed by height, only font-size. TODO: Check if this is still needed when dropping IE7 support */
line-height: @inputHeight; line-height: @input-height;
} }
// Make select elements obey height by applying a border // Make select elements obey height by applying a border
// TODO: See if this can be part of the above selector stack // TODO: See if this can be part of the above selector stack
select { select {
border: 1px solid @inputBorder; border: 1px solid @input-border;
} }
// Make multiple select elements height not fixed // Make multiple select elements height not fixed
@@ -165,8 +165,8 @@ input[type="checkbox"]:focus {
.uneditable-input, .uneditable-input,
.uneditable-textarea { .uneditable-textarea {
color: @grayLight; color: @grayLight;
background-color: darken(@inputBackground, 1%); background-color: darken(@input-background, 1%);
border-color: @inputBorder; border-color: @input-border;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
cursor: not-allowed; cursor: not-allowed;
} }
@@ -337,7 +337,7 @@ input[readonly],
select[readonly], select[readonly],
textarea[readonly] { textarea[readonly] {
cursor: not-allowed; cursor: not-allowed;
background-color: @inputDisabledBackground; background-color: @input-background-disabled;
} }
// Explicitly reset the colors here // Explicitly reset the colors here
input[type="radio"][disabled], input[type="radio"][disabled],
@@ -393,7 +393,7 @@ select:focus:invalid {
padding: (@line-height-base - 1) 20px @line-height-base; padding: (@line-height-base - 1) 20px @line-height-base;
margin-top: @line-height-base; margin-top: @line-height-base;
margin-bottom: @line-height-base; margin-bottom: @line-height-base;
background-color: @formActionsBackground; background-color: @form-actions-background;
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
.clearfix(); // Adding clearfix to allow for .pull-right button containers .clearfix(); // Adding clearfix to allow for .pull-right button containers
} }
@@ -447,7 +447,7 @@ select:focus:invalid {
margin: 0; // Prevent bottom margin from screwing up alignment in stacked forms margin: 0; // Prevent bottom margin from screwing up alignment in stacked forms
font-size: @font-size-base; font-size: @font-size-base;
vertical-align: top; vertical-align: top;
border-radius: 0 @inputBorderRadius @inputBorderRadius 0; border-radius: 0 @input-border-radius @input-border-radius 0;
// Make input on top when focused so blue border and shadow always show // Make input on top when focused so blue border and shadow always show
&:focus { &:focus {
z-index: 2; z-index: 2;
@@ -468,7 +468,7 @@ select:focus:invalid {
font-weight: normal; font-weight: normal;
line-height: @line-height-base; line-height: @line-height-base;
text-align: center; text-align: center;
text-shadow: 0 1px 0 @white; text-shadow: 0 1px 0 #fff;
background-color: @grayLighter; background-color: @grayLighter;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
@@ -492,7 +492,7 @@ select:focus:invalid {
.add-on:first-child, .add-on:first-child,
.btn:first-child { .btn:first-child {
// FYI, `.btn:first-child` accounts for a button group that's prepended // FYI, `.btn:first-child` accounts for a button group that's prepended
border-radius: @inputBorderRadius 0 0 @inputBorderRadius; border-radius: @input-border-radius 0 0 @input-border-radius;
} }
} }
@@ -500,10 +500,10 @@ select:focus:invalid {
input, input,
select, select,
.uneditable-input { .uneditable-input {
border-radius: @inputBorderRadius 0 0 @inputBorderRadius; border-radius: @input-border-radius 0 0 @input-border-radius;
+ .btn-group .btn, + .btn-group .btn,
+ .btn-group .btn:last-child { + .btn-group .btn:last-child {
border-radius: 0 @inputBorderRadius @inputBorderRadius 0; border-radius: 0 @input-border-radius @input-border-radius 0;
} }
} }
.add-on, .add-on,
@@ -514,7 +514,7 @@ select:focus:invalid {
.add-on:last-child, .add-on:last-child,
.btn:last-child, .btn:last-child,
.btn-group:last-child > .dropdown-toggle { .btn-group:last-child > .dropdown-toggle {
border-radius: 0 @inputBorderRadius @inputBorderRadius 0; border-radius: 0 @input-border-radius @input-border-radius 0;
} }
} }
@@ -525,18 +525,18 @@ select:focus:invalid {
.uneditable-input { .uneditable-input {
border-radius: 0; border-radius: 0;
+ .btn-group .btn { + .btn-group .btn {
border-radius: 0 @inputBorderRadius @inputBorderRadius 0; border-radius: 0 @input-border-radius @input-border-radius 0;
} }
} }
.add-on:first-child, .add-on:first-child,
.btn:first-child { .btn:first-child {
margin-right: -1px; margin-right: -1px;
border-radius: @inputBorderRadius 0 0 @inputBorderRadius; border-radius: @input-border-radius 0 0 @input-border-radius;
} }
.add-on:last-child, .add-on:last-child,
.btn:last-child { .btn:last-child {
margin-left: -1px; margin-left: -1px;
border-radius: 0 @inputBorderRadius @inputBorderRadius 0; border-radius: 0 @input-border-radius @input-border-radius 0;
} }
.btn-group:first-child { .btn-group:first-child {
margin-left: 0; margin-left: 0;
@@ -555,7 +555,7 @@ input.search-query {
padding-left: 14px; padding-left: 14px;
padding-left: 4px \9; /* IE8 doesn't have border radius, so don't indent the padding */ padding-left: 4px \9; /* IE8 doesn't have border radius, so don't indent the padding */
margin-bottom: 0; // Remove the default margin on all inputs margin-bottom: 0; // Remove the default margin on all inputs
border-radius: @inputSearchBorderRadius; border-radius: @input-border-radius-search;
} }
/* Allow for input prepend/append in search forms */ /* Allow for input prepend/append in search forms */
@@ -564,16 +564,16 @@ input.search-query {
border-radius: 0; // Override due to specificity border-radius: 0; // Override due to specificity
} }
.form-search .input-append .search-query { .form-search .input-append .search-query {
border-radius: @inputSearchBorderRadius 0 0 @inputSearchBorderRadius; border-radius: @input-border-radius-search 0 0 @input-border-radius-search;
} }
.form-search .input-append .btn { .form-search .input-append .btn {
border-radius: 0 @inputSearchBorderRadius @inputSearchBorderRadius 0; border-radius: 0 @input-border-radius-search @input-border-radius-search 0;
} }
.form-search .input-prepend .search-query { .form-search .input-prepend .search-query {
border-radius: 0 @inputSearchBorderRadius @inputSearchBorderRadius 0; border-radius: 0 @input-border-radius-search @input-border-radius-search 0;
} }
.form-search .input-prepend .btn { .form-search .input-prepend .btn {
border-radius: @inputSearchBorderRadius 0 0 @inputSearchBorderRadius; border-radius: @input-border-radius-search 0 0 @input-border-radius-search;
} }

4
less/labels-badges.less
View File

@@ -11,7 +11,7 @@
font-size: @font-size-base * .846; font-size: @font-size-base * .846;
font-weight: bold; font-weight: bold;
line-height: 14px; // ensure proper line-height if floated line-height: 14px; // ensure proper line-height if floated
color: @white; color: #fff;
vertical-align: baseline; vertical-align: baseline;
white-space: nowrap; white-space: nowrap;
text-shadow: 0 -1px 0 rgba(0,0,0,.25); text-shadow: 0 -1px 0 rgba(0,0,0,.25);
@@ -39,7 +39,7 @@
a { a {
&.label:hover, &.label:hover,
&.badge:hover { &.badge:hover {
color: @white; color: #fff;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }

2
less/mixins.less
View File

@@ -419,7 +419,7 @@
// Horizontal dividers // Horizontal dividers
// ------------------------- // -------------------------
// Dividers (basically an hr) within dropdowns and nav lists // Dividers (basically an hr) within dropdowns and nav lists
.nav-divider(@top: #e5e5e5, @bottom: @white) { .nav-divider(@top: #e5e5e5, @bottom: #fff) {
height: 1px; height: 1px;
margin: ((@line-height-base / 2) - 1) 1px; // 8px 1px margin: ((@line-height-base / 2) - 1) 1px; // 8px 1px
overflow: hidden; overflow: hidden;

4
less/modals.less
View File

@@ -28,7 +28,7 @@
z-index: @zindexModal; z-index: @zindexModal;
width: 560px; width: 560px;
margin-left: -280px; margin-left: -280px;
background-color: @white; background-color: #fff;
border: 1px solid #999; border: 1px solid #999;
border: 1px solid rgba(0,0,0,.3); border: 1px solid rgba(0,0,0,.3);
border-radius: 6px; border-radius: 6px;
@@ -74,7 +74,7 @@
background-color: #f5f5f5; background-color: #f5f5f5;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px;
.box-shadow(inset 0 1px 0 @white); .box-shadow(inset 0 1px 0 #fff);
.clearfix(); // clear it in case folks use .pull-* classes on buttons .clearfix(); // clear it in case folks use .pull-* classes on buttons
// Properly space out buttons // Properly space out buttons

4
less/navbar.less
View File

@@ -435,7 +435,7 @@
// Navbar search // Navbar search
.navbar-search { .navbar-search {
.search-query { .search-query {
color: @white; color: #fff;
background-color: @navbarInverseSearchBackground; background-color: @navbarInverseSearchBackground;
border-color: @navbarInverseSearchBorder; border-color: @navbarInverseSearchBorder;
.box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)"); .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
@@ -447,7 +447,7 @@
&.focused { &.focused {
padding: 5px 15px; padding: 5px 15px;
color: @grayDark; color: @grayDark;
text-shadow: 0 1px 0 @white; text-shadow: 0 1px 0 #fff;
background-color: @navbarInverseSearchBackgroundFocus; background-color: @navbarInverseSearchBackgroundFocus;
border: 0; border: 0;
.box-shadow(0 0 3px rgba(0,0,0,.15)); .box-shadow(0 0 3px rgba(0,0,0,.15));

8
less/navs.less
View File

@@ -105,7 +105,7 @@
// Active state // Active state
.nav-pills > .active > a, .nav-pills > .active > a,
.nav-pills > .active > a:hover { .nav-pills > .active > a:hover {
color: @white; color: #fff;
background-color: @link-color; background-color: @link-color;
} }
@@ -217,15 +217,15 @@
.nav-tabs .open .dropdown-toggle, .nav-tabs .open .dropdown-toggle,
.nav-pills .open .dropdown-toggle, .nav-pills .open .dropdown-toggle,
.nav > li.dropdown.open.active > a:hover { .nav > li.dropdown.open.active > a:hover {
color: @white; color: #fff;
background-color: @grayLight; background-color: @grayLight;
border-color: @grayLight; border-color: @grayLight;
} }
.nav li.dropdown.open .caret, .nav li.dropdown.open .caret,
.nav li.dropdown.open.active .caret, .nav li.dropdown.open.active .caret,
.nav li.dropdown.open a:hover .caret { .nav li.dropdown.open a:hover .caret {
border-top-color: @white; border-top-color: #fff;
border-bottom-color: @white; border-bottom-color: #fff;
.opacity(100); .opacity(100);
} }

2
less/progress-bars.less
View File

@@ -55,7 +55,7 @@
.progress .bar { .progress .bar {
width: 0%; width: 0%;
height: 100%; height: 100%;
color: @white; color: #fff;
float: left; float: left;
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;

14
less/tables.less
View File

@@ -5,7 +5,7 @@
table { table {
max-width: 100%; max-width: 100%;
background-color: @tableBackground; background-color: @table-background;
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
} }
@@ -25,7 +25,7 @@ table {
line-height: @line-height-base; line-height: @line-height-base;
text-align: left; text-align: left;
vertical-align: top; vertical-align: top;
border-top: 1px solid @tableBorder; border-top: 1px solid @table-border;
} }
th { th {
font-weight: bold; font-weight: bold;
@@ -45,7 +45,7 @@ table {
} }
// Account for multiple tbody instances // Account for multiple tbody instances
tbody + tbody { tbody + tbody {
border-top: 2px solid @tableBorder; border-top: 2px solid @table-border;
} }
} }
@@ -67,13 +67,13 @@ table {
// ---------------- // ----------------
.table-bordered { .table-bordered {
border: 1px solid @tableBorder; border: 1px solid @table-border;
border-collapse: separate; // Done so we can round those corners! border-collapse: separate; // Done so we can round those corners!
border-left: 0; border-left: 0;
border-radius: @border-radius-base; border-radius: @border-radius-base;
th, th,
td { td {
border-left: 1px solid @tableBorder; border-left: 1px solid @table-border;
} }
// Prevent a double border // Prevent a double border
caption + thead tr:first-child th, caption + thead tr:first-child th,
@@ -143,7 +143,7 @@ table {
tbody { tbody {
tr:nth-child(odd) td, tr:nth-child(odd) td,
tr:nth-child(odd) th { tr:nth-child(odd) th {
background-color: @tableBackgroundAccent; background-color: @table-background-accent;
} }
} }
} }
@@ -157,7 +157,7 @@ table {
tbody { tbody {
tr:hover td, tr:hover td,
tr:hover th { tr:hover th {
background-color: @tableBackgroundHover; background-color: @table-background-hover;
} }
} }
} }

2
less/type.less
View File

@@ -158,7 +158,7 @@ hr {
margin: @line-height-base 0; margin: @line-height-base 0;
border: 0; border: 0;
border-top: 1px solid @hrBorder; border-top: 1px solid @hrBorder;
border-bottom: 1px solid @white; border-bottom: 1px solid #fff;
} }
// Abbreviations and acronyms // Abbreviations and acronyms

67
less/variables.less
View File

@@ -15,7 +15,6 @@
@gray: #555; @gray: #555;
@grayLight: #999; @grayLight: #999;
@grayLighter: #eee; @grayLighter: #eee;
@white: #fff;
// Accent colors // Accent colors
@@ -31,7 +30,7 @@
// Scaffolding // Scaffolding
// ------------------------- // -------------------------
@body-background: @white; @body-background: #fff;
@text-color: @grayDark; @text-color: @grayDark;
@@ -74,58 +73,58 @@
// Tables // Tables
// ------------------------- // -------------------------
@tableBackground: transparent; // overall background-color @table-background: transparent; // overall background-color
@tableBackgroundAccent: #f9f9f9; // for striping @table-background-accent: #f9f9f9; // for striping
@tableBackgroundHover: #f5f5f5; // for hover @table-background-hover: #f5f5f5; // for hover
@tableBorder: #ddd; // table and cell border @table-border: #ddd; // table and cell border
// Buttons // Buttons
// ------------------------- // -------------------------
@btnBackground: @white; @btn-background: #fff;
@btnBackgroundHighlight: darken(@white, 10%); @btn-background-highlight: darken(#fff, 10%);
@btnBorder: #bbb; @btn-border: #bbb;
@btnPrimaryBackground: @link-color; @btn-backround-primary: @link-color;
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%); @btn-backround-primary-highlight: spin(@btn-backround-primary, 20%);
@btnInfoBackground: #5bc0de; @btn-backround-info: #5bc0de;
@btnInfoBackgroundHighlight: #2f96b4; @btn-backround-info-highlight: #2f96b4;
@btnSuccessBackground: #62c462; @btn-backround-success: #62c462;
@btnSuccessBackgroundHighlight: #51a351; @btn-backround-success-highlight: #51a351;
@btnWarningBackground: lighten(@orange, 15%); @btn-backround-warning: lighten(#f89406, 15%);
@btnWarningBackgroundHighlight: @orange; @btn-backround-warning-highlight: #f89406;
@btnDangerBackground: #ee5f5b; @btn-backround-danger: #ee5f5b;
@btnDangerBackgroundHighlight: #bd362f; @btn-backround-danger-highlight: #bd362f;
@btnInverseBackground: #444; @btn-backround-inverse: #444;
@btnInverseBackgroundHighlight: @grayDarker; @btn-backround-inverse-highlight: @grayDarker;
// Forms // Forms
// ------------------------- // -------------------------
@inputBackground: @white; @input-background: #fff;
@inputBorder: #ccc; @input-border: #ccc;
@inputBorderRadius: @border-radius-base; @input-border-radius: @border-radius-base;
@inputSearchBorderRadius: 20px; @input-border-radius-search: 20px;
@inputDisabledBackground: @grayLighter; @input-background-disabled: @grayLighter;
@formActionsBackground: #f5f5f5; @form-actions-background: #f5f5f5;
@inputHeight: @line-height-base + 14px; // base line-height + 12px vertical padding + 2px top/bottom border @input-height: @line-height-base + 14px; // base line-height + 12px vertical padding + 2px top/bottom border
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
@dropdownBackground: @white; @dropdownBackground: #fff;
@dropdownBorder: rgba(0,0,0,.2); @dropdownBorder: rgba(0,0,0,.2);
@dropdownDividerTop: #e5e5e5; @dropdownDividerTop: #e5e5e5;
@dropdownDividerBottom: @white; @dropdownDividerBottom: #fff;
@dropdownLinkColor: @grayDark; @dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white; @dropdownLinkColorHover: #fff;
@dropdownLinkColorActive: @white; @dropdownLinkColorActive: #fff;
@dropdownLinkBackgroundActive: @link-color; @dropdownLinkBackgroundActive: @link-color;
@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive; @dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
@@ -200,13 +199,13 @@
@navbarInverseText: @grayLight; @navbarInverseText: @grayLight;
@navbarInverseLinkColor: @grayLight; @navbarInverseLinkColor: @grayLight;
@navbarInverseLinkColorHover: @white; @navbarInverseLinkColorHover: #fff;
@navbarInverseLinkColorActive: @navbarInverseLinkColorHover; @navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
@navbarInverseLinkBackgroundHover: transparent; @navbarInverseLinkBackgroundHover: transparent;
@navbarInverseLinkBackgroundActive: @navbarInverseBackground; @navbarInverseLinkBackgroundActive: @navbarInverseBackground;
@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%); @navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
@navbarInverseSearchBackgroundFocus: @white; @navbarInverseSearchBackgroundFocus: #fff;
@navbarInverseSearchBorder: @navbarInverseBackground; @navbarInverseSearchBorder: @navbarInverseBackground;
@navbarInverseSearchPlaceholderColor: #ccc; @navbarInverseSearchPlaceholderColor: #ccc;