From 0a1d296e19b6ce3b979577995f1c806c44adc1e1 Mon Sep 17 00:00:00 2001 From: Alexandre Magno Date: Mon, 5 Nov 2012 18:38:59 -0200 Subject: insert missing i18n tag at customize and download string --- docs/templates/pages/customize.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 6674da87b..d99709888 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -378,7 +378,7 @@
- Customize and Download + {{_i}}Customize and Download{{/i}}

{{_i}}What's included?{{/i}}

{{_i}}Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.{{/i}}

-- cgit v1.2.3 From cea2a701f04a418b6a4627c5215b0c268a213917 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 18:36:16 -0800 Subject: adding new fonts and css for glyphicons update --- Makefile | 6 +- docs/assets/css/bootstrap.css | 679 +++++++++++---------- docs/assets/fonts/glyphiconshalflings-regular.eot | Bin 0 -> 33358 bytes docs/assets/fonts/glyphiconshalflings-regular.otf | Bin 0 -> 18116 bytes docs/assets/fonts/glyphiconshalflings-regular.svg | 175 ++++++ docs/assets/fonts/glyphiconshalflings-regular.ttf | Bin 0 -> 32896 bytes docs/assets/fonts/glyphiconshalflings-regular.woff | Bin 0 -> 18944 bytes docs/assets/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes docs/assets/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes fonts/glyphiconshalflings-regular.eot | Bin 0 -> 33358 bytes fonts/glyphiconshalflings-regular.otf | Bin 0 -> 18116 bytes fonts/glyphiconshalflings-regular.svg | 175 ++++++ fonts/glyphiconshalflings-regular.ttf | Bin 0 -> 32896 bytes fonts/glyphiconshalflings-regular.woff | Bin 0 -> 18944 bytes img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes img/glyphicons-halflings.png | Bin 12799 -> 0 bytes less/sprites.less | 356 +++++------ 17 files changed, 901 insertions(+), 490 deletions(-) create mode 100755 docs/assets/fonts/glyphiconshalflings-regular.eot create mode 100644 docs/assets/fonts/glyphiconshalflings-regular.otf create mode 100755 docs/assets/fonts/glyphiconshalflings-regular.svg create mode 100755 docs/assets/fonts/glyphiconshalflings-regular.ttf create mode 100755 docs/assets/fonts/glyphiconshalflings-regular.woff delete mode 100644 docs/assets/img/glyphicons-halflings-white.png delete mode 100644 docs/assets/img/glyphicons-halflings.png create mode 100755 fonts/glyphiconshalflings-regular.eot create mode 100644 fonts/glyphiconshalflings-regular.otf create mode 100755 fonts/glyphiconshalflings-regular.svg create mode 100755 fonts/glyphiconshalflings-regular.ttf create mode 100755 fonts/glyphiconshalflings-regular.woff delete mode 100644 img/glyphicons-halflings-white.png delete mode 100644 img/glyphicons-halflings.png diff --git a/Makefile b/Makefile index b62423d10..216e215ad 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 70835bcc9..d2b2c2442 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2222,598 +2222,659 @@ table th[class*="span"], background-color: #c4e3f3; } -[class^="icon-"], -[class*=" icon-"] { - 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-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^="icon-"]:before, +[class*="icon-"]:before { + font-family: 'Glyphicons Halflings'; + font-style: normal; + line-height: 1; +} + +.icon-glass:before { + content: "\e001"; +} + +.icon-music:before { + content: "\e002"; } -/* White icons with optional class, or on hover/active states of certain elements */ +.icon-search:before { + content: "\e003"; +} + +.icon-envelope:before { + content: "\2709"; +} + +.icon-heart:before { + content: "\e005"; +} + +.icon-star:before { + content: "\e006"; +} + +.icon-star-empty:before { + content: "\e007"; +} + +.icon-user:before { + content: "\e008"; +} + +.icon-film:before { + content: "\e009"; +} + +.icon-th-large:before { + content: "\e010"; +} + +.icon-th:before { + content: "\e011"; +} + +.icon-th-list:before { + content: "\e012"; +} + +.icon-ok:before { + content: "\e013"; +} + +.icon-remove:before { + content: "\e014"; +} + +.icon-zoom-in:before { + content: "\e015"; +} + +.icon-zoom-out:before { + content: "\e016"; +} + +.icon-off:before { + content: "\e017"; +} + +.icon-signal:before { + content: "\e018"; +} + +.icon-cog:before { + content: "\e019"; +} -.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"); +.icon-trash:before { + content: "\e020"; } -.icon-glass { - background-position: 0 0; +.icon-home:before { + content: "\e021"; } -.icon-music { - background-position: -24px 0; +.icon-file:before { + content: "\e022"; } -.icon-search { - background-position: -48px 0; +.icon-time:before { + content: "\e023"; } -.icon-envelope { - background-position: -72px 0; +.icon-road:before { + content: "\e024"; } -.icon-heart { - background-position: -96px 0; +.icon-download-alt:before { + content: "\e025"; } -.icon-star { - background-position: -120px 0; +.icon-download:before { + content: "\e026"; } -.icon-star-empty { - background-position: -144px 0; +.icon-upload:before { + content: "\e027"; } -.icon-user { - background-position: -168px 0; +.icon-inbox:before { + content: "\e028"; } -.icon-film { - background-position: -192px 0; +.icon-play-circle:before { + content: "\e029"; } -.icon-th-large { - background-position: -216px 0; +.icon-repeat:before { + content: "\e030"; } -.icon-th { - background-position: -240px 0; +.icon-refresh:before { + content: "\e031"; } -.icon-th-list { - background-position: -264px 0; +.icon-list-alt:before { + content: "\e032"; } -.icon-ok { - background-position: -288px 0; +.icon-lock:before { + content: "\e033"; } -.icon-remove { - background-position: -312px 0; +.icon-flag:before { + content: "\e034"; } -.icon-zoom-in { - background-position: -336px 0; +.icon-headphones:before { + content: "\e035"; } -.icon-zoom-out { - background-position: -360px 0; +.icon-volume-off:before { + content: "\e036"; } -.icon-off { - background-position: -384px 0; +.icon-volume-down:before { + content: "\e037"; } -.icon-signal { - background-position: -408px 0; +.icon-volume-up:before { + content: "\e038"; } -.icon-cog { - background-position: -432px 0; +.icon-qrcode:before { + content: "\e039"; } -.icon-trash { - background-position: -456px 0; +.icon-barcode:before { + content: "\e040"; } -.icon-home { - background-position: 0 -24px; +.icon-tag:before { + content: "\e041"; } -.icon-file { - background-position: -24px -24px; +.icon-tags:before { + content: "\e042"; } -.icon-time { - background-position: -48px -24px; +.icon-book:before { + content: "\e043"; } -.icon-road { - background-position: -72px -24px; +.icon-bookmark:before { + content: "\e044"; } -.icon-download-alt { - background-position: -96px -24px; +.icon-print:before { + content: "\e045"; } -.icon-download { - background-position: -120px -24px; +.icon-camera:before { + content: "\e046"; } -.icon-upload { - background-position: -144px -24px; +.icon-font:before { + content: "\e047"; } -.icon-inbox { - background-position: -168px -24px; +.icon-bold:before { + content: "\e048"; } -.icon-play-circle { - background-position: -192px -24px; +.icon-italic:before { + content: "\e049"; } -.icon-repeat { - background-position: -216px -24px; +.icon-text-height:before { + content: "\e050"; } -.icon-refresh { - background-position: -240px -24px; +.icon-text-width:before { + content: "\e051"; } -.icon-list-alt { - background-position: -264px -24px; +.icon-align-left:before { + content: "\e052"; } -.icon-lock { - background-position: -287px -24px; +.icon-align-center:before { + content: "\e053"; } -.icon-flag { - background-position: -312px -24px; +.icon-align-right:before { + content: "\e054"; } -.icon-headphones { - background-position: -336px -24px; +.icon-align-justify:before { + content: "\e055"; } -.icon-volume-off { - background-position: -360px -24px; +.icon-list:before { + content: "\e056"; } -.icon-volume-down { - background-position: -384px -24px; +.icon-indent-left:before { + content: "\e057"; } -.icon-volume-up { - background-position: -408px -24px; +.icon-indent-right:before { + content: "\e058"; } -.icon-qrcode { - background-position: -432px -24px; +.icon-facetime-video:before { + content: "\e059"; } -.icon-barcode { - background-position: -456px -24px; +.icon-picture:before { + content: "\e060"; } -.icon-tag { - background-position: 0 -48px; +.icon-pencil:before { + content: "\270f"; } -.icon-tags { - background-position: -25px -48px; +.icon-map-marker:before { + content: "\e062"; } -.icon-book { - background-position: -48px -48px; +.icon-adjust:before { + content: "\e063"; } -.icon-bookmark { - background-position: -72px -48px; +.icon-tint:before { + content: "\e064"; } -.icon-print { - background-position: -96px -48px; +.icon-edit:before { + content: "\e065"; } -.icon-camera { - background-position: -120px -48px; +.icon-share:before { + content: "\e066"; } -.icon-font { - background-position: -144px -48px; +.icon-check:before { + content: "\e067"; } -.icon-bold { - background-position: -167px -48px; +.icon-move:before { + content: "\e068"; } -.icon-italic { - background-position: -192px -48px; +.icon-step-backward:before { + content: "\e069"; } -.icon-text-height { - background-position: -216px -48px; +.icon-fast-backward:before { + content: "\e070"; } -.icon-text-width { - background-position: -240px -48px; +.icon-backward:before { + content: "\e071"; } -.icon-align-left { - background-position: -264px -48px; +.icon-play:before { + content: "\e072"; } -.icon-align-center { - background-position: -288px -48px; +.icon-pause:before { + content: "\e073"; } -.icon-align-right { - background-position: -312px -48px; +.icon-stop:before { + content: "\e074"; } -.icon-align-justify { - background-position: -336px -48px; +.icon-forward:before { + content: "\e075"; } -.icon-list { - background-position: -360px -48px; +.icon-fast-forward:before { + content: "\e076"; } -.icon-indent-left { - background-position: -384px -48px; +.icon-step-forward:before { + content: "\e077"; } -.icon-indent-right { - background-position: -408px -48px; +.icon-eject:before { + content: "\e078"; } -.icon-facetime-video { - background-position: -432px -48px; +.icon-chevron-left:before { + content: "\e079"; } -.icon-picture { - background-position: -456px -48px; +.icon-chevron-right:before { + content: "\e080"; } -.icon-pencil { - background-position: 0 -72px; +.icon-plus-sign:before { + content: "\e081"; } -.icon-map-marker { - background-position: -24px -72px; +.icon-minus-sign:before { + content: "\e082"; } -.icon-adjust { - background-position: -48px -72px; +.icon-remove-sign:before { + content: "\e083"; } -.icon-tint { - background-position: -72px -72px; +.icon-ok-sign:before { + content: "\e084"; } -.icon-edit { - background-position: -96px -72px; +.icon-question-sign:before { + content: "\e085"; } -.icon-share { - background-position: -120px -72px; +.icon-info-sign:before { + content: "\e086"; } -.icon-check { - background-position: -144px -72px; +.icon-screenshot:before { + content: "\e087"; } -.icon-move { - background-position: -168px -72px; +.icon-remove-circle:before { + content: "\e088"; } -.icon-step-backward { - background-position: -192px -72px; +.icon-ok-circle:before { + content: "\e089"; } -.icon-fast-backward { - background-position: -216px -72px; +.icon-ban-circle:before { + content: "\e090"; } -.icon-backward { - background-position: -240px -72px; +.icon-arrow-left:before { + content: "\e091"; } -.icon-play { - background-position: -264px -72px; +.icon-arrow-right:before { + content: "\e092"; } -.icon-pause { - background-position: -288px -72px; +.icon-arrow-up:before { + content: "\e093"; } -.icon-stop { - background-position: -312px -72px; +.icon-arrow-down:before { + content: "\e094"; } -.icon-forward { - background-position: -336px -72px; +.icon-share-alt:before { + content: "\e095"; } -.icon-fast-forward { - background-position: -360px -72px; +.icon-resize-full:before { + content: "\e096"; } -.icon-step-forward { - background-position: -384px -72px; +.icon-resize-small:before { + content: "\e097"; } -.icon-eject { - background-position: -408px -72px; +.icon-plus:before { + content: "\002b"; } -.icon-chevron-left { - background-position: -432px -72px; +.icon-minus:before { + content: "\2212"; } -.icon-chevron-right { - background-position: -456px -72px; +.icon-asterisk:before { + content: "\002a"; } -.icon-plus-sign { - background-position: 0 -96px; +.icon-exclamation-sign:before { + content: "\e101"; } -.icon-minus-sign { - background-position: -24px -96px; +.icon-gift:before { + content: "\e102"; } -.icon-remove-sign { - background-position: -48px -96px; +.icon-leaf:before { + content: "\e103"; } -.icon-ok-sign { - background-position: -72px -96px; +.icon-fire:before { + content: "\e104"; } -.icon-question-sign { - background-position: -96px -96px; +.icon-eye-open:before { + content: "\e105"; } -.icon-info-sign { - background-position: -120px -96px; +.icon-eye-close:before { + content: "\e106"; } -.icon-screenshot { - background-position: -144px -96px; +.icon-warning-sign:before { + content: "\e107"; } -.icon-remove-circle { - background-position: -168px -96px; +.icon-plane:before { + content: "\e108"; } -.icon-ok-circle { - background-position: -192px -96px; +.icon-calendar:before { + content: "\e109"; } -.icon-ban-circle { - background-position: -216px -96px; +.icon-random:before { + content: "\e110"; } -.icon-arrow-left { - background-position: -240px -96px; +.icon-comment:before { + content: "\e111"; } -.icon-arrow-right { - background-position: -264px -96px; +.icon-magnet:before { + content: "\e112"; } -.icon-arrow-up { - background-position: -289px -96px; +.icon-chevron-up:before { + content: "\e113"; } -.icon-arrow-down { - background-position: -312px -96px; +.icon-chevron-down:before { + content: "\e114"; } -.icon-share-alt { - background-position: -336px -96px; +.icon-retweet:before { + content: "\e115"; } -.icon-resize-full { - background-position: -360px -96px; +.icon-shopping-cart:before { + content: "\e116"; } -.icon-resize-small { - background-position: -384px -96px; +.icon-folder-close:before { + content: "\e117"; } -.icon-plus { - background-position: -408px -96px; +.icon-folder-open:before { + content: "\e118"; } -.icon-minus { - background-position: -433px -96px; +.icon-resize-vertical:before { + content: "\e119"; } -.icon-asterisk { - background-position: -456px -96px; +.icon-resize-horizontal:before { + content: "\e120"; } -.icon-exclamation-sign { - background-position: 0 -120px; +.icon-hdd:before { + content: "\e121"; } -.icon-gift { - background-position: -24px -120px; +.icon-bullhorn:before { + content: "\e122"; } -.icon-leaf { - background-position: -48px -120px; +.icon-bell:before { + content: "\e123"; } -.icon-fire { - background-position: -72px -120px; +.icon-certificate:before { + content: "\e124"; } -.icon-eye-open { - background-position: -96px -120px; +.icon-thumbs-up:before { + content: "\e125"; } -.icon-eye-close { - background-position: -120px -120px; +.icon-thumbs-down:before { + content: "\e126"; } -.icon-warning-sign { - background-position: -144px -120px; +.icon-hand-right:before { + content: "\e127"; } -.icon-plane { - background-position: -168px -120px; +.icon-hand-left:before { + content: "\e128"; } -.icon-calendar { - background-position: -192px -120px; +.icon-hand-up:before { + content: "\e129"; } -.icon-random { - width: 16px; - background-position: -216px -120px; +.icon-hand-down:before { + content: "\e130"; } -.icon-comment { - background-position: -240px -120px; +.icon-circle-arrow-right:before { + content: "\e131"; } -.icon-magnet { - background-position: -264px -120px; +.icon-circle-arrow-left:before { + content: "\e132"; } -.icon-chevron-up { - background-position: -288px -120px; +.icon-circle-arrow-up:before { + content: "\e133"; } -.icon-chevron-down { - background-position: -313px -119px; +.icon-circle-arrow-down:before { + content: "\e134"; } -.icon-retweet { - background-position: -336px -120px; +.icon-globe:before { + content: "\e135"; } -.icon-shopping-cart { - background-position: -360px -120px; +.icon-wrench:before { + content: "\e136"; } -.icon-folder-close { - background-position: -384px -120px; +.icon-tasks:before { + content: "\e137"; } -.icon-folder-open { - width: 16px; - background-position: -408px -120px; +.icon-filter:before { + content: "\e138"; } -.icon-resize-vertical { - background-position: -432px -119px; +.icon-briefcase:before { + content: "\e139"; } -.icon-resize-horizontal { - background-position: -456px -118px; +.icon-fullscreen:before { + content: "\e140"; } -.icon-hdd { - background-position: 0 -144px; +.icon-dashboard:before { + content: "\e141"; } -.icon-bullhorn { - background-position: -24px -144px; +.icon-paperclip:before { + content: "\e142"; } -.icon-bell { - background-position: -48px -144px; +.icon-heart-empty:before { + content: "\e143"; } -.icon-certificate { - background-position: -72px -144px; +.icon-link:before { + content: "\e144"; } -.icon-thumbs-up { - background-position: -96px -144px; +.icon-phone:before { + content: "\e145"; } -.icon-thumbs-down { - background-position: -120px -144px; +.icon-pushpin:before { + content: "\e146"; } -.icon-hand-right { - background-position: -144px -144px; +.icon-euro:before { + content: "\20ac"; } -.icon-hand-left { - background-position: -168px -144px; +.icon-usd:before { + content: "\e148"; } -.icon-hand-up { - background-position: -192px -144px; +.icon-gbp:before { + content: "\e149"; } -.icon-hand-down { - background-position: -216px -144px; +.icon-sort:before { + content: "\e150"; } -.icon-circle-arrow-right { - background-position: -240px -144px; +.icon-sort-by-alphabet:before { + content: "\e151"; } -.icon-circle-arrow-left { - background-position: -264px -144px; +.icon-sort-by-alphabet-alt:before { + content: "\e152"; } -.icon-circle-arrow-up { - background-position: -288px -144px; +.icon-sort-by-order:before { + content: "\e153"; } -.icon-circle-arrow-down { - background-position: -312px -144px; +.icon-sort-by-order-alt:before { + content: "\e154"; } -.icon-globe { - background-position: -336px -144px; +.icon-sort-by-attributes:before { + content: "\e155"; } -.icon-wrench { - background-position: -360px -144px; +.icon-sort-by-attributes-alt:before { + content: "\e156"; } -.icon-tasks { - background-position: -384px -144px; +.icon-unchecked:before { + content: "\e157"; } -.icon-filter { - background-position: -408px -144px; +.icon-expand:before { + content: "\e158"; } -.icon-briefcase { - background-position: -432px -144px; +.icon-collapse:before { + content: "\e159"; } -.icon-fullscreen { - background-position: -456px -144px; +.icon-collapse-top:before { + content: "\e160"; } .dropup, diff --git a/docs/assets/fonts/glyphiconshalflings-regular.eot b/docs/assets/fonts/glyphiconshalflings-regular.eot new file mode 100755 index 000000000..bd59ccd2d Binary files /dev/null and b/docs/assets/fonts/glyphiconshalflings-regular.eot differ diff --git a/docs/assets/fonts/glyphiconshalflings-regular.otf b/docs/assets/fonts/glyphiconshalflings-regular.otf new file mode 100644 index 000000000..b058f1cd1 Binary files /dev/null and b/docs/assets/fonts/glyphiconshalflings-regular.otf differ diff --git a/docs/assets/fonts/glyphiconshalflings-regular.svg b/docs/assets/fonts/glyphiconshalflings-regular.svg new file mode 100755 index 000000000..0fb458735 --- /dev/null +++ b/docs/assets/fonts/glyphiconshalflings-regular.svg @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/assets/fonts/glyphiconshalflings-regular.ttf b/docs/assets/fonts/glyphiconshalflings-regular.ttf new file mode 100755 index 000000000..c63c068fe Binary files /dev/null and b/docs/assets/fonts/glyphiconshalflings-regular.ttf differ diff --git a/docs/assets/fonts/glyphiconshalflings-regular.woff b/docs/assets/fonts/glyphiconshalflings-regular.woff new file mode 100755 index 000000000..4c778ffdc Binary files /dev/null and b/docs/assets/fonts/glyphiconshalflings-regular.woff differ diff --git a/docs/assets/img/glyphicons-halflings-white.png b/docs/assets/img/glyphicons-halflings-white.png deleted file mode 100644 index 3bf6484a2..000000000 Binary files a/docs/assets/img/glyphicons-halflings-white.png and /dev/null differ diff --git a/docs/assets/img/glyphicons-halflings.png b/docs/assets/img/glyphicons-halflings.png deleted file mode 100644 index a99699932..000000000 Binary files a/docs/assets/img/glyphicons-halflings.png and /dev/null differ diff --git a/fonts/glyphiconshalflings-regular.eot b/fonts/glyphiconshalflings-regular.eot new file mode 100755 index 000000000..bd59ccd2d Binary files /dev/null and b/fonts/glyphiconshalflings-regular.eot differ diff --git a/fonts/glyphiconshalflings-regular.otf b/fonts/glyphiconshalflings-regular.otf new file mode 100644 index 000000000..b058f1cd1 Binary files /dev/null and b/fonts/glyphiconshalflings-regular.otf differ diff --git a/fonts/glyphiconshalflings-regular.svg b/fonts/glyphiconshalflings-regular.svg new file mode 100755 index 000000000..0fb458735 --- /dev/null +++ b/fonts/glyphiconshalflings-regular.svg @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/glyphiconshalflings-regular.ttf b/fonts/glyphiconshalflings-regular.ttf new file mode 100755 index 000000000..c63c068fe Binary files /dev/null and b/fonts/glyphiconshalflings-regular.ttf differ diff --git a/fonts/glyphiconshalflings-regular.woff b/fonts/glyphiconshalflings-regular.woff new file mode 100755 index 000000000..4c778ffdc Binary files /dev/null and b/fonts/glyphiconshalflings-regular.woff differ diff --git a/img/glyphicons-halflings-white.png b/img/glyphicons-halflings-white.png deleted file mode 100644 index 3bf6484a2..000000000 Binary files a/img/glyphicons-halflings-white.png and /dev/null differ diff --git a/img/glyphicons-halflings.png b/img/glyphicons-halflings.png deleted file mode 100644 index a99699932..000000000 Binary files a/img/glyphicons-halflings.png and /dev/null differ diff --git a/less/sprites.less b/less/sprites.less index 9cd2ae3bf..e17e0a6fe 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -1,11 +1,7 @@ // -// Sprites +// Icon sprites // -------------------------------------------------- - -// ICONS -// ----- - // All icons receive the styles of the tag with a base class // of .i and are then given a unique class to add width, height, // and background-position. Your resulting HTML will look like @@ -14,180 +10,184 @@ // For the white version of the icons, just add the .icon-white class: // -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - .ie7-restore-right-whitespace(); - line-height: 14px; - vertical-align: text-top; - background-image: url("@{iconSpritePath}"); - background-position: 14px 14px; - background-repeat: no-repeat; - margin-top: 1px; +// Import the fonts +@font-face { + font-family: 'Glyphicons Halflings'; + 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'); + font-style: normal; + font-weight: normal; } -/* White icons with optional class, or on hover/active states of certain elements */ -.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("@{iconWhiteSpritePath}"); +// Catchall baseclass +[class^="icon-"]:before, +[class*="icon-"]:before { + font-family: 'Glyphicons Halflings'; + font-style: normal; + line-height: 1; } -.icon-glass { background-position: 0 0; } -.icon-music { background-position: -24px 0; } -.icon-search { background-position: -48px 0; } -.icon-envelope { background-position: -72px 0; } -.icon-heart { background-position: -96px 0; } -.icon-star { background-position: -120px 0; } -.icon-star-empty { background-position: -144px 0; } -.icon-user { background-position: -168px 0; } -.icon-film { background-position: -192px 0; } -.icon-th-large { background-position: -216px 0; } -.icon-th { background-position: -240px 0; } -.icon-th-list { background-position: -264px 0; } -.icon-ok { background-position: -288px 0; } -.icon-remove { background-position: -312px 0; } -.icon-zoom-in { background-position: -336px 0; } -.icon-zoom-out { background-position: -360px 0; } -.icon-off { background-position: -384px 0; } -.icon-signal { background-position: -408px 0; } -.icon-cog { background-position: -432px 0; } -.icon-trash { background-position: -456px 0; } - -.icon-home { background-position: 0 -24px; } -.icon-file { background-position: -24px -24px; } -.icon-time { background-position: -48px -24px; } -.icon-road { background-position: -72px -24px; } -.icon-download-alt { background-position: -96px -24px; } -.icon-download { background-position: -120px -24px; } -.icon-upload { background-position: -144px -24px; } -.icon-inbox { background-position: -168px -24px; } -.icon-play-circle { background-position: -192px -24px; } -.icon-repeat { background-position: -216px -24px; } -.icon-refresh { background-position: -240px -24px; } -.icon-list-alt { background-position: -264px -24px; } -.icon-lock { background-position: -287px -24px; } // 1px off -.icon-flag { background-position: -312px -24px; } -.icon-headphones { background-position: -336px -24px; } -.icon-volume-off { background-position: -360px -24px; } -.icon-volume-down { background-position: -384px -24px; } -.icon-volume-up { background-position: -408px -24px; } -.icon-qrcode { background-position: -432px -24px; } -.icon-barcode { background-position: -456px -24px; } - -.icon-tag { background-position: 0 -48px; } -.icon-tags { background-position: -25px -48px; } // 1px off -.icon-book { background-position: -48px -48px; } -.icon-bookmark { background-position: -72px -48px; } -.icon-print { background-position: -96px -48px; } -.icon-camera { background-position: -120px -48px; } -.icon-font { background-position: -144px -48px; } -.icon-bold { background-position: -167px -48px; } // 1px off -.icon-italic { background-position: -192px -48px; } -.icon-text-height { background-position: -216px -48px; } -.icon-text-width { background-position: -240px -48px; } -.icon-align-left { background-position: -264px -48px; } -.icon-align-center { background-position: -288px -48px; } -.icon-align-right { background-position: -312px -48px; } -.icon-align-justify { background-position: -336px -48px; } -.icon-list { background-position: -360px -48px; } -.icon-indent-left { background-position: -384px -48px; } -.icon-indent-right { background-position: -408px -48px; } -.icon-facetime-video { background-position: -432px -48px; } -.icon-picture { background-position: -456px -48px; } - -.icon-pencil { background-position: 0 -72px; } -.icon-map-marker { background-position: -24px -72px; } -.icon-adjust { background-position: -48px -72px; } -.icon-tint { background-position: -72px -72px; } -.icon-edit { background-position: -96px -72px; } -.icon-share { background-position: -120px -72px; } -.icon-check { background-position: -144px -72px; } -.icon-move { background-position: -168px -72px; } -.icon-step-backward { background-position: -192px -72px; } -.icon-fast-backward { background-position: -216px -72px; } -.icon-backward { background-position: -240px -72px; } -.icon-play { background-position: -264px -72px; } -.icon-pause { background-position: -288px -72px; } -.icon-stop { background-position: -312px -72px; } -.icon-forward { background-position: -336px -72px; } -.icon-fast-forward { background-position: -360px -72px; } -.icon-step-forward { background-position: -384px -72px; } -.icon-eject { background-position: -408px -72px; } -.icon-chevron-left { background-position: -432px -72px; } -.icon-chevron-right { background-position: -456px -72px; } - -.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-left { background-position: -240px -96px; } -.icon-arrow-right { background-position: -264px -96px; } -.icon-arrow-up { background-position: -289px -96px; } // 1px off -.icon-arrow-down { background-position: -312px -96px; } -.icon-share-alt { background-position: -336px -96px; } -.icon-resize-full { background-position: -360px -96px; } -.icon-resize-small { background-position: -384px -96px; } -.icon-plus { background-position: -408px -96px; } -.icon-minus { 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; width: 16px; } -.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; } // 1px, 1px off -.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: -408px -120px; width: 16px; } -.icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off -.icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off - -.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; } +// Individual icons +.icon-glass:before { content: "\e001"; } +.icon-music:before { content: "\e002"; } +.icon-search:before { content: "\e003"; } +.icon-envelope:before { content: "\2709"; } +.icon-heart:before { content: "\e005"; } +.icon-star:before { content: "\e006"; } +.icon-star-empty:before { content: "\e007"; } +.icon-user:before { content: "\e008"; } +.icon-film:before { content: "\e009"; } +.icon-th-large:before { content: "\e010"; } +.icon-th:before { content: "\e011"; } +.icon-th-list:before { content: "\e012"; } +.icon-ok:before { content: "\e013"; } +.icon-remove:before { content: "\e014"; } +.icon-zoom-in:before { content: "\e015"; } +.icon-zoom-out:before { content: "\e016"; } +.icon-off:before { content: "\e017"; } +.icon-signal:before { content: "\e018"; } +.icon-cog:before { content: "\e019"; } +.icon-trash:before { content: "\e020"; } +.icon-home:before { content: "\e021"; } +.icon-file:before { content: "\e022"; } +.icon-time:before { content: "\e023"; } +.icon-road:before { content: "\e024"; } +.icon-download-alt:before { content: "\e025"; } +.icon-download:before { content: "\e026"; } +.icon-upload:before { content: "\e027"; } +.icon-inbox:before { content: "\e028"; } +.icon-play-circle:before { content: "\e029"; } +.icon-repeat:before { content: "\e030"; } +.icon-refresh:before { content: "\e031"; } +.icon-list-alt:before { content: "\e032"; } +.icon-lock:before { content: "\e033"; } +.icon-flag:before { content: "\e034"; } +.icon-headphones:before { content: "\e035"; } +.icon-volume-off:before { content: "\e036"; } +.icon-volume-down:before { content: "\e037"; } +.icon-volume-up:before { content: "\e038"; } +.icon-qrcode:before { content: "\e039"; } +.icon-barcode:before { content: "\e040"; } +.icon-tag:before { content: "\e041"; } +.icon-tags:before { content: "\e042"; } +.icon-book:before { content: "\e043"; } +.icon-bookmark:before { content: "\e044"; } +.icon-print:before { content: "\e045"; } +.icon-camera:before { content: "\e046"; } +.icon-font:before { content: "\e047"; } +.icon-bold:before { content: "\e048"; } +.icon-italic:before { content: "\e049"; } +.icon-text-height:before { content: "\e050"; } +.icon-text-width:before { content: "\e051"; } +.icon-align-left:before { content: "\e052"; } +.icon-align-center:before { content: "\e053"; } +.icon-align-right:before { content: "\e054"; } +.icon-align-justify:before { content: "\e055"; } +.icon-list:before { content: "\e056"; } +.icon-indent-left:before { content: "\e057"; } +.icon-indent-right:before { content: "\e058"; } +.icon-facetime-video:before { content: "\e059"; } +.icon-picture:before { content: "\e060"; } +.icon-pencil:before { content: "\270f"; } +.icon-map-marker:before { content: "\e062"; } +.icon-adjust:before { content: "\e063"; } +.icon-tint:before { content: "\e064"; } +.icon-edit:before { content: "\e065"; } +.icon-share:before { content: "\e066"; } +.icon-check:before { content: "\e067"; } +.icon-move:before { content: "\e068"; } +.icon-step-backward:before { content: "\e069"; } +.icon-fast-backward:before { content: "\e070"; } +.icon-backward:before { content: "\e071"; } +.icon-play:before { content: "\e072"; } +.icon-pause:before { content: "\e073"; } +.icon-stop:before { content: "\e074"; } +.icon-forward:before { content: "\e075"; } +.icon-fast-forward:before { content: "\e076"; } +.icon-step-forward:before { content: "\e077"; } +.icon-eject:before { content: "\e078"; } +.icon-chevron-left:before { content: "\e079"; } +.icon-chevron-right:before { content: "\e080"; } +.icon-plus-sign:before { content: "\e081"; } +.icon-minus-sign:before { content: "\e082"; } +.icon-remove-sign:before { content: "\e083"; } +.icon-ok-sign:before { content: "\e084"; } +.icon-question-sign:before { content: "\e085"; } +.icon-info-sign:before { content: "\e086"; } +.icon-screenshot:before { content: "\e087"; } +.icon-remove-circle:before { content: "\e088"; } +.icon-ok-circle:before { content: "\e089"; } +.icon-ban-circle:before { content: "\e090"; } +.icon-arrow-left:before { content: "\e091"; } +.icon-arrow-right:before { content: "\e092"; } +.icon-arrow-up:before { content: "\e093"; } +.icon-arrow-down:before { content: "\e094"; } +.icon-share-alt:before { content: "\e095"; } +.icon-resize-full:before { content: "\e096"; } +.icon-resize-small:before { content: "\e097"; } +.icon-plus:before { content: "\002b"; } +.icon-minus:before { content: "\2212"; } +.icon-asterisk:before { content: "\002a"; } +.icon-exclamation-sign:before { content: "\e101"; } +.icon-gift:before { content: "\e102"; } +.icon-leaf:before { content: "\e103"; } +.icon-fire:before { content: "\e104"; } +.icon-eye-open:before { content: "\e105"; } +.icon-eye-close:before { content: "\e106"; } +.icon-warning-sign:before { content: "\e107"; } +.icon-plane:before { content: "\e108"; } +.icon-calendar:before { content: "\e109"; } +.icon-random:before { content: "\e110"; } +.icon-comment:before { content: "\e111"; } +.icon-magnet:before { content: "\e112"; } +.icon-chevron-up:before { content: "\e113"; } +.icon-chevron-down:before { content: "\e114"; } +.icon-retweet:before { content: "\e115"; } +.icon-shopping-cart:before { content: "\e116"; } +.icon-folder-close:before { content: "\e117"; } +.icon-folder-open:before { content: "\e118"; } +.icon-resize-vertical:before { content: "\e119"; } +.icon-resize-horizontal:before { content: "\e120"; } +.icon-hdd:before { content: "\e121"; } +.icon-bullhorn:before { content: "\e122"; } +.icon-bell:before { content: "\e123"; } +.icon-certificate:before { content: "\e124"; } +.icon-thumbs-up:before { content: "\e125"; } +.icon-thumbs-down:before { content: "\e126"; } +.icon-hand-right:before { content: "\e127"; } +.icon-hand-left:before { content: "\e128"; } +.icon-hand-up:before { content: "\e129"; } +.icon-hand-down:before { content: "\e130"; } +.icon-circle-arrow-right:before { content: "\e131"; } +.icon-circle-arrow-left:before { content: "\e132"; } +.icon-circle-arrow-up:before { content: "\e133"; } +.icon-circle-arrow-down:before { content: "\e134"; } +.icon-globe:before { content: "\e135"; } +.icon-wrench:before { content: "\e136"; } +.icon-tasks:before { content: "\e137"; } +.icon-filter:before { content: "\e138"; } +.icon-briefcase:before { content: "\e139"; } +.icon-fullscreen:before { content: "\e140"; } +.icon-dashboard:before { content: "\e141"; } +.icon-paperclip:before { content: "\e142"; } +.icon-heart-empty:before { content: "\e143"; } +.icon-link:before { content: "\e144"; } +.icon-phone:before { content: "\e145"; } +.icon-pushpin:before { content: "\e146"; } +.icon-euro:before { content: "\20ac"; } +.icon-usd:before { content: "\e148"; } +.icon-gbp:before { content: "\e149"; } +.icon-sort:before { content: "\e150"; } +.icon-sort-by-alphabet:before { content: "\e151"; } +.icon-sort-by-alphabet-alt:before { content: "\e152"; } +.icon-sort-by-order:before { content: "\e153"; } +.icon-sort-by-order-alt:before { content: "\e154"; } +.icon-sort-by-attributes:before { content: "\e155"; } +.icon-sort-by-attributes-alt:before { content: "\e156"; } +.icon-unchecked:before { content: "\e157"; } +.icon-expand:before { content: "\e158"; } +.icon-collapse:before { content: "\e159"; } +.icon-collapse-top:before { content: "\e160"; } -- cgit v1.2.3 From b82bc97023183b7ed53a5a6d2872f64b2d378183 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 18:38:59 -0800 Subject: update docs and all classes --- docs/base-css.html | 41 +++++++++++++++++++++++++--------- docs/templates/pages/base-css.mustache | 41 +++++++++++++++++++++++++--------- less/sprites.less | 3 --- 3 files changed, 62 insertions(+), 23 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index 816b465c9..c8ed5fc65 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1845,11 +1845,12 @@ For example, <code><section></code> should be wrapped as inlin ================================================== -->
-

Icons by Glyphicons

+

Icons font by Glyphicons

-

Icon glyphs

-

140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.

+

Included glyphs

+

Bootstrap comes with all 160 of Glyphicons Halflings set, all available in font formats for easy coloring, sizing, and placement.

+
  • icon-glass
  • icon-music
    • @@ -1995,27 +1996,46 @@ For example, <code><section></code> should be wrapped as inlin
  • icon-filter
  • icon-briefcase
  • icon-fullscreen
    • + +
  • icon-dashboard
    • +
  • icon-paperclip
    • +
  • icon-heart-empty
    • +
  • icon-link
    • +
  • icon-phone
    • +
  • icon-pushpin
    • +
  • icon-euro
    • +
  • icon-usd
    • +
  • icon-gbp
    • +
  • icon-sort
    • +
  • icon-sort-by-alphabet
    • +
  • icon-sort-by-alphabet-alt
    • +
  • icon-sort-by-order
    • +
  • icon-sort-by-order-alt
    • +
  • icon-sort-by-attributes
    • +
  • icon-sort-by-attributes-alt
    • +
  • icon-unchecked
    • +
  • icon-expand
    • +
  • icon-collapse
    • +
  • icon-collapse-top
    • +

Glyphicons attribution

-

Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

+

Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creator have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

How to use

-

All icons require an <i> tag with a unique class, prefixed with icon-. To use, place the following code just about anywhere:

+

Add the appropriate class to any inline element. All icon classes are prefixed with icon- for easy styling. To use, place the following code just about anywhere:

 <i class="icon-search"></i>
-

There are also styles available for inverted (white) icons, made ready with one extra class. We will specifically enforce this class on hover and active states for nav and dropdown links.

-
-<i class="icon-search icon-white"></i>
-
+

Want to change the icon color? Just change the color of the parent element.

Heads up! - When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing. + When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.

@@ -2134,6 +2154,7 @@ For example, <code><section></code> should be wrapped as inlin + diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 494086702..bf37fa5c5 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1782,11 +1782,12 @@ ================================================== -->
-

{{_i}}Icons by Glyphicons{{/i}}

+

{{_i}}Icons font by Glyphicons{{/i}}

-

{{_i}}Icon glyphs{{/i}}

-

{{_i}}140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.{{/i}}

+

{{_i}}Included glyphs{{/i}}

+

{{_i}}Bootstrap comes with all 160 of Glyphicons Halflings set, all available in font formats for easy coloring, sizing, and placement.{{/i}}

+
  • icon-glass
  • icon-music
    • @@ -1932,27 +1933,46 @@
  • icon-filter
  • icon-briefcase
  • icon-fullscreen
    • + +
  • icon-dashboard
    • +
  • icon-paperclip
    • +
  • icon-heart-empty
    • +
  • icon-link
    • +
  • icon-phone
    • +
  • icon-pushpin
    • +
  • icon-euro
    • +
  • icon-usd
    • +
  • icon-gbp
    • +
  • icon-sort
    • +
  • icon-sort-by-alphabet
    • +
  • icon-sort-by-alphabet-alt
    • +
  • icon-sort-by-order
    • +
  • icon-sort-by-order-alt
    • +
  • icon-sort-by-attributes
    • +
  • icon-sort-by-attributes-alt
    • +
  • icon-unchecked
    • +
  • icon-expand
    • +
  • icon-collapse
    • +
  • icon-collapse-top
    • +

Glyphicons attribution

-

{{_i}}Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.{{/i}}

+

{{_i}}Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creator have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.{{/i}}

{{_i}}How to use{{/i}}

-

{{_i}}All icons require an <i> tag with a unique class, prefixed with icon-. To use, place the following code just about anywhere:{{/i}}

+

{{_i}}Add the appropriate class to any inline element. All icon classes are prefixed with icon- for easy styling. To use, place the following code just about anywhere:{{/i}}

 <i class="icon-search"></i>
-

{{_i}}There are also styles available for inverted (white) icons, made ready with one extra class. We will specifically enforce this class on hover and active states for nav and dropdown links.{{/i}}

-
-<i class="icon-search icon-white"></i>
-
+

{{_i}}Want to change the icon color? Just change the color of the parent element.{{/i}}

{{_i}}Heads up!{{/i}} - {{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing.{{/i}} + {{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.{{/i}}

@@ -2071,6 +2091,7 @@ + {{! /span9 }} {{! row}} diff --git a/less/sprites.less b/less/sprites.less index e17e0a6fe..785c841ab 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -7,9 +7,6 @@ // and background-position. Your resulting HTML will look like // . -// For the white version of the icons, just add the .icon-white class: -// - // Import the fonts @font-face { font-family: 'Glyphicons Halflings'; -- cgit v1.2.3 From 33beb93e1bb6a9a7e5a7480fa19b32b60a88729d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 18:40:00 -0800 Subject: new docs css for new icons --- docs/assets/css/docs.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 119a30528..adc8b3064 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -544,7 +544,11 @@ h2 + .row { width: 25%; line-height: 25px; } -.the-icons i:hover { +.the-icons [class^="icon-"] { + vertical-align: middle; + margin-right: 3px; +} +.the-icons li:hover [class^="icon-"] { background-color: rgba(255,0,0,.25); } -- cgit v1.2.3 From 23a7ab4b51f0f366bad00b5a8db7c9ee76eec16b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 18:44:10 -0800 Subject: icon vertical align in buttons --- docs/assets/css/bootstrap.css | 19 +++++++++---------- less/buttons.less | 16 ++++++++-------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d2b2c2442..6dfc38015 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3286,11 +3286,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; @@ -3299,11 +3294,6 @@ button.close { border-radius: 3px; } -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { - margin-top: 0; -} - .btn-mini { padding: 0 6px; font-size: 10.5px; @@ -3312,6 +3302,15 @@ button.close { border-radius: 3px; } +.btn [class^="icon-"]:before { + vertical-align: -2px; +} + +.btn-small [class^="icon-"]:before, +.btn-mini [class^="icon-"]:before { + vertical-align: -1px; +} + .btn-block { display: block; width: 100%; diff --git a/less/buttons.less b/less/buttons.less index 4497d3acd..80a31fcf5 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -72,10 +72,6 @@ font-size: @fontSizeLarge; .border-radius(@borderRadiusLarge); } -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { - margin-top: 2px; -} // Small .btn-small { @@ -83,10 +79,6 @@ font-size: @fontSizeSmall; .border-radius(@borderRadiusSmall); } -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { - margin-top: 0; -} // Mini .btn-mini { @@ -96,6 +88,14 @@ } +// Icons in buttons +// ------------------------- + +.btn [class^="icon-"]:before { vertical-align: -2px; } +.btn-small [class^="icon-"]:before, +.btn-mini [class^="icon-"]:before { vertical-align: -1px; } + + // Block button // ------------------------- -- cgit v1.2.3