Commit 72198a59 authored by Mark Otto's avatar Mark Otto
Browse files

removing glyphicons images, swapping in new icon font with new classes

parent d0c75bbc
Showing with 1163 additions and 707 deletions
+1163 -707
......@@ -22,7 +22,7 @@ build:
@recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
@echo "Compiling LESS with Recess... ${CHECK} Done"
@node docs/build
@cp img/* docs/assets/img/
@cp fonts/* docs/assets/fonts/
@cp js/*.js docs/assets/js/
@cp js/tests/vendor/jquery.js docs/assets/js/
@echo "Compiling documentation... ${CHECK} Done"
......@@ -63,10 +63,10 @@ clean:
#
bootstrap:
mkdir -p bootstrap/img
mkdir -p bootstrap/fonts
mkdir -p bootstrap/css
mkdir -p bootstrap/js
cp img/* bootstrap/img/
cp fonts/* bootstrap/fonts/
recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
......
......@@ -2153,598 +2153,657 @@ table th[class*="span"],
background-color: #c4e3f3;
}
[class^="icon-"],
[class*=" icon-"] {
@font-face {
font-family: 'Glyphicons Halflings';
font-style: normal;
font-weight: normal;
src: url('../fonts/glyphiconshalflings-regular.eot');
src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphiconshalflings-regular.woff') format('woff'), url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'), url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg');
}
[class^="glyphicon-"]:before {
display: inline-block;
width: 14px;
height: 14px;
margin-top: 1px;
*margin-right: .3em;
line-height: 14px;
vertical-align: text-top;
background-image: url("../img/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat;
font: normal 12px/1 'Glyphicons Halflings';
}
.glyphicon-glass:before {
content: "\e001";
}
.glyphicon-music:before {
content: "\e002";
}
.glyphicon-search:before {
content: "\e003";
}
.glyphicon-envelope:before {
content: "\2709";
}
.glyphicon-heart:before {
content: "\e005";
}
.glyphicon-star:before {
content: "\e006";
}
.glyphicon-star-empty:before {
content: "\e007";
}
.glyphicon-user:before {
content: "\e008";
}
/* White icons with optional class, or on hover/active states of certain elements */
.glyphicon-film:before {
content: "\e009";
}
.glyphicon-th-large:before {
content: "\e010";
}
.glyphicon-th:before {
content: "\e011";
}
.glyphicon-th-list:before {
content: "\e012";
}
.icon-white,
.nav-pills > .active > a > [class^="icon-"],
.nav-pills > .active > a > [class*=" icon-"],
.nav-list > .active > a > [class^="icon-"],
.nav-list > .active > a > [class*=" icon-"],
.navbar-inverse .nav > .active > a > [class^="icon-"],
.navbar-inverse .nav > .active > a > [class*=" icon-"],
.dropdown-menu > li > a:hover > [class^="icon-"],
.dropdown-menu > li > a:hover > [class*=" icon-"],
.dropdown-menu > .active > a > [class^="icon-"],
.dropdown-menu > .active > a > [class*=" icon-"],
.dropdown-submenu:hover > a > [class^="icon-"],
.dropdown-submenu:hover > a > [class*=" icon-"] {
background-image: url("../img/glyphicons-halflings-white.png");
.glyphicon-ok:before {
content: "\e013";
}
.icon-glass {
background-position: 0 0;
.glyphicon-remove:before {
content: "\e014";
}
.icon-music {
background-position: -24px 0;
.glyphicon-zoom-in:before {
content: "\e015";
}
.icon-search {
background-position: -48px 0;
.glyphicon-zoom-out:before {
content: "\e016";
}
.icon-envelope {
background-position: -72px 0;
.glyphicon-off:before {
content: "\e017";
}
.icon-heart {
background-position: -96px 0;
.glyphicon-signal:before {
content: "\e018";
}
.icon-star {
background-position: -120px 0;
.glyphicon-cog:before {
content: "\e019";
}
.icon-star-empty {
background-position: -144px 0;
.glyphicon-trash:before {
content: "\e020";
}
.icon-user {
background-position: -168px 0;
.glyphicon-home:before {
content: "\e021";
}
.icon-film {
background-position: -192px 0;
.glyphicon-file:before {
content: "\e022";
}
.icon-th-large {
background-position: -216px 0;
.glyphicon-time:before {
content: "\e023";
}
.icon-th {
background-position: -240px 0;
.glyphicon-road:before {
content: "\e024";
}
.icon-th-list {
background-position: -264px 0;
.glyphicon-download-alt:before {
content: "\e025";
}
.icon-ok {
background-position: -288px 0;
.glyphicon-download:before {
content: "\e026";
}
.icon-remove {
background-position: -312px 0;
.glyphicon-upload:before {
content: "\e027";
}
.icon-zoom-in {
background-position: -336px 0;
.glyphicon-inbox:before {
content: "\e028";
}
.icon-zoom-out {
background-position: -360px 0;
.glyphicon-play-circle:before {
content: "\e029";
}
.icon-off {
background-position: -384px 0;
.glyphicon-repeat:before {
content: "\e030";
}
.icon-signal {
background-position: -408px 0;
.glyphicon-refresh:before {
content: "\e031";
}
.icon-cog {
background-position: -432px 0;
.glyphicon-list-alt:before {
content: "\e032";
}
.icon-trash {
background-position: -456px 0;
.glyphicon-lock:before {
content: "\e033";
}
.icon-home {
background-position: 0 -24px;
.glyphicon-flag:before {
content: "\e034";
}
.icon-file {
background-position: -24px -24px;
.glyphicon-headphones:before {
content: "\e035";
}
.icon-time {
background-position: -48px -24px;
.glyphicon-volume-off:before {
content: "\e036";
}
.icon-road {
background-position: -72px -24px;
.glyphicon-volume-down:before {
content: "\e037";
}
.icon-download-alt {
background-position: -96px -24px;
.glyphicon-volume-up:before {
content: "\e038";
}
.icon-download {
background-position: -120px -24px;
.glyphicon-qrcode:before {
content: "\e039";
}
.icon-upload {
background-position: -144px -24px;
.glyphicon-barcode:before {
content: "\e040";
}
.icon-inbox {
background-position: -168px -24px;
.glyphicon-tag:before {
content: "\e041";
}
.icon-play-circle {
background-position: -192px -24px;
.glyphicon-tags:before {
content: "\e042";
}
.icon-repeat {
background-position: -216px -24px;
.glyphicon-book:before {
content: "\e043";
}
.icon-refresh {
background-position: -240px -24px;
.glyphicon-bookmark:before {
content: "\e044";
}
.icon-list-alt {
background-position: -264px -24px;
.glyphicon-print:before {
content: "\e045";
}
.icon-lock {
background-position: -287px -24px;
.glyphicon-camera:before {
content: "\e046";
}
.icon-flag {
background-position: -312px -24px;
.glyphicon-font:before {
content: "\e047";
}
.icon-headphones {
background-position: -336px -24px;
.glyphicon-bold:before {
content: "\e048";
}
.icon-volume-off {
background-position: -360px -24px;
.glyphicon-italic:before {
content: "\e049";
}
.icon-volume-down {
background-position: -384px -24px;
.glyphicon-text-height:before {
content: "\e050";
}
.icon-volume-up {
background-position: -408px -24px;
.glyphicon-text-width:before {
content: "\e051";
}
.icon-qrcode {
background-position: -432px -24px;
.glyphicon-align-left:before {
content: "\e052";
}
.icon-barcode {
background-position: -456px -24px;
.glyphicon-align-center:before {
content: "\e053";
}
.icon-tag {
background-position: 0 -48px;
.glyphicon-align-right:before {
content: "\e054";
}
.icon-tags {
background-position: -25px -48px;
.glyphicon-align-justify:before {
content: "\e055";
}
.icon-book {
background-position: -48px -48px;
.glyphicon-list:before {
content: "\e056";
}
.icon-bookmark {
background-position: -72px -48px;
.glyphicon-indent-left:before {
content: "\e057";
}
.icon-print {
background-position: -96px -48px;
.glyphicon-indent-right:before {
content: "\e058";
}
.icon-camera {
background-position: -120px -48px;
.glyphicon-facetime-video:before {
content: "\e059";
}
.icon-font {
background-position: -144px -48px;
.glyphicon-picture:before {
content: "\e060";
}
.icon-bold {
background-position: -167px -48px;
.glyphicon-pencil:before {
content: "\270f";
}
.icon-italic {
background-position: -192px -48px;
.glyphicon-map-marker:before {
content: "\e062";
}
.icon-text-height {
background-position: -216px -48px;
.glyphicon-adjust:before {
content: "\e063";
}
.icon-text-width {
background-position: -240px -48px;
.glyphicon-tint:before {
content: "\e064";
}
.icon-align-left {
background-position: -264px -48px;
.glyphicon-edit:before {
content: "\e065";
}
.icon-align-center {
background-position: -288px -48px;
.glyphicon-share:before {
content: "\e066";
}
.icon-align-right {
background-position: -312px -48px;
.glyphicon-check:before {
content: "\e067";
}
.icon-align-justify {
background-position: -336px -48px;
.glyphicon-move:before {
content: "\e068";
}
.icon-list {
background-position: -360px -48px;
.glyphicon-step-backward:before {
content: "\e069";
}
.icon-indent-left {
background-position: -384px -48px;
.glyphicon-fast-backward:before {
content: "\e070";
}
.icon-indent-right {
background-position: -408px -48px;
.glyphicon-backward:before {
content: "\e071";
}
.icon-facetime-video {
background-position: -432px -48px;
.glyphicon-play:before {
content: "\e072";
}
.icon-picture {
background-position: -456px -48px;
.glyphicon-pause:before {
content: "\e073";
}
.icon-pencil {
background-position: 0 -72px;
.glyphicon-stop:before {
content: "\e074";
}
.icon-map-marker {
background-position: -24px -72px;
.glyphicon-forward:before {
content: "\e075";
}
.icon-adjust {
background-position: -48px -72px;
.glyphicon-fast-forward:before {
content: "\e076";
}
.icon-tint {
background-position: -72px -72px;
.glyphicon-step-forward:before {
content: "\e077";
}
.icon-edit {
background-position: -96px -72px;
.glyphicon-eject:before {
content: "\e078";
}
.icon-share {
background-position: -120px -72px;
.glyphicon-chevron-left:before {
content: "\e079";
}
.icon-check {
background-position: -144px -72px;
.glyphicon-chevron-right:before {
content: "\e080";
}
.icon-move {
background-position: -168px -72px;
.glyphicon-plus-sign:before {
content: "\e081";
}
.icon-step-backward {
background-position: -192px -72px;
.glyphicon-minus-sign:before {
content: "\e082";
}
.icon-fast-backward {
background-position: -216px -72px;
.glyphicon-remove-sign:before {
content: "\e083";
}
.icon-backward {
background-position: -240px -72px;
.glyphicon-ok-sign:before {
content: "\e084";
}
.icon-play {
background-position: -264px -72px;
.glyphicon-question-sign:before {
content: "\e085";
}
.icon-pause {
background-position: -288px -72px;
.glyphicon-info-sign:before {
content: "\e086";
}
.icon-stop {
background-position: -312px -72px;
.glyphicon-screenshot:before {
content: "\e087";
}
.icon-forward {
background-position: -336px -72px;
.glyphicon-remove-circle:before {
content: "\e088";
}
.icon-fast-forward {
background-position: -360px -72px;
.glyphicon-ok-circle:before {
content: "\e089";
}
.icon-step-forward {
background-position: -384px -72px;
.glyphicon-ban-circle:before {
content: "\e090";
}
.icon-eject {
background-position: -408px -72px;
.glyphicon-arrow-left:before {
content: "\e091";
}
.icon-chevron-left {
background-position: -432px -72px;
.glyphicon-arrow-right:before {
content: "\e092";
}
.icon-chevron-right {
background-position: -456px -72px;
.glyphicon-arrow-up:before {
content: "\e093";
}
.icon-plus-sign {
background-position: 0 -96px;
.glyphicon-arrow-down:before {
content: "\e094";
}
.icon-minus-sign {
background-position: -24px -96px;
.glyphicon-share-alt:before {
content: "\e095";
}
.icon-remove-sign {
background-position: -48px -96px;
.glyphicon-resize-full:before {
content: "\e096";
}
.icon-ok-sign {
background-position: -72px -96px;
.glyphicon-resize-small:before {
content: "\e097";
}
.icon-question-sign {
background-position: -96px -96px;
.glyphicon-plus:before {
content: "\002b";
}
.icon-info-sign {
background-position: -120px -96px;
.glyphicon-minus:before {
content: "\2212";
}
.icon-screenshot {
background-position: -144px -96px;
.glyphicon-asterisk:before {
content: "\002a";
}
.icon-remove-circle {
background-position: -168px -96px;
.glyphicon-exclamation-sign:before {
content: "\e101";
}
.icon-ok-circle {
background-position: -192px -96px;
.glyphicon-gift:before {
content: "\e102";
}
.icon-ban-circle {
background-position: -216px -96px;
.glyphicon-leaf:before {
content: "\e103";
}
.icon-arrow-left {
background-position: -240px -96px;
.glyphicon-fire:before {
content: "\e104";
}
.icon-arrow-right {
background-position: -264px -96px;
.glyphicon-eye-open:before {
content: "\e105";
}
.icon-arrow-up {
background-position: -289px -96px;
.glyphicon-eye-close:before {
content: "\e106";
}
.icon-arrow-down {
background-position: -312px -96px;
.glyphicon-warning-sign:before {
content: "\e107";
}
.icon-share-alt {
background-position: -336px -96px;
.glyphicon-plane:before {
content: "\e108";
}
.icon-resize-full {
background-position: -360px -96px;
.glyphicon-calendar:before {
content: "\e109";
}
.icon-resize-small {
background-position: -384px -96px;
.glyphicon-random:before {
content: "\e110";
}
.icon-plus {
background-position: -408px -96px;
.glyphicon-comment:before {
content: "\e111";
}
.icon-minus {
background-position: -433px -96px;
.glyphicon-magnet:before {
content: "\e112";
}
.icon-asterisk {
background-position: -456px -96px;
.glyphicon-chevron-up:before {
content: "\e113";
}
.icon-exclamation-sign {
background-position: 0 -120px;
.glyphicon-chevron-down:before {
content: "\e114";
}
.icon-gift {
background-position: -24px -120px;
.glyphicon-retweet:before {
content: "\e115";
}
.icon-leaf {
background-position: -48px -120px;
.glyphicon-shopping-cart:before {
content: "\e116";
}
.icon-fire {
background-position: -72px -120px;
.glyphicon-folder-close:before {
content: "\e117";
}
.icon-eye-open {
background-position: -96px -120px;
.glyphicon-folder-open:before {
content: "\e118";
}
.icon-eye-close {
background-position: -120px -120px;
.glyphicon-resize-vertical:before {
content: "\e119";
}
.icon-warning-sign {
background-position: -144px -120px;
.glyphicon-resize-horizontal:before {
content: "\e120";
}
.icon-plane {
background-position: -168px -120px;
.glyphicon-hdd:before {
content: "\e121";
}
.icon-calendar {
background-position: -192px -120px;
.glyphicon-bullhorn:before {
content: "\e122";
}
.icon-random {
width: 16px;
background-position: -216px -120px;
.glyphicon-bell:before {
content: "\e123";
}
.icon-comment {
background-position: -240px -120px;
.glyphicon-certificate:before {
content: "\e124";
}
.icon-magnet {
background-position: -264px -120px;
.glyphicon-thumbs-up:before {
content: "\e125";
}
.icon-chevron-up {
background-position: -288px -120px;
.glyphicon-thumbs-down:before {
content: "\e126";
}
.icon-chevron-down {
background-position: -313px -119px;
.glyphicon-hand-right:before {
content: "\e127";
}
.icon-retweet {
background-position: -336px -120px;
.glyphicon-hand-left:before {
content: "\e128";
}
.icon-shopping-cart {
background-position: -360px -120px;
.glyphicon-hand-up:before {
content: "\e129";
}
.icon-folder-close {
background-position: -384px -120px;
.glyphicon-hand-down:before {
content: "\e130";
}
.icon-folder-open {
width: 16px;
background-position: -408px -120px;
.glyphicon-circle-arrow-right:before {
content: "\e131";
}
.icon-resize-vertical {
background-position: -432px -119px;
.glyphicon-circle-arrow-left:before {
content: "\e132";
}
.icon-resize-horizontal {
background-position: -456px -118px;
.glyphicon-circle-arrow-up:before {
content: "\e133";
}
.icon-hdd {
background-position: 0 -144px;
.glyphicon-circle-arrow-down:before {
content: "\e134";
}
.icon-bullhorn {
background-position: -24px -144px;
.glyphicon-globe:before {
content: "\e135";
}
.icon-bell {
background-position: -48px -144px;
.glyphicon-wrench:before {
content: "\e136";
}
.icon-certificate {
background-position: -72px -144px;
.glyphicon-tasks:before {
content: "\e137";
}
.icon-thumbs-up {
background-position: -96px -144px;
.glyphicon-filter:before {
content: "\e138";
}
.icon-thumbs-down {
background-position: -120px -144px;
.glyphicon-briefcase:before {
content: "\e139";
}
.icon-hand-right {
background-position: -144px -144px;
.glyphicon-fullscreen:before {
content: "\e140";
}
.icon-hand-left {
background-position: -168px -144px;
.glyphicon-dashboard:before {
content: "\e141";
}
.icon-hand-up {
background-position: -192px -144px;
.glyphicon-paperclip:before {
content: "\e142";
}
.icon-hand-down {
background-position: -216px -144px;
.glyphicon-heart-empty:before {
content: "\e143";
}
.icon-circle-arrow-right {
background-position: -240px -144px;
.glyphicon-link:before {
content: "\e144";
}
.icon-circle-arrow-left {
background-position: -264px -144px;
.glyphicon-phone:before {
content: "\e145";
}
.icon-circle-arrow-up {
background-position: -288px -144px;
.glyphicon-pushpin:before {
content: "\e146";
}
.icon-circle-arrow-down {
background-position: -312px -144px;
.glyphicon-euro:before {
content: "\20ac";
}
.icon-globe {
background-position: -336px -144px;
.glyphicon-usd:before {
content: "\e148";
}
.icon-wrench {
background-position: -360px -144px;
.glyphicon-gbp:before {
content: "\e149";
}
.icon-tasks {
background-position: -384px -144px;
.glyphicon-sort:before {
content: "\e150";
}
.icon-filter {
background-position: -408px -144px;
.glyphicon-sort-by-alphabet:before {
content: "\e151";
}
.icon-briefcase {
background-position: -432px -144px;
.glyphicon-sort-by-alphabet-alt:before {
content: "\e152";
}
.icon-fullscreen {
background-position: -456px -144px;
.glyphicon-sort-by-order:before {
content: "\e153";
}
.glyphicon-sort-by-order-alt:before {
content: "\e154";
}
.glyphicon-sort-by-attributes:before {
content: "\e155";
}
.glyphicon-sort-by-attributes-alt:before {
content: "\e156";
}
.glyphicon-unchecked:before {
content: "\e157";
}
.glyphicon-expand:before {
content: "\e158";
}
.glyphicon-collapse:before {
content: "\e159";
}
.glyphicon-collapse-top:before {
content: "\e160";
}
.dropup,
......@@ -3162,11 +3221,6 @@ button.close {
border-radius: 6px;
}
.btn-large [class^="icon-"],
.btn-large [class*=" icon-"] {
margin-top: 2px;
}
.btn-small {
padding: 2px 10px;
font-size: 11.9px;
......@@ -3175,19 +3229,26 @@ button.close {
border-radius: 3px;
}
.btn-small [class^="icon-"],
.btn-small [class*=" icon-"] {
margin-top: 0;
}
.btn-mini {
padding: 1px 6px;
padding: 0 6px;
font-size: 10.5px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.btn-large [class^="glyphicon-"]::before {
font-size: 14px;
}
.btn-small [class^="glyphicon-"]::before {
font-size: 10px;
}
.btn-mini [class^="glyphicon-"]::before {
font-size: 9px;
}
.btn-block {
display: block;
width: 100%;
......@@ -4901,7 +4962,7 @@ input[type="submit"].btn.btn-mini {
.pagination-mini ul > li > a,
.pagination-mini ul > li > span {
padding: 1px 6px;
padding: 0 6px;
font-size: 10.5px;
}
......
......@@ -528,7 +528,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);
}
......@@ -783,21 +787,22 @@ form.bs-docs-example {
box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
}
/* 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 > li > a:hover {
background-color: #f5f5f5;
}
.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 {
......
File added
File added
This diff is collapsed.
File added
File added
docs/assets/img/glyphicons-halflings-white.png

8.57 KB

docs/assets/img/glyphicons-halflings.png

12.5 KB

This diff is collapsed.
This diff is collapsed.
File added
File added
This diff is collapsed.
File added
File added
img/glyphicons-halflings-white.png

8.57 KB

img/glyphicons-halflings.png

12.5 KB

......@@ -27,7 +27,7 @@
@import "tables.less";
// Components: common
@import "sprites.less";
@import "glyphicons.less";
@import "dropdowns.less";
@import "wells.less";
@import "component-animations.less";
......
Supports Markdown
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