root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into popovers-use-radii-var 

Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
This commit is contained in:
Mark Otto 2014-03-06 21:44:46 -08:00
parent 4868096dbd 0c9308a3b2
commit df3eb66ede
18 changed files with 122 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dist/css/bootstrap-rtl.css vendored
View File

@ -2879,7 +2879,7 @@ table th[class*="col-"] {
background-color: #ebcccc;
}
@media (max-width: 767px) {
@media screen and (max-width: 767px) {
.table-responsive {
width: 100%;
margin-bottom: 15px;
@ -5848,6 +5848,25 @@ a.list-group-item:focus {
background-color: #f5f5f5;
}
.list-group-item.disabled,
.list-group-item.disabled:hover,
.list-group-item.disabled:focus {
color: #999;
background-color: #eee;
}
.list-group-item.disabled .list-group-item-heading,
.list-group-item.disabled:hover .list-group-item-heading,
.list-group-item.disabled:focus .list-group-item-heading {
color: inherit;
}
.list-group-item.disabled .list-group-item-text,
.list-group-item.disabled:hover .list-group-item-text,
.list-group-item.disabled:focus .list-group-item-text {
color: #999;
}
.list-group-item.active,
.list-group-item.active:hover,
.list-group-item.active:focus {

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

File diff suppressed because one or more lines are too long

18
dist/css/bootstrap.css vendored
View File

@ -2199,7 +2199,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr.danger:hover > th {
background-color: #ebcccc;
}
@media (max-width: 767px) {
@media screen and (max-width: 767px) {
.table-responsive {
width: 100%;
margin-bottom: 15px;
@ -4694,6 +4694,22 @@ a.list-group-item:focus {
text-decoration: none;
background-color: #f5f5f5;
}
.list-group-item.disabled,
.list-group-item.disabled:hover,
.list-group-item.disabled:focus {
color: #999;
background-color: #eee;
}
.list-group-item.disabled .list-group-item-heading,
.list-group-item.disabled:hover .list-group-item-heading,
.list-group-item.disabled:focus .list-group-item-heading {
color: inherit;
}
.list-group-item.disabled .list-group-item-text,
.list-group-item.disabled:hover .list-group-item-text,
.list-group-item.disabled:focus .list-group-item-text {
color: #999;
}
.list-group-item.active,
.list-group-item.active:hover,
.list-group-item.active:focus {

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

22
docs/_includes/customizer-variables.html
View File

@ -1311,17 +1311,17 @@
<div class="bs-customizer-input">
<label for="input-@list-group-hover-bg">@list-group-hover-bg</label>
<input id="input-@list-group-hover-bg" type="text" value="#f5f5f5" data-var="@list-group-hover-bg" class="form-control"/>
<p class="help-block">Background color of single list elements on hover</p>
<p class="help-block">Background color of single list items on hover</p>
</div>
<div class="bs-customizer-input">
<label for="input-@list-group-active-color">@list-group-active-color</label>
<input id="input-@list-group-active-color" type="text" value="@component-active-color" data-var="@list-group-active-color" class="form-control"/>
<p class="help-block">Text color of active list elements</p>
<p class="help-block">Text color of active list items</p>
</div>
<div class="bs-customizer-input">
<label for="input-@list-group-active-bg">@list-group-active-bg</label>
<input id="input-@list-group-active-bg" type="text" value="@component-active-bg" data-var="@list-group-active-bg" class="form-control"/>
<p class="help-block">Background color of active list elements</p>
<p class="help-block">Background color of active list items</p>
</div>
<div class="bs-customizer-input">
<label for="input-@list-group-active-border">@list-group-active-border</label>
@ -1331,6 +1331,22 @@
<div class="bs-customizer-input">
<label for="input-@list-group-active-text-color">@list-group-active-text-color</label>
<input id="input-@list-group-active-text-color" type="text" value="lighten(@list-group-active-bg, 40%)" data-var="@list-group-active-text-color" class="form-control"/>
<p class="help-block">Text color for content within active list items</p>
</div>
<div class="bs-customizer-input">
<label for="input-@list-group-disabled-color">@list-group-disabled-color</label>
<input id="input-@list-group-disabled-color" type="text" value="@gray-light" data-var="@list-group-disabled-color" class="form-control"/>
<p class="help-block">Text color of disabled list items</p>
</div>
<div class="bs-customizer-input">
<label for="input-@list-group-disabled-bg">@list-group-disabled-bg</label>
<input id="input-@list-group-disabled-bg" type="text" value="@gray-lighter" data-var="@list-group-disabled-bg" class="form-control"/>
<p class="help-block">Background color of disabled list items</p>
</div>
<div class="bs-customizer-input">
<label for="input-@list-group-disabled-text-color">@list-group-disabled-text-color</label>
<input id="input-@list-group-disabled-text-color" type="text" value="@list-group-disabled-color" data-var="@list-group-disabled-text-color" class="form-control"/>
<p class="help-block">Text color for content within disabled list items</p>
</div>
<div class="bs-customizer-input">
<label for="input-@list-group-link-color">@list-group-link-color</label>

1
docs/_includes/nav-components.html
View File

@ -123,6 +123,7 @@
<li><a href="#list-group-basic">Basic example</a></li>
<li><a href="#list-group-badges">Badges</a></li>
<li><a href="#list-group-linked">Linked items</a></li>
<li><a href="#list-group-disabled">Disabled items</a></li>
<li><a href="#list-group-contextual-classes">Contextual classes</a></li>
<li><a href="#list-group-custom-content">Custom content</a></li>
</ul>

2
docs/assets/js/customize.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/raw-files.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
docs/components.html
View File

@ -2648,6 +2648,31 @@ body { padding-bottom: 70px; }
<a href="#" class="list-group-item">Porta ac consectetur ac</a>
<a href="#" class="list-group-item">Vestibulum at eros</a>
</div>
{% endhighlight %}
<h3 id="list-group-disabled">Disabled items</h3>
<p>Add <code>.disabled</code> to a <code>.list-group-item</code> to gray it out to appear disabled.</p>
<div class="bs-example">
<div class="list-group">
<a href="#" class="list-group-item disabled">
Cras justo odio
</a>
<a href="#" class="list-group-item">Dapibus ac facilisis in</a>
<a href="#" class="list-group-item">Morbi leo risus</a>
<a href="#" class="list-group-item">Porta ac consectetur ac</a>
<a href="#" class="list-group-item">Vestibulum at eros</a>
</div>
</div>
{% highlight html %}
<div class="list-group">
<a href="#" class="list-group-item disabled">
Cras justo odio
</a>
<a href="#" class="list-group-item">Dapibus ac facilisis in</a>
<a href="#" class="list-group-item">Morbi leo risus</a>
<a href="#" class="list-group-item">Porta ac consectetur ac</a>
<a href="#" class="list-group-item">Vestibulum at eros</a>
</div>
{% endhighlight %}
<h3 id="list-group-contextual-classes">Contextual classes</h3>

2
docs/dist/css/bootstrap-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

3
docs/examples/blog/blog.css
View File

@ -161,3 +161,6 @@ h6, .h6 {
background-color: #f9f9f9;
border-top: 1px solid #e5e5e5;
}
.blog-footer p:last-child {
margin-bottom: 0;
}

16
less/list-group.less
View File

@ -67,6 +67,22 @@ a.list-group-item {
}
.list-group-item {
// Disabled state
&.disabled,
&.disabled:hover,
&.disabled:focus {
background-color: @list-group-disabled-bg;
color: @list-group-disabled-color;
// Force color to inherit for custom content
.list-group-item-heading {
color: inherit;
}
.list-group-item-text {
color: @list-group-disabled-text-color;
}
}
// Active class on item itself, not parent
&.active,
&.active:hover,

2
less/tables.less
View File

@ -169,7 +169,7 @@ table {
// will display normally.
.table-responsive {
@media (max-width: @screen-xs-max) {
@media screen and (max-width: @screen-xs-max) {
width: 100%;
margin-bottom: (@line-height-computed * 0.75);
overflow-y: hidden;

14
less/variables.less
View File

@ -643,16 +643,24 @@
//** List group border radius
@list-group-border-radius: @border-radius-base;
//** Background color of single list elements on hover
//** Background color of single list items on hover
@list-group-hover-bg: #f5f5f5;
//** Text color of active list elements
//** Text color of active list items
@list-group-active-color: @component-active-color;
//** Background color of active list elements
//** Background color of active list items
@list-group-active-bg: @component-active-bg;
//** Border color of active list elements
@list-group-active-border: @list-group-active-bg;
//** Text color for content within active list items
@list-group-active-text-color: lighten(@list-group-active-bg, 40%);
//** Text color of disabled list items
@list-group-disabled-color: @gray-light;
//** Background color of disabled list items
@list-group-disabled-bg: @gray-lighter;
//** Text color for content within disabled list items
@list-group-disabled-text-color: @list-group-disabled-color;
@list-group-link-color: #555;
@list-group-link-heading-color: #333;

2
test-infra/npm-shrinkwrap.canonical.json
View File

File diff suppressed because one or more lines are too long