Skip to content

Commit

Permalink
Merge pull request #23 from jjt/master
Browse files Browse the repository at this point in the history
Added new 2.0.2 icons to _sprites.scss, and .badge-important
  • Loading branch information
jlong committed Apr 29, 2012
2 parents c2b1688 + 2292767 commit e139cc8
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 0 deletions.
Binary file modified img/glyphicons-halflings-white.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/glyphicons-halflings.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions lib/_badges.scss
Expand Up @@ -20,6 +20,9 @@
}

// Colors
.badge-important { background-color: $errorText; }
.badge-important:hover { background-color: darken($errorText, 10%); }

.badge-error { background-color: $errorText; }
.badge-error:hover { background-color: darken($errorText, 10%); }

Expand Down
21 changes: 21 additions & 0 deletions lib/_sprites.scss
Expand Up @@ -156,3 +156,24 @@
.icon-folder-open { background-position: -408px -120px; }
.icon-resize-vertical { background-position: -432px -119px; }
.icon-resize-horizontal { background-position: -456px -118px; }

.icon-hdd { background-position: 0 -144px; }
.icon-bullhorn { background-position: -24px -144px; }
.icon-bell { background-position: -48px -144px; }
.icon-certificate { background-position: -72px -144px; }
.icon-thumbs-up { background-position: -96px -144px; }
.icon-thumbs-down { background-position: -120px -144px; }
.icon-hand-right { background-position: -144px -144px; }
.icon-hand-left { background-position: -168px -144px; }
.icon-hand-up { background-position: -192px -144px; }
.icon-hand-down { background-position: -216px -144px; }
.icon-circle-arrow-right { background-position: -240px -144px; }
.icon-circle-arrow-left { background-position: -264px -144px; }
.icon-circle-arrow-up { background-position: -288px -144px; }
.icon-circle-arrow-down { background-position: -312px -144px; }
.icon-globe { background-position: -336px -144px; }
.icon-wrench { background-position: -360px -144px; }
.icon-tasks { background-position: -384px -144px; }
.icon-filter { background-position: -408px -144px; }
.icon-briefcase { background-position: -432px -144px; }
.icon-fullscreen { background-position: -456px -144px; }

0 comments on commit e139cc8

Please sign in to comment.