From 86e31c972d3a4e3a9bdebbc2cc8489e549d9c283 Mon Sep 17 00:00:00 2001 From: davegandy Date: Tue, 7 May 2013 17:57:23 -0400 Subject: [PATCH] resolving #704 --- build/_includes/tests/stacked-icons.html | 51 ++++++++++++++++++ build/_layouts/base.html | 2 +- .../assets/font-awesome/css/font-awesome.css | 47 +++++++++++++--- .../assets/font-awesome/font/FontAwesome.otf | Bin 48380 -> 48316 bytes build/assets/font-awesome/less/bootstrap.less | 6 --- build/assets/font-awesome/less/core.less | 14 +++-- build/assets/font-awesome/less/extras.less | 4 ++ build/assets/font-awesome/less/icons.less | 4 +- build/assets/font-awesome/less/mixins.less | 26 +++++++++ build/assets/font-awesome/less/path.less | 11 ++-- build/assets/font-awesome/less/variables.less | 9 ++-- build/assets/js/{index/index.js => site.js} | 0 build/test.html | 8 +++ 13 files changed, 152 insertions(+), 30 deletions(-) create mode 100644 build/_includes/tests/stacked-icons.html rename build/assets/js/{index/index.js => site.js} (100%) diff --git a/build/_includes/tests/stacked-icons.html b/build/_includes/tests/stacked-icons.html new file mode 100644 index 000000000..36e427f78 --- /dev/null +++ b/build/_includes/tests/stacked-icons.html @@ -0,0 +1,51 @@ +

+ + + + + Twitter Icon + + + + + Facebook Icon + + + + + GitHub Icon +

+

+ + + + + Twitter Icon + + + + + Facebook Icon + + + + + GitHub Icon +

+

+ + + + + Twitter Icon + + + + + Facebook Icon + + + + + GitHub Icon +

\ No newline at end of file diff --git a/build/_layouts/base.html b/build/_layouts/base.html index 0dac65b94..1be2887fd 100644 --- a/build/_layouts/base.html +++ b/build/_layouts/base.html @@ -59,7 +59,7 @@ - + diff --git a/build/assets/font-awesome/css/font-awesome.css b/build/assets/font-awesome/css/font-awesome.css index 0d058c602..46c03e26d 100644 --- a/build/assets/font-awesome/css/font-awesome.css +++ b/build/assets/font-awesome/css/font-awesome.css @@ -24,7 +24,7 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../font/fontawesome-webfont.eot?v=3.0.1'); + src: url('../font/fontawesome-webfont.eot?v=3.1.0'); src: url('../font/FontAwesome.otf') format('opentype'); font-weight: normal; font-style: normal; @@ -46,6 +46,11 @@ display: inline-block; speak: none; } +/* makes the font 33% larger relative to the icon container */ +.icon-large:before { + vertical-align: -10%; + font-size: 1.3333333333333333em; +} /* makes sure icons active on rollover in links */ a [class^="icon-"], a [class*=" icon-"] { @@ -82,6 +87,12 @@ ul.icons-ul > li .icon-li { .icon-muted { color: #eeeeee; } +.icon-light { + color: #ffffff; +} +.icon-dark { + color: #333333; +} .icon-border { border: solid 1px #eeeeee; padding: .2em .25em .15em; @@ -170,11 +181,6 @@ ul.icons-ul > li .icon-li { .dropdown-submenu:hover > a > [class*=" icon-"] { background-image: none; } -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: -10%; - font-size: 1.3333333333333333em; -} /* keeps Bootstrap styles with and without icons the same */ .btn [class^="icon-"], .nav [class^="icon-"], @@ -240,6 +246,31 @@ ul.icons-ul > li .icon-li { } /* EXTRAS * -------------------------- */ +/* Stacked and layered icon */ +.icon-stack { + position: relative; + display: inline-block; + text-align: center; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: -35%; +} +.icon-stack [class^="icon-"], +.icon-stack [class*=" icon-"] { + position: absolute; + width: inherit; + height: inherit; + font-size: 1em; + line-height: inherit; +} +.icon-stack .icon-stack-base { + width: inherit; + height: inherit; + font-size: 2em; + line-height: inherit; +} +/* Animated rotating icon */ .icon-spin { display: inline-block; -moz-animation: spin 2s infinite linear; @@ -287,8 +318,8 @@ ul.icons-ul > li .icon-li { transform: rotate(359deg); } } -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ .icon-glass:before { content: "\f000"; } diff --git a/build/assets/font-awesome/font/FontAwesome.otf b/build/assets/font-awesome/font/FontAwesome.otf index 3bc571e8b59cf8ca68447a1069c018726534851a..71cc7c8a5ed0cbc9b9a5fbe555a0df005239dfdf 100644 GIT binary patch delta 319 zcmezKlWEUSrU_z9+$SbV$n)-DU|@2|NKH)nKWBx=L>J{q1_lO}Wx0tJ1&rDOKsLh< zAZE);%uSsiaw&&_fiZ!BfjP1uzqsUoEkhIo1NRD`yaEFwkYr|XYPsu>7SC_us9O~A0s!E&CH<0 zC<$e=AgN(xP+_!&inAe!vokDWjE9PIFi0>lLfM=QB1~X&IDi&&GiWjCP8N_*ncT)S znJ2F#u{^anKQ~n`Gk>!+b1kD}9zzL3B11VtDnl_tK0_{$)?>&7vKTi1W?|d`0JHBr AQ~&?~ delta 383 zcmdnpb^7OD4UT%jFB74W@6xDRD`mb8I&0H zp==f;HLMIOjDb*bHY9O&hDD5}P;m|h2_|tUo0CC=32Y7r&|+?eFec~87sOR2w=qpt zDk@1VPc6>RP1Q@!EXgQM(o4?I)pyI!E75g?i0f}wWv*p(E@CKQNMtByNM$Hy$Y;m} p(s~T(44FXD42DvMBp@#tEUwSs2Bh Loading... +

Stacked icons

+
+ {% include tests/stacked-icons.html %} +
+
+ {% include tests/stacked-icons.html %} +
+