rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-01 01:54:24 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #1098 from lookfirst/fixstuff

Browse Source 
2.0-wip: clean up variable usage with colors
This commit is contained in:
Jacob Thornton 2012-01-22 19:50:16 -08:00
commit 1593671cb2
11 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/breadcrumbs.less
View File

@ -4,7 +4,7 @@
.breadcrumb { .breadcrumb {
padding: 7px 14px; padding: 7px 14px;
margin: 0 0 @baseLineHeight; margin: 0 0 @baseLineHeight;
#gradient > .vertical(#ffffff, #f5f5f5); #gradient > .vertical(@white, #f5f5f5);
border: 1px solid #ddd; border: 1px solid #ddd;
.border-radius(3px); .border-radius(3px);
.box-shadow(inset 0 1px 0 @white); .box-shadow(inset 0 1px 0 @white);

2
lib/button-groups.less
View File

@ -110,7 +110,7 @@
.info, .info,
.success { .success {
.caret { .caret {
border-top-color: #fff; border-top-color: @white;
.opacity(75); .opacity(75);
} }
} }

4
lib/buttons.less
View File

@ -34,9 +34,9 @@
padding: 5px 10px 6px; padding: 5px 10px 6px;
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: normal; line-height: normal;
color: #333; color: @grayDark;
text-shadow: 0 1px 1px rgba(255,255,255,.75); text-shadow: 0 1px 1px rgba(255,255,255,.75);
#gradient > .vertical-three-colors(#ffffff, #ffffff, 25%, darken(#ffffff, 10%)); // Don't use .gradientbar() here since it does a three-color gradient #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
border: 1px solid #ccc; border: 1px solid #ccc;
border-bottom-color: #bbb; border-bottom-color: #bbb;
.border-radius(4px); .border-radius(4px);

10
lib/carousel.less
View File

@ -70,7 +70,7 @@
line-height: 30px; line-height: 30px;
color: #ccc; color: #ccc;
text-align: center; text-align: center;
background: #999; background: @grayLight;
background: rgba(0,0,0,.5); background: rgba(0,0,0,.5);
.border-radius(20px); .border-radius(20px);
@ -82,9 +82,9 @@
// Hover state // Hover state
&:hover { &:hover {
color: #fff; color: @white;
text-decoration: none; text-decoration: none;
background: #333; background: @grayDark;
background: rgba(0,0,0,.75); background: rgba(0,0,0,.75);
} }
} }
@ -98,10 +98,10 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
padding: 10px 15px 5px; padding: 10px 15px 5px;
background: #333; background: @grayDark;
background: rgba(0,0,0,.75); background: rgba(0,0,0,.75);
} }
.carousel-caption h4, .carousel-caption h4,
.carousel-caption p { .carousel-caption p {
color: #fff; color: @white;
} }

4
lib/dropdowns.less
View File

@ -14,7 +14,7 @@
vertical-align: top; vertical-align: top;
border-left: 4px solid transparent; border-left: 4px solid transparent;
border-right: 4px solid transparent; border-right: 4px solid transparent;
border-top: 4px solid #000; border-top: 4px solid @black;
.opacity(30); .opacity(30);
content: "\2193"; content: "\2193";
} }
@ -79,7 +79,7 @@
.dropdown-menu li > a:hover, .dropdown-menu li > a:hover,
.dropdown-menu .active > a, .dropdown-menu .active > a,
.dropdown-menu .active > a:hover { .dropdown-menu .active > a:hover {
color: #fff; color: @white;
text-decoration: none; text-decoration: none;
background-color: @linkColor; background-color: @linkColor;
} }

10
lib/navbar.less
View File

@ -164,7 +164,7 @@
.navbar .nav .active > a { .navbar .nav .active > a {
color: @white; color: @white;
text-decoration: none; text-decoration: none;
background-color: #222; background-color: @grayDarker;
background-color: rgba(0,0,0,.5); background-color: rgba(0,0,0,.5);
} }
@ -174,7 +174,7 @@
width: 1px; width: 1px;
margin: 0 5px; margin: 0 5px;
overflow: hidden; overflow: hidden;
background-color: #222; background-color: @grayDarker;
border-right: 1px solid #444; border-right: 1px solid #444;
} }
@ -209,7 +209,7 @@
display: inline-block; display: inline-block;
border-left: 6px solid transparent; border-left: 6px solid transparent;
border-right: 6px solid transparent; border-right: 6px solid transparent;
border-bottom: 6px solid #fff; border-bottom: 6px solid @white;
position: absolute; position: absolute;
top: -6px; top: -6px;
left: 10px; left: 10px;
@ -219,7 +219,7 @@
// Dropdown toggle caret // Dropdown toggle caret
.navbar .nav .dropdown-toggle .caret, .navbar .nav .dropdown-toggle .caret,
.navbar .nav .open.dropdown .caret { .navbar .nav .open.dropdown .caret {
border-top-color: #fff; border-top-color: @white;
} }
.navbar .nav .active .caret { .navbar .nav .active .caret {
.opacity(100); .opacity(100);
@ -234,7 +234,7 @@
// Dropdown link on hover // Dropdown link on hover
.navbar .nav .active > .dropdown-toggle:hover { .navbar .nav .active > .dropdown-toggle:hover {
color: #fff; color: @white;
} }
// Right aligned menus need alt position // Right aligned menus need alt position

22
lib/navs.less
View File

@ -18,7 +18,7 @@
} }
.nav > li > a:hover { .nav > li > a:hover {
text-decoration: none; text-decoration: none;
background-color: #eee; background-color: @grayLighter;
} }
@ -97,7 +97,7 @@
border: 1px solid transparent; border: 1px solid transparent;
.border-radius(4px 4px 0 0); .border-radius(4px 4px 0 0);
&:hover { &:hover {
border-color: #eee #eee #ddd; border-color: @grayLighter @grayLighter #ddd;
} }
} }
// Active state, and it's :hover to override normal :hover // Active state, and it's :hover to override normal :hover
@ -201,13 +201,13 @@
// ------------------------- // -------------------------
.tabs .active .dropdown-toggle .caret, .tabs .active .dropdown-toggle .caret,
.pills .active .dropdown-toggle .caret { .pills .active .dropdown-toggle .caret {
border-top-color: #333; border-top-color: @grayDark;
} }
// Active:hover dropdown links // Active:hover dropdown links
// ------------------------- // -------------------------
.nav > .dropdown.active > a:hover { .nav > .dropdown.active > a:hover {
color: #000; color: @black;
cursor: pointer; cursor: pointer;
} }
@ -216,20 +216,20 @@
.tabs .open .dropdown-toggle, .tabs .open .dropdown-toggle,
.pills .open .dropdown-toggle, .pills .open .dropdown-toggle,
.nav > .open.active > a:hover { .nav > .open.active > a:hover {
color: #fff; color: @white;
background-color: #999; background-color: @grayLight;
border-color: #999; border-color: @grayLight;
} }
.nav .open .caret, .nav .open .caret,
.nav .open.active .caret, .nav .open.active .caret,
.nav .open a:hover .caret { .nav .open a:hover .caret {
border-top-color: #fff; border-top-color: @white;
.opacity(100); .opacity(100);
} }
// Dropdowns in stacked tabs // Dropdowns in stacked tabs
.tabs.stacked .open > a:hover { .tabs.stacked .open > a:hover {
border-color: #999; border-color: @grayLight;
} }
@ -312,7 +312,7 @@
.border-radius(4px 0 0 4px); .border-radius(4px 0 0 4px);
} }
.tabs-left .tabs > li > a:hover { .tabs-left .tabs > li > a:hover {
border-color: #eee #ddd #eee #eee; border-color: @grayLighter #ddd @grayLighter @grayLighter;
} }
.tabs-left .tabs .active > a, .tabs-left .tabs .active > a,
.tabs-left .tabs .active > a:hover { .tabs-left .tabs .active > a:hover {
@ -330,7 +330,7 @@
.border-radius(0 4px 4px 0); .border-radius(0 4px 4px 0);
} }
.tabs-right .tabs > li > a:hover { .tabs-right .tabs > li > a:hover {
border-color: #eee #eee #eee #ddd; border-color: @grayLighter @grayLighter @grayLighter #ddd;
} }
.tabs-right .tabs .active > a, .tabs-right .tabs .active > a,
.tabs-right .tabs .active > a:hover { .tabs-right .tabs .active > a:hover {

4
lib/tables.less
View File

@ -144,7 +144,7 @@ table {
margin-top: 7px; margin-top: 7px;
border-width: 0 4px 4px; border-width: 0 4px 4px;
border-style: solid; border-style: solid;
border-color: #000 transparent; border-color: @black transparent;
visibility: hidden; visibility: hidden;
} }
} }
@ -174,7 +174,7 @@ table {
border-bottom: none; border-bottom: none;
border-left: 4px solid transparent; border-left: 4px solid transparent;
border-right: 4px solid transparent; border-right: 4px solid transparent;
border-top: 4px solid #000; border-top: 4px solid @black;
visibility:visible; visibility:visible;
.box-shadow(none); //can't add boxshadow to downward facing arrow :( .box-shadow(none); //can't add boxshadow to downward facing arrow :(
.opacity(60); .opacity(60);

2
lib/tooltip.less
View File

@ -22,7 +22,7 @@
.tooltip-inner { .tooltip-inner {
max-width: 200px; max-width: 200px;
padding: 3px 8px; padding: 3px 8px;
color: white; color: @white;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
background-color: @black; background-color: @black;

6
lib/type.less
View File

@ -119,7 +119,7 @@ hr {
margin: @baseLineHeight 0; margin: @baseLineHeight 0;
border: 0; border: 0;
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
border-bottom: 1px solid #fff; border-bottom: 1px solid @white;
} }
// Emphasis // Emphasis
@ -148,7 +148,7 @@ abbr {
blockquote { blockquote {
padding-left: 15px; padding-left: 15px;
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
border-left: 5px solid #eee; border-left: 5px solid @grayLighter;
p { p {
margin-bottom: 0; margin-bottom: 0;
#font > .shorthand(16px,300,@baseLineHeight * 1.25); #font > .shorthand(16px,300,@baseLineHeight * 1.25);
@ -168,7 +168,7 @@ blockquote {
padding-left: 0; padding-left: 0;
padding-right: 15px; padding-right: 15px;
border-left: 0; border-left: 0;
border-right: 5px solid #eee; border-right: 5px solid @grayLighter;
p, p,
small { small {
text-align: right; text-align: right;

5
lib/variables.less
View File

@ -13,6 +13,7 @@
// Grays // Grays
@black: #000; @black: #000;
@grayDarker: #222;
@grayDark: #333; @grayDark: #333;
@gray: #555; @gray: #555;
@grayLight: #999; @grayLight: #999;
@ -65,7 +66,7 @@
// Navbar // Navbar
@navBarHeight: 40px; @navBarHeight: 40px;
@navbarBackground: #222; @navbarBackground: @grayDarker;
@navbarBackgroundHighlight: #333; @navbarBackgroundHighlight: @grayDark;