Skip to content

Commit

Permalink
Updating to latest version of Glyphicons Halflings set (v.1.5) along …
Browse files Browse the repository at this point in the history 
…with some icon enhancements like:

- Updated the Gylphicons Halflings set to version 1.5 (30 new icons)
- Optimized the sprite PNG files for minimum filesize without any quality loss
- Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down)
- Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal)
- Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon)
- Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases)
- Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template)
- Changed one of the button examples to danger style and used a white icon
- Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png)
  • Loading branch information
@buraktuyan
buraktuyan committed Jan 27, 2012
1 parent 11d7ef1 commit 942d1b4
Show file tree
Hide file tree
Showing 12 changed files with 234 additions and 52 deletions.
108 changes: 99 additions & 9 deletions docs/assets/css/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1066,19 +1066,19 @@ table .span12 {
margin-left: 0;
}
.icon {
background-image: url(../img/glyphicons-halflings-sprite.png);
background-position: 0 0;
background-image: url(../img/glyphicons-halflings.png);
background-position: 14px 14px;
background-repeat: no-repeat;
display: inline-block;
vertical-align: text-top;
width: 14px;
height: 14px;
}
.icon.white {
background-image: url(../img/glyphicons-halflings-sprite-white.png);
background-image: url(../img/glyphicons-halflings-white.png);
}
.icon.glass {
background-position: 0 0;
background-position: 0 0;
}
.icon.music {
background-position: -24px 0;
Expand Down Expand Up @@ -1170,7 +1170,7 @@ table .span12 {
.icon.refresh {
background-position: -240px -24px;
}
.icon.calendar {
.icon.list-alt {
background-position: -264px -24px;
}
.icon.lock {
Expand Down Expand Up @@ -1201,7 +1201,7 @@ table .span12 {
background-position: 0 -48px;
}
.icon.tags {
background-position: -24px -48px;
background-position: -25px -48px;
}
.icon.book {
background-position: -48px -48px;
Expand All @@ -1219,7 +1219,7 @@ table .span12 {
background-position: -144px -48px;
}
.icon.bold {
background-position: -168px -48px;
background-position: -167px -48px;
}
.icon.italic {
background-position: -192px -48px;
Expand Down Expand Up @@ -1320,11 +1320,41 @@ table .span12 {
.icon.arrow-left {
background-position: -240px -96px;
}
.icon.plus-sign {
background-position: 0 -96px;
}
.icon.minus-sign {
background-position: -24px -96px;
}
.icon.remove-sign {
background-position: -48px -96px;
}
.icon.ok-sign {
background-position: -72px -96px;
}
.icon.question-sign {
background-position: -96px -96px;
}
.icon.info-sign {
background-position: -120px -96px;
}
.icon.screenshot {
background-position: -144px -96px;
}
.icon.remove-circle {
background-position: -168px -96px;
}
.icon.ok-circle {
background-position: -192px -96px;
}
.icon.ban-circle {
background-position: -216px -96px;
}
.icon.arrow-right {
background-position: -264px -96px;
}
.icon.arrow-up {
background-position: -288px -96px;
background-position: -289px -96px;
}
.icon.arrow-down {
background-position: -312px -96px;
Expand All @@ -1342,11 +1372,71 @@ table .span12 {
background-position: -408px -96px;
}
.icon.minus {
background-position: -432px -96px;
background-position: -433px -96px;
}
.icon.asterisk {
background-position: -456px -96px;
}
.icon.exclamation-sign {
background-position: 0 -120px;
}
.icon.gift {
background-position: -24px -120px;
}
.icon.leaf {
background-position: -48px -120px;
}
.icon.fire {
background-position: -72px -120px;
}
.icon.eye-open {
background-position: -96px -120px;
}
.icon.eye-close {
background-position: -120px -120px;
}
.icon.warning-sign {
background-position: -144px -120px;
}
.icon.plane {
background-position: -168px -120px;
}
.icon.calendar {
background-position: -192px -120px;
}
.icon.random {
background-position: -216px -120px;
}
.icon.comment {
background-position: -240px -120px;
}
.icon.magnet {
background-position: -264px -120px;
}
.icon.chevron-up {
background-position: -288px -120px;
}
.icon.chevron-down {
background-position: -313px -119px;
}
.icon.retweet {
background-position: -336px -120px;
}
.icon.shopping-cart {
background-position: -360px -120px;
}
.icon.folder-close {
background-position: -384px -120px;
}
.icon.folder-open {
background-position: -409px -120px;
}
.icon.resize-vertical {
background-position: -432px -119px;
}
.icon.resize-horizontal {
background-position: -456px -118px;
}
.dropdown {
position: relative;
}
Expand Down
Binary file removed docs/assets/img/glyphicons-halflings-sprite-white.png
View file
Binary file not shown.
Binary file removed docs/assets/img/glyphicons-halflings-sprite.png
View file
Binary file not shown.
Binary file added docs/assets/img/glyphicons-halflings-white.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/img/glyphicons-halflings.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 46 additions & 16 deletions docs/base-css.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1338,19 +1338,19 @@ <h1>Icons <small>Graciously provided by <a href="http://glyphicons.com" target="
<i class="icon home"></i>
<i class="icon file"></i>
<i class="icon time"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon road"></i>
<i class="icon download-alt"></i>
<i class="icon download"></i>
<i class="icon upload"></i>
<i class="icon inbox"></i>
<i class="icon play-circle"></i>
<i class="icon repeat"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon refresh"></i>
<i class="icon calendar"></i>
<i class="icon list-alt"></i>
<i class="icon lock"></i>
<i class="icon flag"></i>
<i class="icon headphones"></i>
Expand All @@ -1366,10 +1366,6 @@ <h1>Icons <small>Graciously provided by <a href="http://glyphicons.com" target="
<i class="icon bookmark"></i>
<i class="icon print"></i>
<i class="icon camera"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon font"></i>
<i class="icon bold"></i>
<i class="icon italic"></i>
Expand All @@ -1384,7 +1380,10 @@ <h1>Icons <small>Graciously provided by <a href="http://glyphicons.com" target="
<i class="icon indent-right"></i>
<i class="icon facetime-video"></i>
<i class="icon picture"></i>

</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon pencil"></i>
<i class="icon map-marker"></i>
<i class="icon adjust"></i>
Expand All @@ -1394,10 +1393,6 @@ <h1>Icons <small>Graciously provided by <a href="http://glyphicons.com" target="
<i class="icon check"></i>
<i class="icon move"></i>
<i class="icon step-backward"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon fast-backward"></i>
<i class="icon backward"></i>
<i class="icon play"></i>
Expand All @@ -1410,6 +1405,20 @@ <h1>Icons <small>Graciously provided by <a href="http://glyphicons.com" target="
<i class="icon chevron-left"></i>
<i class="icon chevron-right"></i>

<i class="icon plus-sign"></i>
<i class="icon minus-sign"></i>
<i class="icon remove-sign"></i>
<i class="icon ok-sign"></i>
<i class="icon question-sign"></i>
<i class="icon info-sign"></i>
<i class="icon screenshot"></i>
<i class="icon remove-circle"></i>
<i class="icon ok-circle"></i>
<i class="icon ban-circle"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon arrow-left"></i>
<i class="icon arrow-right"></i>
<i class="icon arrow-up"></i>
Expand All @@ -1420,6 +1429,27 @@ <h1>Icons <small>Graciously provided by <a href="http://glyphicons.com" target="
<i class="icon plus"></i>
<i class="icon minus"></i>
<i class="icon asterisk"></i>

<i class="icon exclamation-sign"></i>
<i class="icon gift"></i>
<i class="icon leaf"></i>
<i class="icon fire"></i>
<i class="icon eye-open"></i>
<i class="icon eye-close"></i>
<i class="icon warning-sign"></i>
<i class="icon plane"></i>
<i class="icon calendar"></i>
<i class="icon random"></i>
<i class="icon comment"></i>
<i class="icon magnet"></i>
<i class="icon chevron-up"></i>
<i class="icon chevron-down"></i>
<i class="icon retweet"></i>
<i class="icon shopping-cart"></i>
<i class="icon folder-close"></i>
<i class="icon folder-open"></i>
<i class="icon resize-vertical"></i>
<i class="icon resize-horizontal"></i>
</div>
</div>
</div>
Expand All @@ -1441,7 +1471,7 @@ <h3>How to use</h3>
<pre class="prettyprint linenums">
&lt;i class="icon search"&gt;&lt;/i&gt;
</pre>
<p>There are over 100 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
<p>There are 120 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
</div>
<div class="span4">
<h3>Use cases</h3>
Expand All @@ -1462,7 +1492,7 @@ <h3>Examples</h3>
<p>Use them in buttons, or in button groups for a toolbar style presentation.</p>
<p>
<a class="btn" href="#"><i class="icon refresh"></i> Refresh</a>
<a class="btn" href="#"><i class="icon cog"></i> Settings</a>
<a class="btn danger" href="#"><i class="icon white trash"></i> Delete</a>
</p>
<div class="btn-toolbar">
<div class="btn-group">
Expand Down
Loading

0 comments on commit 942d1b4

Please sign in to comment.