mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Code Activity

Merge branch 'master' into pr/11302

Browse Source 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-12-14 16:46:40 -08:00
parent 2b56ff0461 d79431ca02
commit 4c64c1eecd
121 changed files with 5711 additions and 4524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs-assets/css/docs.css
+43 -15
View File
@@ -586,17 +586,46 @@ h1[id] {
border-color: #faebcc;
}
.bs-callout-warning h4 {
color: #c09853;
color: #8a6d3b;
}
.bs-callout-info {
background-color: #f4f8fa;
border-color: #bce8f1;
}
.bs-callout-info h4 {
color: #3a87ad;
color: #34789a;
}
/*
* Color swatches
*
* Color swatches and associated values for our grayscale and brand colors.
*/
.color-swatches {
margin: 0 -5px;
overflow: hidden; /* clearfix */
}
.color-swatch {
float: left;
width: 100px;
height: 100px;
margin: 0 5px;
border-radius: 3px;
}
.color-swatches .gray-darker { background-color: #222; }
.color-swatches .gray-dark { background-color: #333; }
.color-swatches .gray { background-color: #555; }
.color-swatches .gray-light { background-color: #999; }
.color-swatches .gray-lighter { background-color: #eee; }
.color-swatches .brand-primary { background-color: #428bca; }
.color-swatches .brand-success { background-color: #5cb85c; }
.color-swatches .brand-warning { background-color: #f0ad4e; }
.color-swatches .brand-danger { background-color: #d9534f; }
.color-swatches .brand-info { background-color: #5bc0de; }
/*
* Team members
*
@@ -921,7 +950,6 @@ h1[id] {
*/
.highlight {
display: none; /* hidden by default, until >480px */
padding: 9px 14px;
margin-bottom: 14px;
background-color: #f7f7f9;
@@ -949,13 +977,6 @@ h1[id] {
color: #bebec5;
}
/* Show code snippets when we have the space */
@media (min-width: 481px) {
.highlight {
display: block;
}
}
/*
* Responsive tests
@@ -1038,19 +1059,20 @@ h1[id] {
*/
.bs-glyphicons {
padding-left: 0;
padding-bottom: 1px;
margin-bottom: 20px;
list-style: none;
margin: 0 -19px 20px -16px;
overflow: hidden;
}
.bs-glyphicons-list {
padding-left: 0;
list-style: none;
}
.bs-glyphicons li {
float: left;
width: 25%;
height: 115px;
padding: 10px;
margin: 0 -1px -1px 0;
font-size: 12px;
font-size: 10px;
line-height: 1.4;
text-align: center;
border: 1px solid #ddd;
@@ -1063,14 +1085,20 @@ h1[id] {
.bs-glyphicons .glyphicon-class {
display: block;
text-align: center;
word-wrap: break-word; /* Help out IE10+ with class names */
}
.bs-glyphicons li:hover {
background-color: rgba(86,61,124,.1);
}
@media (min-width: 768px) {
.bs-glyphicons {
margin-left: 0;
margin-right: 0;
}
.bs-glyphicons li {
width: 12.5%;
font-size: 12px;
}
}