diff options
| author | Mark Otto <[email protected]> | 2012-11-03 16:15:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-03 16:15:54 -0700 |
| commit | a56de2b84f8d6b4952c400847a7d73e7c3abd536 (patch) | |
| tree | 1ee8eff0e34bfd73c9de1b96215341eaa4cec7fb /docs/assets/css/docs.css | |
| parent | c0eacca0dbf9fec606968e08e1b21f8ec80e67ef (diff) | |
| parent | 4b3fb3087738ba2836538bacd34256503b6afc96 (diff) | |
| download | bootstrap-a56de2b84f8d6b4952c400847a7d73e7c3abd536.tar.xz bootstrap-a56de2b84f8d6b4952c400847a7d73e7c3abd536.zip | |
Merge branch 'glyphicons_font' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
less/sprites.less
Diffstat (limited to 'docs/assets/css/docs.css')
| -rw-r--r-- | docs/assets/css/docs.css | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 335d05a02..c3fbf0c2c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -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 { |