rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
commit df3eb66ede
18 changed files with 122 additions and 18 deletions
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