mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

Merge branch 'glyphicons_font' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less
This commit is contained in:
Mark Otto
2012-11-03 16:15:54 -07:00
parent c0eacca0db 4b3fb30877
commit a56de2b84f
25 changed files with 1436 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+12 -7
View File
@@ -536,7 +536,11 @@ h2 + .row {
width: 25%;
line-height: 25px;
}
.the-icons i:hover {
.the-icons [class^="glyphicon-"] {
vertical-align: middle;
margin-right: 3px;
}
.the-icons li:hover [class^="glyphicon-"] {
background-color: rgba(255,0,0,.25);
}
@@ -756,18 +760,19 @@ form.bs-docs-example {
margin: 30px 0 0;
}
/* Chevrons */
.bs-docs-sidenav .icon-chevron-right {
.bs-docs-sidenav .glyphicon-chevron-right {
float: right;
margin-top: 2px;
margin-top: -2px;
margin-right: -6px;
opacity: .25;
color: #000;
}
.bs-docs-sidenav a:hover .icon-chevron-right {
.bs-docs-sidenav a:hover .glyphicon-chevron-right {
opacity: .5;
}
.bs-docs-sidenav .active .icon-chevron-right,
.bs-docs-sidenav .active a:hover .icon-chevron-right {
background-image: url(../img/glyphicons-halflings-white.png);
.bs-docs-sidenav .active .glyphicon-chevron-right,
.bs-docs-sidenav .active a:hover .glyphicon-chevron-right {
color: #fff;
opacity: 1;
}
.bs-docs-sidenav.affix {