mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Code Activity

Merge branch 'master' into derp

Browse Source 
Conflicts:
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/_variables.less
This commit is contained in:
Mark Otto
2014-11-09 23:48:56 -08:00
parent f17b636bce c4847c8f6b
commit 2cc66cbb58
12 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/src/docs.css
+2 -2
View File
@@ -437,7 +437,7 @@ body {
color: #333;
}
.bs-docs-featurette-img:hover {
color: #428bca;
color: #337ab7;
text-decoration: none;
}
.bs-docs-featurette-img img {
@@ -771,7 +771,7 @@ h1[id] {
background-color: #eee;
}
.color-swatches .brand-primary {
background-color: #428bca;
background-color: #337ab7;
}
.color-swatches .brand-success {
background-color: #5cb85c;