1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 11:21:23 +02:00

Merge branch 'master' into v3.3.0

Conflicts:
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
This commit is contained in:
Mark Otto
2014-10-29 11:56:48 -07:00
9 changed files with 67 additions and 7 deletions

View File

@@ -386,6 +386,11 @@
background-repeat: repeat-x;
border-color: #3278b3;
}
.list-group-item.active .badge,
.list-group-item.active:hover .badge,
.list-group-item.active:focus .badge {
text-shadow: none;
}
.panel {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
box-shadow: 0 1px 2px rgba(0, 0, 0, .05);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long