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

Run make on prev commits

Browse Source
This commit is contained in:
Mark Otto 2013-07-23 23:48:17 -07:00
parent 9029b4c06c
commit 18157e9f39
5 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dist/css/bootstrap.css vendored
View File

@ -700,8 +700,7 @@ pre {
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #ccc; border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 4px; border-radius: 4px;
} }
@ -1702,9 +1701,8 @@ select.input-small {
font-weight: normal; font-weight: normal;
line-height: 1.428571429; line-height: 1.428571429;
text-align: center; text-align: center;
text-shadow: 0 1px 0 #fff;
background-color: #eeeeee; background-color: #eeeeee;
border: 1px solid #ccc; border: 1px solid #cccccc;
border-radius: 4px; border-radius: 4px;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
@ -1818,7 +1816,7 @@ select.input-small {
.btn:hover, .btn:hover,
.btn:focus { .btn:focus {
color: #fff; color: #ffffff;
text-decoration: none; text-decoration: none;
} }
@ -2136,7 +2134,7 @@ input[type="button"].btn-block {
height: 0; height: 0;
margin-left: 2px; margin-left: 2px;
vertical-align: middle; vertical-align: middle;
border-top: 4px solid #000; border-top: 4px solid #000000;
border-right: 4px solid transparent; border-right: 4px solid transparent;
border-left: 4px solid transparent; border-left: 4px solid transparent;
content: ""; content: "";
@ -2154,7 +2152,7 @@ input[type="button"].btn-block {
margin: 2px 0 0; margin: 2px 0 0;
list-style: none; list-style: none;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #ccc; border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15); border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 4px; border-radius: 4px;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
@ -2168,11 +2166,10 @@ input[type="button"].btn-block {
} }
.dropdown-menu .divider { .dropdown-menu .divider {
height: 2px; height: 1px;
margin: 9px 0; margin: 9px 0;
overflow: hidden; overflow: hidden;
background-color: #e5e5e5; background-color: #e5e5e5;
border-bottom: 1px solid #ffffff;
} }
.dropdown-menu > li > a { .dropdown-menu > li > a {
@ -2261,7 +2258,7 @@ input[type="button"].btn-block {
.dropup .caret, .dropup .caret,
.navbar-fixed-bottom .dropdown .caret { .navbar-fixed-bottom .dropdown .caret {
border-top: 0; border-top: 0;
border-bottom: 4px solid #000; border-bottom: 4px solid #000000;
content: ""; content: "";
} }
@ -2313,11 +2310,11 @@ input[type="button"].btn-block {
} }
a.list-group-item .list-group-item-heading { a.list-group-item .list-group-item-heading {
color: #333; color: #333333;
} }
a.list-group-item .list-group-item-text { a.list-group-item .list-group-item-text {
color: #555; color: #555555;
} }
a.list-group-item:hover, a.list-group-item:hover,
@ -2469,7 +2466,7 @@ a.list-group-item.active .list-group-item-text {
font-size: 21px; font-size: 21px;
font-weight: bold; font-weight: bold;
line-height: 1; line-height: 1;
color: #000; color: #000000;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #ffffff;
opacity: 0.2; opacity: 0.2;
filter: alpha(opacity=20); filter: alpha(opacity=20);
@ -2477,7 +2474,7 @@ a.list-group-item.active .list-group-item-text {
.close:hover, .close:hover,
.close:focus { .close:focus {
color: #000; color: #000000;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
opacity: 0.5; opacity: 0.5;
@ -2571,11 +2568,10 @@ button.close {
} }
.nav .nav-divider { .nav .nav-divider {
height: 2px; height: 1px;
margin: 9px 0; margin: 9px 0;
overflow: hidden; overflow: hidden;
background-color: #e5e5e5; background-color: #e5e5e5;
border-bottom: 1px solid #ffffff;
} }
.nav-tabs { .nav-tabs {
@ -3971,7 +3967,7 @@ a.thumbnail:focus {
font-size: 75%; font-size: 75%;
font-weight: 500; font-weight: 500;
line-height: 1; line-height: 1;
color: #fff; color: #ffffff;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
vertical-align: middle; vertical-align: middle;
@ -3981,7 +3977,7 @@ a.thumbnail:focus {
.label[href]:hover, .label[href]:hover,
.label[href]:focus { .label[href]:focus {
color: #fff; color: #ffffff;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
background-color: #808080; background-color: #808080;
@ -4294,7 +4290,7 @@ a.list-group-item.active > .badge,
left: 0; left: 0;
width: 15%; width: 15%;
font-size: 20px; font-size: 20px;
color: #fff; color: #ffffff;
text-align: center; text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
opacity: 0.5; opacity: 0.5;
@ -4327,7 +4323,7 @@ a.list-group-item.active > .badge,
.carousel-control:hover, .carousel-control:hover,
.carousel-control:focus { .carousel-control:focus {
color: #fff; color: #ffffff;
text-decoration: none; text-decoration: none;
opacity: 0.9; opacity: 0.9;
filter: alpha(opacity=90); filter: alpha(opacity=90);
@ -4374,7 +4370,7 @@ a.list-group-item.active > .badge,
margin: 1px; margin: 1px;
text-indent: -999px; text-indent: -999px;
cursor: pointer; cursor: pointer;
border: 1px solid #fff; border: 1px solid #ffffff;
border-radius: 10px; border-radius: 10px;
} }
@ -4382,7 +4378,7 @@ a.list-group-item.active > .badge,
width: 12px; width: 12px;
height: 12px; height: 12px;
margin: 0; margin: 0;
background-color: #fff; background-color: #ffffff;
} }
.carousel-caption { .carousel-caption {
@ -4393,7 +4389,7 @@ a.list-group-item.active > .badge,
z-index: 10; z-index: 10;
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
color: #fff; color: #ffffff;
text-align: center; text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
} }

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

File diff suppressed because one or more lines are too long

2
less/carousel.less
View File

@ -74,7 +74,7 @@
font-size: 20px; font-size: 20px;
color: @carousel-control-color; color: @carousel-control-color;
text-align: center; text-align: center;
text-shadow: @carousel-control-text-shadow; text-shadow: @carousel-text-shadow;
// We can't have this transition here because webkit cancels the carousel // We can't have this transition here because webkit cancels the carousel
// animation if you trip this while in the middle of another animation. // animation if you trip this while in the middle of another animation.

4
less/list-group.less
View File

@ -58,10 +58,10 @@
a.list-group-item { a.list-group-item {
// Colorize content accordingly // Colorize content accordingly
.list-group-item-heading { .list-group-item-heading {
color: @link-list-group-heading-color; color: @list-group-link-heading-color;
} }
.list-group-item-text { .list-group-item-text {
color: @link-list-group-color; color: @list-group-link-color;
} }
// Hover state // Hover state

6
less/variables.less
View File

@ -337,8 +337,9 @@
@list-group-active-bg: @component-active-bg; @list-group-active-bg: @component-active-bg;
@list-group-active-border: @list-group-active-bg; @list-group-active-border: @list-group-active-bg;
@link-list-group-color: #555; @list-group-link-color: #555;
@link-list-group-heading-color:#333; @list-group-link-heading-color: #333;
// Panels // Panels
// ------------------------- // -------------------------
@ -403,6 +404,7 @@
@breadcrumb-color: #ccc; @breadcrumb-color: #ccc;
@breadcrumb-active-color: @gray-light; @breadcrumb-active-color: @gray-light;
// Carousel // Carousel
// ------------------------ // ------------------------
@carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); @carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);