kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Update vars for badges, breadcrumbs; update customize page

This commit is contained in:
Mark Otto 2013-07-20 00:03:08 -07:00
parent 72d913baeb
commit 4b7f63a3a2
6 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_config.yml
View File

@ -7,5 +7,5 @@ permalink: pretty
# Server
destination: ./_gh_pages
exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json", "composer.json", "CONTRIBUTING.md", "LICENSE", "Makefile", "package.json", "node_modules", "README.md"]
exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json", "composer.json", "CONTRIBUTING.md", "LICENSE", "Makefile", "package.json", "node_modules", "README.md", "less", "js"]
port: 9001

47
customize.html
View File

@ -744,7 +744,6 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
<label>@table-bg</label>
<input type="text" placeholder="transparent">
<p class="help-block">Default background color used for all tables.</p>
<label>@table-bg-accent</label>
<input type="text" placeholder="#f9f9f9">
<p class="help-block">Background color used for <code>.table-striped</code>.</p>
@ -910,6 +909,52 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
<label>@well-bg</label>
<input type="text" placeholder="#f5f5f5">
<h3>Accordion</h3>
<label>@accordion-border-bg</label>
<input type="text" placeholder="#e5e5e5">
<h3>Badges</h3>
<div class="row">
<div class="col-lg-6">
<label>@badge-color</label>
<input type="text" placeholder="#fff">
<p>Badge text color</p>
<label>@badge-bg</label>
<input type="text" placeholder="@gray-lighter">
<p>Badge background color</p>
<label>@badge-link-hover-color</label>
<input type="text" placeholder="#fff">
<p>Linked badge text color on hover</p>
</div>
<div class="col-lg-6">
<label>@badge-active-color</label>
<input type="text" placeholder="@link-color">
<p>Badge text color in active nav link</p>
<label>@badge-active-bg</label>
<input type="text" placeholder="#fff">
<p>Badge text color in active nav link</p>
</div>
</div>
<h3>Breadcrumbs</h3>
<div class="row">
<div class="col-lg-4">
<label>@breadcrumb-color</label>
<input type="text" placeholder="#ccc">
<p>Breadcrumb text color</p>
</div>
<div class="col-lg-4">
<label>@breadcrumb-bg</label>
<input type="text" placeholder="#f5f5f5">
<p>Breadcrumb background color</p>
</div>
<div class="col-lg-4">
<label>@breadcrumb-active-color</label>
<input type="text" placeholder="@gray-light">
<p>Text color of current page in the breadcrumb</p>
</div>
</div>
<h2 id="variables-jumbotron">Jumbotron</h2>
<div class="row">
<div class="col-lg-4">

2
dist/css/bootstrap.css vendored
View File

@ -4087,7 +4087,7 @@ a.thumbnail:focus {
text-align: center;
white-space: nowrap;
vertical-align: middle;
background-color: #999999;
background-color: #f5f5f5;
border-radius: 10px;
}

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

File diff suppressed because one or more lines are too long

4
less/badges.less
View File

@ -15,7 +15,7 @@
vertical-align: middle;
white-space: nowrap;
text-align: center;
background-color: @gray-light;
background-color: @badge-bg;
border-radius: 10px;
// Empty labels/badges collapse
@ -43,7 +43,7 @@ a.badge {
// Account for counters in navs
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: @link-color;
color: @badge-active-color;
background-color: @badge-active-bg;
}
.nav-pills > li > a > .badge {

5
less/variables.less
View File

@ -377,9 +377,12 @@
// Badges
// -------------------------
@badge-color: #fff;
@badge-active-bg: #fff;
@badge-link-hover-color: #fff;
@badge-bg: #f5f5f5;
@badge-active-color: @link-color;
@badge-active-bg: #fff;
// Breadcrumbs
// -------------------------