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

Merge branch 'master' into v3.3.0

Browse source 
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
commit 16dbdbd7a2
9 changed files with 67 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

5
docs/dist/css/bootstrap-theme.css vendored
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);

2
docs/dist/css/bootstrap-theme.css.map vendored
View file

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap-theme.min.css vendored
View file

File diff suppressed because one or more lines are too long