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

Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip

Browse Source
This commit is contained in:
Mark Otto
2013-07-19 11:29:21 -07:00
parent 416fd9d19b 65ee36a7bf
commit b1819755b8
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
less/accordion.less
View File

@@ -11,7 +11,7 @@
// Group == heading + body // Group == heading + body
.accordion-group { .accordion-group {
margin-bottom: 2px; margin-bottom: 2px;
border: 1px solid #e5e5e5; border: 1px solid @accordion-border-color;
border-radius: @border-radius-base; border-radius: @border-radius-base;
} }
.accordion-heading { .accordion-heading {
@@ -27,5 +27,5 @@
// Inner needs the styles because you can't animate properly with any styles on the element // Inner needs the styles because you can't animate properly with any styles on the element
.accordion-inner { .accordion-inner {
padding: 9px 15px; padding: 9px 15px;
border-top: 1px solid #e5e5e5; border-top: 1px solid @accordion-border-color;
} }

6
less/badges.less
View File

@@ -10,7 +10,7 @@
padding: 3px 7px; padding: 3px 7px;
font-size: @font-size-small; font-size: @font-size-small;
font-weight: bold; font-weight: bold;
color: #fff; color: @badge-color;
line-height: 1; line-height: 1;
vertical-align: middle; vertical-align: middle;
white-space: nowrap; white-space: nowrap;
@@ -28,7 +28,7 @@
a.badge { a.badge {
&:hover, &:hover,
&:focus { &:focus {
color: #fff; color: @badge-link-hover-color;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
@@ -44,7 +44,7 @@ a.badge {
a.list-group-item.active > .badge, a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge { .nav-pills > .active > a > .badge {
color: @link-color; color: @link-color;
background-color: #fff; background-color: @badge-active-bg;
} }
.nav-pills > li > a > .badge { .nav-pills > li > a > .badge {
margin-left: 3px; margin-left: 3px;

4
less/breadcrumbs.less
View File

@@ -7,11 +7,11 @@
padding: 8px 15px; padding: 8px 15px;
margin: 0 0 @line-height-computed; margin: 0 0 @line-height-computed;
list-style: none; list-style: none;
background-color: #f5f5f5; background-color: @breadcrumb-bg;
border-radius: @border-radius-base; border-radius: @border-radius-base;
> li { > li {
display: inline-block; display: inline-block;
text-shadow: 0 1px 0 #fff; text-shadow: @breadcrumb-text-shadow;
&+li:before { &+li:before {
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

13
less/variables.less
View File

@@ -7,6 +7,19 @@
// -------------------------------------------------- // --------------------------------------------------
// Inner Files color variables (can say inline colors)
// --------------------------------------------------
@accordion-border-color: #e5e5e5;
@badge-color: #fff;
@badge-active-bg: #fff;
@badge-link-hover-color: #fff;
@breadcrumb-bg: #f5f5f5;
@breadcrumb-text-shadow: 0 1px 0 #fff;
// Grays // Grays
// ------------------------- // -------------------------