Commit b7713b83 authored by Mark Otto's avatar Mark Otto

chance icon class

parent 4d93b639
...@@ -1112,7 +1112,7 @@ table .span12 { ...@@ -1112,7 +1112,7 @@ table .span12 {
width: 924px; width: 924px;
margin-left: 0; margin-left: 0;
} }
[class*="i-"] { [class*="icon-"] {
display: inline-block; display: inline-block;
width: 14px; width: 14px;
height: 14px; height: 14px;
...@@ -1122,370 +1122,370 @@ table .span12 { ...@@ -1122,370 +1122,370 @@ table .span12 {
background-repeat: no-repeat; background-repeat: no-repeat;
*margin-right: .3em; *margin-right: .3em;
} }
[class*="i-"]:last-child { [class*="icon-"]:last-child {
*margin-left: 0; *margin-left: 0;
} }
.i-white { .icon-white {
background-image: url(../img/glyphicons-halflings-white.png); background-image: url(../img/glyphicons-halflings-white.png);
} }
.i-glass { .icon-glass {
background-position: 0 0; background-position: 0 0;
} }
.i-music { .icon-music {
background-position: -24px 0; background-position: -24px 0;
} }
.i-search { .icon-search {
background-position: -48px 0; background-position: -48px 0;
} }
.i-envelope { .icon-envelope {
background-position: -72px 0; background-position: -72px 0;
} }
.i-heart { .icon-heart {
background-position: -96px 0; background-position: -96px 0;
} }
.i-star { .icon-star {
background-position: -120px 0; background-position: -120px 0;
} }
.i-star-empty { .icon-star-empty {
background-position: -144px 0; background-position: -144px 0;
} }
.i-user { .icon-user {
background-position: -168px 0; background-position: -168px 0;
} }
.i-film { .icon-film {
background-position: -192px 0; background-position: -192px 0;
} }
.i-th-large { .icon-th-large {
background-position: -216px 0; background-position: -216px 0;
} }
.i-th { .icon-th {
background-position: -240px 0; background-position: -240px 0;
} }
.i-th-list { .icon-th-list {
background-position: -264px 0; background-position: -264px 0;
} }
.i-ok { .icon-ok {
background-position: -288px 0; background-position: -288px 0;
} }
.i-remove { .icon-remove {
background-position: -312px 0; background-position: -312px 0;
} }
.i-zoom-in { .icon-zoom-in {
background-position: -336px 0; background-position: -336px 0;
} }
.i-zoom-out { .icon-zoom-out {
background-position: -360px 0; background-position: -360px 0;
} }
.i-off { .icon-off {
background-position: -384px 0; background-position: -384px 0;
} }
.i-signal { .icon-signal {
background-position: -408px 0; background-position: -408px 0;
} }
.i-cog { .icon-cog {
background-position: -432px 0; background-position: -432px 0;
} }
.i-trash { .icon-trash {
background-position: -456px 0; background-position: -456px 0;
} }
.i-home { .icon-home {
background-position: 0 -24px; background-position: 0 -24px;
} }
.i-file { .icon-file {
background-position: -24px -24px; background-position: -24px -24px;
} }
.i-time { .icon-time {
background-position: -48px -24px; background-position: -48px -24px;
} }
.i-road { .icon-road {
background-position: -72px -24px; background-position: -72px -24px;
} }
.i-download-alt { .icon-download-alt {
background-position: -96px -24px; background-position: -96px -24px;
} }
.i-download { .icon-download {
background-position: -120px -24px; background-position: -120px -24px;
} }
.i-upload { .icon-upload {
background-position: -144px -24px; background-position: -144px -24px;
} }
.i-inbox { .icon-inbox {
background-position: -168px -24px; background-position: -168px -24px;
} }
.i-play-circle { .icon-play-circle {
background-position: -192px -24px; background-position: -192px -24px;
} }
.i-repeat { .icon-repeat {
background-position: -216px -24px; background-position: -216px -24px;
} }
.i-refresh { .icon-refresh {
background-position: -240px -24px; background-position: -240px -24px;
} }
.i-list-alt { .icon-list-alt {
background-position: -264px -24px; background-position: -264px -24px;
} }
.i-lock { .icon-lock {
background-position: -287px -24px; background-position: -287px -24px;
} }
.i-flag { .icon-flag {
background-position: -312px -24px; background-position: -312px -24px;
} }
.i-headphones { .icon-headphones {
background-position: -336px -24px; background-position: -336px -24px;
} }
.i-volume-off { .icon-volume-off {
background-position: -360px -24px; background-position: -360px -24px;
} }
.i-volume-down { .icon-volume-down {
background-position: -384px -24px; background-position: -384px -24px;
} }
.i-volume-up { .icon-volume-up {
background-position: -408px -24px; background-position: -408px -24px;
} }
.i-qrcode { .icon-qrcode {
background-position: -432px -24px; background-position: -432px -24px;
} }
.i-barcode { .icon-barcode {
background-position: -456px -24px; background-position: -456px -24px;
} }
.i-tag { .icon-tag {
background-position: 0 -48px; background-position: 0 -48px;
} }
.i-tags { .icon-tags {
background-position: -25px -48px; background-position: -25px -48px;
} }
.i-book { .icon-book {
background-position: -48px -48px; background-position: -48px -48px;
} }
.i-bookmark { .icon-bookmark {
background-position: -72px -48px; background-position: -72px -48px;
} }
.i-print { .icon-print {
background-position: -96px -48px; background-position: -96px -48px;
} }
.i-camera { .icon-camera {
background-position: -120px -48px; background-position: -120px -48px;
} }
.i-font { .icon-font {
background-position: -144px -48px; background-position: -144px -48px;
} }
.i-bold { .icon-bold {
background-position: -167px -48px; background-position: -167px -48px;
} }
.i-italic { .icon-italic {
background-position: -192px -48px; background-position: -192px -48px;
} }
.i-text-height { .icon-text-height {
background-position: -216px -48px; background-position: -216px -48px;
} }
.i-text-width { .icon-text-width {
background-position: -240px -48px; background-position: -240px -48px;
} }
.i-align-left { .icon-align-left {
background-position: -264px -48px; background-position: -264px -48px;
} }
.i-align-center { .icon-align-center {
background-position: -288px -48px; background-position: -288px -48px;
} }
.i-align-right { .icon-align-right {
background-position: -312px -48px; background-position: -312px -48px;
} }
.i-align-justify { .icon-align-justify {
background-position: -336px -48px; background-position: -336px -48px;
} }
.i-list { .icon-list {
background-position: -360px -48px; background-position: -360px -48px;
} }
.i-indent-left { .icon-indent-left {
background-position: -384px -48px; background-position: -384px -48px;
} }
.i-indent-right { .icon-indent-right {
background-position: -408px -48px; background-position: -408px -48px;
} }
.i-facetime-video { .icon-facetime-video {
background-position: -432px -48px; background-position: -432px -48px;
} }
.i-picture { .icon-picture {
background-position: -456px -48px; background-position: -456px -48px;
} }
.i-pencil { .icon-pencil {
background-position: 0 -72px; background-position: 0 -72px;
} }
.i-map-marker { .icon-map-marker {
background-position: -24px -72px; background-position: -24px -72px;
} }
.i-adjust { .icon-adjust {
background-position: -48px -72px; background-position: -48px -72px;
} }
.i-tint { .icon-tint {
background-position: -72px -72px; background-position: -72px -72px;
} }
.i-edit { .icon-edit {
background-position: -96px -72px; background-position: -96px -72px;
} }
.i-share { .icon-share {
background-position: -120px -72px; background-position: -120px -72px;
} }
.i-check { .icon-check {
background-position: -144px -72px; background-position: -144px -72px;
} }
.i-move { .icon-move {
background-position: -168px -72px; background-position: -168px -72px;
} }
.i-step-backward { .icon-step-backward {
background-position: -192px -72px; background-position: -192px -72px;
} }
.i-fast-backward { .icon-fast-backward {
background-position: -216px -72px; background-position: -216px -72px;
} }
.i-backward { .icon-backward {
background-position: -240px -72px; background-position: -240px -72px;
} }
.i-play { .icon-play {
background-position: -264px -72px; background-position: -264px -72px;
} }
.i-pause { .icon-pause {
background-position: -288px -72px; background-position: -288px -72px;
} }
.i-stop { .icon-stop {
background-position: -312px -72px; background-position: -312px -72px;
} }
.i-forward { .icon-forward {
background-position: -336px -72px; background-position: -336px -72px;
} }
.i-fast-forward { .icon-fast-forward {
background-position: -360px -72px; background-position: -360px -72px;
} }
.i-step-forward { .icon-step-forward {
background-position: -384px -72px; background-position: -384px -72px;
} }
.i-eject { .icon-eject {
background-position: -408px -72px; background-position: -408px -72px;
} }
.i-chevron-left { .icon-chevron-left {
background-position: -432px -72px; background-position: -432px -72px;
} }
.i-chevron-right { .icon-chevron-right {
background-position: -456px -72px; background-position: -456px -72px;
} }
.i-plus-sign { .icon-plus-sign {
background-position: 0 -96px; background-position: 0 -96px;
} }
.i-minus-sign { .icon-minus-sign {
background-position: -24px -96px; background-position: -24px -96px;
} }
.i-remove-sign { .icon-remove-sign {
background-position: -48px -96px; background-position: -48px -96px;
} }
.i-ok-sign { .icon-ok-sign {
background-position: -72px -96px; background-position: -72px -96px;
} }
.i-question-sign { .icon-question-sign {
background-position: -96px -96px; background-position: -96px -96px;
} }
.i-info-sign { .icon-info-sign {
background-position: -120px -96px; background-position: -120px -96px;
} }
.i-screenshot { .icon-screenshot {
background-position: -144px -96px; background-position: -144px -96px;
} }
.i-remove-circle { .icon-remove-circle {
background-position: -168px -96px; background-position: -168px -96px;
} }
.i-ok-circle { .icon-ok-circle {
background-position: -192px -96px; background-position: -192px -96px;
} }
.i-ban-circle { .icon-ban-circle {
background-position: -216px -96px; background-position: -216px -96px;
} }
.i-arrow-left { .icon-arrow-left {
background-position: -240px -96px; background-position: -240px -96px;
} }
.i-arrow-right { .icon-arrow-right {
background-position: -264px -96px; background-position: -264px -96px;
} }
.i-arrow-up { .icon-arrow-up {
background-position: -289px -96px; background-position: -289px -96px;
} }
.i-arrow-down { .icon-arrow-down {
background-position: -312px -96px; background-position: -312px -96px;
} }
.i-share-alt { .icon-share-alt {
background-position: -336px -96px; background-position: -336px -96px;
} }
.i-resize-full { .icon-resize-full {
background-position: -360px -96px; background-position: -360px -96px;
} }
.i-resize-small { .icon-resize-small {
background-position: -384px -96px; background-position: -384px -96px;
} }
.i-plus { .icon-plus {
background-position: -408px -96px; background-position: -408px -96px;
} }
.i-minus { .icon-minus {
background-position: -433px -96px; background-position: -433px -96px;
} }
.i-asterisk { .icon-asterisk {
background-position: -456px -96px; background-position: -456px -96px;
} }
.i-exclamation-sign { .icon-exclamation-sign {
background-position: 0 -120px; background-position: 0 -120px;
} }
.i-gift { .icon-gift {
background-position: -24px -120px; background-position: -24px -120px;
} }
.i-leaf { .icon-leaf {
background-position: -48px -120px; background-position: -48px -120px;
} }
.i-fire { .icon-fire {
background-position: -72px -120px; background-position: -72px -120px;
} }
.i-eye-open { .icon-eye-open {
background-position: -96px -120px; background-position: -96px -120px;
} }
.i-eye-close { .icon-eye-close {
background-position: -120px -120px; background-position: -120px -120px;
} }
.i-warning-sign { .icon-warning-sign {
background-position: -144px -120px; background-position: -144px -120px;
} }
.i-plane { .icon-plane {
background-position: -168px -120px; background-position: -168px -120px;
} }
.i-calendar { .icon-calendar {
background-position: -192px -120px; background-position: -192px -120px;
} }
.i-random { .icon-random {
background-position: -216px -120px; background-position: -216px -120px;
} }
.i-comment { .icon-comment {
background-position: -240px -120px; background-position: -240px -120px;
} }
.i-magnet { .icon-magnet {
background-position: -264px -120px; background-position: -264px -120px;
} }
.i-chevron-up { .icon-chevron-up {
background-position: -288px -120px; background-position: -288px -120px;
} }
.i-chevron-down { .icon-chevron-down {
background-position: -313px -119px; background-position: -313px -119px;
} }
.i-retweet { .icon-retweet {
background-position: -336px -120px; background-position: -336px -120px;
} }
.i-shopping-cart { .icon-shopping-cart {
background-position: -360px -120px; background-position: -360px -120px;
} }
.i-folder-close { .icon-folder-close {
background-position: -384px -120px; background-position: -384px -120px;
} }
.i-folder-open { .icon-folder-open {
background-position: -408px -120px; background-position: -408px -120px;
} }
.i-resize-vertical { .icon-resize-vertical {
background-position: -432px -119px; background-position: -432px -119px;
} }
.i-resize-horizontal { .icon-resize-horizontal {
background-position: -456px -118px; background-position: -456px -118px;
} }
.dropdown { .dropdown {
...@@ -2381,7 +2381,7 @@ button.btn.small, input[type="submit"].btn.small { ...@@ -2381,7 +2381,7 @@ button.btn.small, input[type="submit"].btn.small {
.btn-navbar:active, .btn-navbar.active { .btn-navbar:active, .btn-navbar.active {
background-color: #080808 \9; background-color: #080808 \9;
} }
.btn-navbar .i-bar { .btn-navbar .icon-bar {
display: block; display: block;
width: 18px; width: 18px;
height: 2px; height: 2px;
...@@ -2393,7 +2393,7 @@ button.btn.small, input[type="submit"].btn.small { ...@@ -2393,7 +2393,7 @@ button.btn.small, input[type="submit"].btn.small {
-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
} }
.btn-navbar .i-bar + .i-bar { .btn-navbar .icon-bar + .icon-bar {
margin-top: 3px; margin-top: 3px;
} }
.nav-collapse.collapse { .nav-collapse.collapse {
......
This diff is collapsed.
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse">
...@@ -548,13 +548,13 @@ ...@@ -548,13 +548,13 @@
<div class="well" style="padding: 8px 0;"> <div class="well" style="padding: 8px 0;">
<ul class="nav nav-list"> <ul class="nav nav-list">
<li class="nav-header">List header</li> <li class="nav-header">List header</li>
<li class="active"><a href="#"><i class="i-white i-home"></i> Home</a></li> <li class="active"><a href="#"><i class="icon-white icon-home"></i> Home</a></li>
<li><a href="#"><i class="i-book"></i> Library</a></li> <li><a href="#"><i class="icon-book"></i> Library</a></li>
<li><a href="#"><i class="i-pencil"></i> Applications</a></li> <li><a href="#"><i class="icon-pencil"></i> Applications</a></li>
<li class="nav-header">Another list header</li> <li class="nav-header">Another list header</li>
<li><a href="#"><i class="i-user"></i> Profile</a></li> <li><a href="#"><i class="icon-user"></i> Profile</a></li>
<li><a href="#"><i class="i-cog"></i> Settings</a></li> <li><a href="#"><i class="icon-cog"></i> Settings</a></li>
<li><a href="#"><i class="i-flag"></i> Help</a></li> <li><a href="#"><i class="icon-flag"></i> Help</a></li>
</ul> </ul>
</div> <!-- /well --> </div> <!-- /well -->
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -562,7 +562,7 @@ ...@@ -562,7 +562,7 @@
... ...
&lt;li&gt; &lt;li&gt;
&lt;a href="#"&gt; &lt;a href="#"&gt;
&lt;i class="i-book"&gt;&lt;/i&gt; &lt;i class="icon-book"&gt;&lt;/i&gt;
Library Library
&lt;/a&gt; &lt;/a&gt;
&lt;/li&gt; &lt;/li&gt;
...@@ -744,9 +744,9 @@ ...@@ -744,9 +744,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container" style="width: auto;"> <div class="container" style="width: auto;">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="#">Project name</a> <a class="brand" href="#">Project name</a>
<div class="nav-collapse"> <div class="nav-collapse">
...@@ -830,9 +830,9 @@ ...@@ -830,9 +830,9 @@
&lt;!-- .btn-navbar is used as the toggle for collapsed navbar content --&gt; &lt;!-- .btn-navbar is used as the toggle for collapsed navbar content --&gt;
&lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt; &lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt;
&lt;span class="i-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;span class="i-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;span class="i-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;/a&gt; &lt;/a&gt;
&lt;!-- Be sure to leave the brand out there if you want it shown --&gt; &lt;!-- Be sure to leave the brand out there if you want it shown --&gt;
...@@ -946,7 +946,7 @@ ...@@ -946,7 +946,7 @@
<h1>Pagination <small>Two options for paging through content</small></h1> <h1>Pagination <small>Two options for paging through content</small></h1>
</div> </div>
<h2>Multi-page pagination</h2> <h2>Multicon-page pagination</h2>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<h3>When to use</h3> <h3>When to use</h3>
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse">
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse">
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse">
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse">
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse">
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse">
...@@ -265,8 +265,8 @@ ...@@ -265,8 +265,8 @@
<div class="span6"> <div class="span6">
<h2>Fixed layout</h2> <h2>Fixed layout</h2>
<p>The default and simple 940px-wide, centered layout for just about any website or page provided by a single <code>&lt;div class="container"&gt;</code>.</p> <p>The default and simple 940px-wide, centered layout for just about any website or page provided by a single <code>&lt;div class="container"&gt;</code>.</p>
<div class="mini-layout"> <div class="minicon-layout">
<div class="mini-layout-body"></div> <div class="minicon-layout-body"></div>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;body&gt; &lt;body&gt;
...@@ -279,9 +279,9 @@ ...@@ -279,9 +279,9 @@
<div class="span6"> <div class="span6">
<h2>Fluid layout</h2> <h2>Fluid layout</h2>
<p><code>&lt;div class="container-fluid"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.</p> <p><code>&lt;div class="container-fluid"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.</p>
<div class="mini-layout fluid"> <div class="minicon-layout fluid">
<div class="mini-layout-sidebar"></div> <div class="minicon-layout-sidebar"></div>
<div class="mini-layout-body"></div> <div class="minicon-layout-body"></div>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="container-fluid"&gt; &lt;div class="container-fluid"&gt;
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse">
......
This diff is collapsed.
...@@ -472,13 +472,13 @@ ...@@ -472,13 +472,13 @@
<div class="well" style="padding: 8px 0;"> <div class="well" style="padding: 8px 0;">
<ul class="nav nav-list"> <ul class="nav nav-list">
<li class="nav-header">{{_i}}List header{{/i}}</li> <li class="nav-header">{{_i}}List header{{/i}}</li>
<li class="active"><a href="#"><i class="i-white i-home"></i> {{_i}}Home{{/i}}</a></li> <li class="active"><a href="#"><i class="icon-white icon-home"></i> {{_i}}Home{{/i}}</a></li>
<li><a href="#"><i class="i-book"></i> {{_i}}Library{{/i}}</a></li> <li><a href="#"><i class="icon-book"></i> {{_i}}Library{{/i}}</a></li>
<li><a href="#"><i class="i-pencil"></i> {{_i}}Applications{{/i}}</a></li> <li><a href="#"><i class="icon-pencil"></i> {{_i}}Applications{{/i}}</a></li>
<li class="nav-header">{{_i}}Another list header{{/i}}</li> <li class="nav-header">{{_i}}Another list header{{/i}}</li>
<li><a href="#"><i class="i-user"></i> {{_i}}Profile{{/i}}</a></li> <li><a href="#"><i class="icon-user"></i> {{_i}}Profile{{/i}}</a></li>
<li><a href="#"><i class="i-cog"></i> {{_i}}Settings{{/i}}</a></li> <li><a href="#"><i class="icon-cog"></i> {{_i}}Settings{{/i}}</a></li>
<li><a href="#"><i class="i-flag"></i> {{_i}}Help{{/i}}</a></li> <li><a href="#"><i class="icon-flag"></i> {{_i}}Help{{/i}}</a></li>
</ul> </ul>
</div> <!-- /well --> </div> <!-- /well -->
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -486,7 +486,7 @@ ...@@ -486,7 +486,7 @@
... ...
&lt;li&gt; &lt;li&gt;
&lt;a href="#"&gt; &lt;a href="#"&gt;
&lt;i class="i-book"&gt;&lt;/i&gt; &lt;i class="icon-book"&gt;&lt;/i&gt;
{{_i}}Library{{/i}} {{_i}}Library{{/i}}
&lt;/a&gt; &lt;/a&gt;
&lt;/li&gt; &lt;/li&gt;
...@@ -668,9 +668,9 @@ ...@@ -668,9 +668,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container" style="width: auto;"> <div class="container" style="width: auto;">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="#">{{_i}}Project name{{/i}}</a> <a class="brand" href="#">{{_i}}Project name{{/i}}</a>
<div class="nav-collapse"> <div class="nav-collapse">
...@@ -754,9 +754,9 @@ ...@@ -754,9 +754,9 @@
&lt;!-- .btn-navbar is used as the toggle for collapsed navbar content --&gt; &lt;!-- .btn-navbar is used as the toggle for collapsed navbar content --&gt;
&lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt; &lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt;
&lt;span class="i-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;span class="i-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;span class="i-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;/a&gt; &lt;/a&gt;
&lt;!-- Be sure to leave the brand out there if you want it shown --&gt; &lt;!-- Be sure to leave the brand out there if you want it shown --&gt;
...@@ -870,7 +870,7 @@ ...@@ -870,7 +870,7 @@
<h1>{{_i}}Pagination{{/i}} <small>{{_i}}Two options for paging through content{{/i}}</small></h1> <h1>{{_i}}Pagination{{/i}} <small>{{_i}}Two options for paging through content{{/i}}</small></h1>
</div> </div>
<h2>{{_i}}Multi-page pagination{{/i}}</h2> <h2>{{_i}}Multicon-page pagination{{/i}}</h2>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<h3>{{_i}}When to use{{/i}}</h3> <h3>{{_i}}When to use{{/i}}</h3>
......
...@@ -189,8 +189,8 @@ ...@@ -189,8 +189,8 @@
<div class="span6"> <div class="span6">
<h2>{{_i}}Fixed layout{{/i}}</h2> <h2>{{_i}}Fixed layout{{/i}}</h2>
<p>{{_i}}The default and simple 940px-wide, centered layout for just about any website or page provided by a single <code>&lt;div class="container"&gt;</code>.{{/i}}</p> <p>{{_i}}The default and simple 940px-wide, centered layout for just about any website or page provided by a single <code>&lt;div class="container"&gt;</code>.{{/i}}</p>
<div class="mini-layout"> <div class="minicon-layout">
<div class="mini-layout-body"></div> <div class="minicon-layout-body"></div>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;body&gt; &lt;body&gt;
...@@ -203,9 +203,9 @@ ...@@ -203,9 +203,9 @@
<div class="span6"> <div class="span6">
<h2>{{_i}}Fluid layout{{/i}}</h2> <h2>{{_i}}Fluid layout{{/i}}</h2>
<p>{{_i}}<code>&lt;div class="container-fluid"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}</p> <p>{{_i}}<code>&lt;div class="container-fluid"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}</p>
<div class="mini-layout fluid"> <div class="minicon-layout fluid">
<div class="mini-layout-sidebar"></div> <div class="minicon-layout-sidebar"></div>
<div class="mini-layout-body"></div> <div class="minicon-layout-body"></div>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="container-fluid"&gt; &lt;div class="container-fluid"&gt;
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
<span class="i-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse"> <div class="nav-collapse">
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
@shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
.box-shadow(@shadow); .box-shadow(@shadow);
} }
.btn-navbar .i-bar { .btn-navbar .icon-bar {
display: block; display: block;
width: 18px; width: 18px;
height: 2px; height: 2px;
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
.border-radius(1px); .border-radius(1px);
.box-shadow(0 1px 0 rgba(0,0,0,.25)); .box-shadow(0 1px 0 rgba(0,0,0,.25));
} }
.btn-navbar .i-bar + .i-bar { .btn-navbar .icon-bar + .icon-bar {
margin-top: 3px; margin-top: 3px;
} }
// Override the default collapsed state // Override the default collapsed state
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment