From 45654ffc5cc4532c2189c88d46a0374038b53c9f Mon Sep 17 00:00:00 2001 From: Treer Date: Sat, 30 Apr 2016 21:36:19 +1000 Subject: update font-awesome library to 4.6.1 Perhaps this should be done as a submodule instead? --- .../src/assets/font-awesome/HELP-US-OUT.txt | 7 + .../src/assets/font-awesome/font/FontAwesome.otf | Bin 61896 -> 0 bytes .../font-awesome/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes .../font-awesome/font/fontawesome-webfont.svg | 399 ------------ .../font-awesome/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes .../font-awesome/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes .../src/assets/font-awesome/fonts/FontAwesome.otf | Bin 0 -> 123112 bytes .../font-awesome/fonts/fontawesome-webfont.eot | Bin 0 -> 75220 bytes .../font-awesome/fonts/fontawesome-webfont.svg | 685 +++++++++++++++++++++ .../font-awesome/fonts/fontawesome-webfont.ttf | Bin 0 -> 150920 bytes .../font-awesome/fonts/fontawesome-webfont.woff | Bin 0 -> 89076 bytes .../font-awesome/fonts/fontawesome-webfont.woff2 | Bin 0 -> 70728 bytes .../src/assets/font-awesome/less/animated.less | 37 ++ .../src/assets/font-awesome/less/bootstrap.less | 84 --- .../assets/font-awesome/less/bordered-pulled.less | 28 + .../src/assets/font-awesome/less/core.less | 130 +--- .../src/assets/font-awesome/less/extras.less | 93 --- .../src/assets/font-awesome/less/fixed-width.less | 9 + .../assets/font-awesome/less/font-awesome-ie7.less | 67 -- .../src/assets/font-awesome/less/font-awesome.less | 12 +- .../src/assets/font-awesome/less/icons.less | 4 +- .../src/assets/font-awesome/less/larger.less | 16 + .../src/assets/font-awesome/less/list.less | 22 + .../src/assets/font-awesome/less/mixins.less | 82 +-- .../src/assets/font-awesome/less/path.less | 13 +- .../assets/font-awesome/less/rotated-flipped.less | 23 + .../assets/font-awesome/less/screen-reader.less | 5 + .../src/assets/font-awesome/less/stacked.less | 23 + .../src/assets/font-awesome/less/variables.less | 20 +- .../src/assets/font-awesome/scss/_animated.scss | 37 ++ .../src/assets/font-awesome/scss/_bootstrap.scss | 84 --- .../assets/font-awesome/scss/_bordered-pulled.scss | 28 + .../src/assets/font-awesome/scss/_core.scss | 130 +--- .../src/assets/font-awesome/scss/_extras.scss | 93 --- .../src/assets/font-awesome/scss/_fixed-width.scss | 9 + .../src/assets/font-awesome/scss/_icons.scss | 6 +- .../src/assets/font-awesome/scss/_larger.scss | 16 + .../src/assets/font-awesome/scss/_list.scss | 22 + .../src/assets/font-awesome/scss/_mixins.scss | 82 +-- .../src/assets/font-awesome/scss/_path.scss | 13 +- .../assets/font-awesome/scss/_rotated-flipped.scss | 23 + .../assets/font-awesome/scss/_screen-reader.scss | 5 + .../src/assets/font-awesome/scss/_stacked.scss | 23 + .../src/assets/font-awesome/scss/_variables.scss | 19 +- .../assets/font-awesome/scss/font-awesome-ie7.scss | 67 -- .../src/assets/font-awesome/scss/font-awesome.scss | 12 +- 46 files changed, 1175 insertions(+), 1253 deletions(-) create mode 100644 library/font_awesome/src/assets/font-awesome/HELP-US-OUT.txt delete mode 100644 library/font_awesome/src/assets/font-awesome/font/FontAwesome.otf delete mode 100755 library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.eot delete mode 100755 library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.svg delete mode 100755 library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.ttf delete mode 100755 library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.woff create mode 100644 library/font_awesome/src/assets/font-awesome/fonts/FontAwesome.otf create mode 100644 library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.eot create mode 100644 library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.svg create mode 100644 library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.ttf create mode 100644 library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.woff create mode 100644 library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.woff2 create mode 100644 library/font_awesome/src/assets/font-awesome/less/animated.less delete mode 100644 library/font_awesome/src/assets/font-awesome/less/bootstrap.less create mode 100644 library/font_awesome/src/assets/font-awesome/less/bordered-pulled.less delete mode 100644 library/font_awesome/src/assets/font-awesome/less/extras.less create mode 100644 library/font_awesome/src/assets/font-awesome/less/fixed-width.less delete mode 100644 library/font_awesome/src/assets/font-awesome/less/font-awesome-ie7.less create mode 100644 library/font_awesome/src/assets/font-awesome/less/larger.less create mode 100644 library/font_awesome/src/assets/font-awesome/less/list.less create mode 100644 library/font_awesome/src/assets/font-awesome/less/rotated-flipped.less create mode 100644 library/font_awesome/src/assets/font-awesome/less/screen-reader.less create mode 100644 library/font_awesome/src/assets/font-awesome/less/stacked.less create mode 100644 library/font_awesome/src/assets/font-awesome/scss/_animated.scss delete mode 100644 library/font_awesome/src/assets/font-awesome/scss/_bootstrap.scss create mode 100644 library/font_awesome/src/assets/font-awesome/scss/_bordered-pulled.scss delete mode 100644 library/font_awesome/src/assets/font-awesome/scss/_extras.scss create mode 100644 library/font_awesome/src/assets/font-awesome/scss/_fixed-width.scss create mode 100644 library/font_awesome/src/assets/font-awesome/scss/_larger.scss create mode 100644 library/font_awesome/src/assets/font-awesome/scss/_list.scss create mode 100644 library/font_awesome/src/assets/font-awesome/scss/_rotated-flipped.scss create mode 100644 library/font_awesome/src/assets/font-awesome/scss/_screen-reader.scss create mode 100644 library/font_awesome/src/assets/font-awesome/scss/_stacked.scss delete mode 100644 library/font_awesome/src/assets/font-awesome/scss/font-awesome-ie7.scss (limited to 'library/font_awesome/src/assets/font-awesome') diff --git a/library/font_awesome/src/assets/font-awesome/HELP-US-OUT.txt b/library/font_awesome/src/assets/font-awesome/HELP-US-OUT.txt new file mode 100644 index 000000000..83d083dd7 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/HELP-US-OUT.txt @@ -0,0 +1,7 @@ +I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project, +Fort Awesome (https://fortawesome.com). It makes it easy to put the perfect icons on your website. Choose from our awesome, +comprehensive icon sets or copy and paste your own. + +Please. Check it out. + +-Dave Gandy diff --git a/library/font_awesome/src/assets/font-awesome/font/FontAwesome.otf b/library/font_awesome/src/assets/font-awesome/font/FontAwesome.otf deleted file mode 100644 index 70125459f..000000000 Binary files a/library/font_awesome/src/assets/font-awesome/font/FontAwesome.otf and /dev/null differ diff --git a/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.eot b/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.eot deleted file mode 100755 index 0662cb96b..000000000 Binary files a/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.eot and /dev/null differ diff --git a/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.svg b/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.svg deleted file mode 100755 index 2edb4ec34..000000000 --- a/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.svg +++ /dev/null @@ -1,399 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.ttf b/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.ttf deleted file mode 100755 index d36592469..000000000 Binary files a/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.ttf and /dev/null differ diff --git a/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.woff b/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.woff deleted file mode 100755 index b9bd17e15..000000000 Binary files a/library/font_awesome/src/assets/font-awesome/font/fontawesome-webfont.woff and /dev/null differ diff --git a/library/font_awesome/src/assets/font-awesome/fonts/FontAwesome.otf b/library/font_awesome/src/assets/font-awesome/fonts/FontAwesome.otf new file mode 100644 index 000000000..59853bcda Binary files /dev/null and b/library/font_awesome/src/assets/font-awesome/fonts/FontAwesome.otf differ diff --git a/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.eot b/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.eot new file mode 100644 index 000000000..96f92f9b8 Binary files /dev/null and b/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.eot differ diff --git a/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.svg b/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.svg new file mode 100644 index 000000000..5a5f0ecd4 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.svg @@ -0,0 +1,685 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.ttf b/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.ttf new file mode 100644 index 000000000..86784df96 Binary files /dev/null and b/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.ttf differ diff --git a/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.woff b/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.woff new file mode 100644 index 000000000..c7faa19c4 Binary files /dev/null and b/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.woff differ diff --git a/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.woff2 b/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.woff2 new file mode 100644 index 000000000..cab8571d5 Binary files /dev/null and b/library/font_awesome/src/assets/font-awesome/fonts/fontawesome-webfont.woff2 differ diff --git a/library/font_awesome/src/assets/font-awesome/less/animated.less b/library/font_awesome/src/assets/font-awesome/less/animated.less new file mode 100644 index 000000000..e489ea318 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/less/animated.less @@ -0,0 +1,37 @@ +--- +--- + +// Animated Icons +// -------------------------- + +.@{fa-css-prefix}-spin { + -webkit-animation: fa-spin 2s infinite linear; + animation: fa-spin 2s infinite linear; +} + +.@{fa-css-prefix}-pulse { + -webkit-animation: fa-spin 1s infinite steps(8); + animation: fa-spin 1s infinite steps(8); +} + +@-webkit-keyframes fa-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} + +@keyframes fa-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} diff --git a/library/font_awesome/src/assets/font-awesome/less/bootstrap.less b/library/font_awesome/src/assets/font-awesome/less/bootstrap.less deleted file mode 100644 index a2c96046b..000000000 --- a/library/font_awesome/src/assets/font-awesome/less/bootstrap.less +++ /dev/null @@ -1,84 +0,0 @@ -/* BOOTSTRAP SPECIFIC CLASSES - * -------------------------- */ - -/* Bootstrap 2.0 sprites.less reset */ -[class^="icon-"], -[class*=" icon-"] { - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} - -/* more sprites.less reset */ -.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: none; -} - - -/* keeps Bootstrap styles with and without icons the same */ -.btn, .nav { - [class^="icon-"], - [class*=" icon-"] { -// display: inline; - &.icon-large { line-height: .9em; } - &.icon-spin { display: inline-block; } - } -} -.nav-tabs, .nav-pills { - [class^="icon-"], - [class*=" icon-"] { - &, &.icon-large { line-height: .9em; } - } -} -.btn { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .18em; } - } - &.icon-spin.icon-large { line-height: .8em; } - } -} -.btn.btn-small { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .25em; } - } - } -} -.btn.btn-large { - [class^="icon-"], - [class*=" icon-"] { - margin-top: 0; // overrides bootstrap default - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .05em; } - } - &.pull-left.icon-2x { margin-right: .2em; } - &.pull-right.icon-2x { margin-left: .2em; } - } -} - -/* Fixes alignment in nav lists */ -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - line-height: inherit; -} diff --git a/library/font_awesome/src/assets/font-awesome/less/bordered-pulled.less b/library/font_awesome/src/assets/font-awesome/less/bordered-pulled.less new file mode 100644 index 000000000..cd14a68a1 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/less/bordered-pulled.less @@ -0,0 +1,28 @@ +--- +--- + +// Bordered & Pulled +// ------------------------- + +.@{fa-css-prefix}-border { + padding: .2em .25em .15em; + border: solid .08em @fa-border-color; + border-radius: .1em; +} + +.@{fa-css-prefix}-pull-left { float: left; } +.@{fa-css-prefix}-pull-right { float: right; } + +.@{fa-css-prefix} { + &.@{fa-css-prefix}-pull-left { margin-right: .3em; } + &.@{fa-css-prefix}-pull-right { margin-left: .3em; } +} + +/* Deprecated as of 4.4.0 */ +.pull-right { float: right; } +.pull-left { float: left; } + +.@{fa-css-prefix} { + &.pull-left { margin-right: .3em; } + &.pull-right { margin-left: .3em; } +} diff --git a/library/font_awesome/src/assets/font-awesome/less/core.less b/library/font_awesome/src/assets/font-awesome/less/core.less index 1ef7e2235..d299d0d03 100644 --- a/library/font_awesome/src/assets/font-awesome/less/core.less +++ b/library/font_awesome/src/assets/font-awesome/less/core.less @@ -1,129 +1,9 @@ -/* FONT AWESOME CORE - * -------------------------- */ +--- +--- -[class^="icon-"], -[class*=" icon-"] { - .icon-FontAwesome(); -} - -[class^="icon-"]:before, -[class*=" icon-"]:before { - text-decoration: inherit; - display: inline-block; - speak: none; -} - -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: -10%; - font-size: 4/3em; -} - -/* makes sure icons active on rollover in links */ -a { - [class^="icon-"], - [class*=" icon-"] { - display: inline; - } -} - -/* increased font size for icon-large */ -[class^="icon-"], -[class*=" icon-"] { - &.icon-fixed-width { - display: inline-block; - width: 16/14em; - text-align: right; - padding-right: 4/14em; - &.icon-large { - width: 20/14em; - } - } -} - -.icons-ul { - margin-left: @icons-li-width; - list-style-type: none; - - > li { position: relative; } - - .icon-li { - position: absolute; - left: -@icons-li-width; - width: @icons-li-width; - text-align: center; - line-height: inherit; - } -} - -// allows usage of the hide class directly on font awesome icons -[class^="icon-"], -[class*=" icon-"] { - &.hide { - display: none; - } -} - -.icon-muted { color: @iconMuted; } -.icon-light { color: @iconLight; } -.icon-dark { color: @iconDark; } - -// Icon Borders -// ------------------------- - -.icon-border { - border: solid 1px @borderColor; - padding: .2em .25em .15em; - .border-radius(3px); -} - -// Icon Sizes +// Base Class Definition // ------------------------- -.icon-2x { - font-size: 2em; - &.icon-border { - border-width: 2px; - .border-radius(4px); - } -} -.icon-3x { - font-size: 3em; - &.icon-border { - border-width: 3px; - .border-radius(5px); - } -} -.icon-4x { - font-size: 4em; - &.icon-border { - border-width: 4px; - .border-radius(6px); - } -} - -.icon-5x { - font-size: 5em; - &.icon-border { - border-width: 5px; - .border-radius(7px); - } -} - - -// Floats & Margins -// ------------------------- - -// Quick floats -.pull-right { float: right; } -.pull-left { float: left; } - -[class^="icon-"], -[class*=" icon-"] { - &.pull-left { - margin-right: .3em; - } - &.pull-right { - margin-left: .3em; - } +.@{fa-css-prefix} { +{% include code/core.less %} } diff --git a/library/font_awesome/src/assets/font-awesome/less/extras.less b/library/font_awesome/src/assets/font-awesome/less/extras.less deleted file mode 100644 index c93c260c8..000000000 --- a/library/font_awesome/src/assets/font-awesome/less/extras.less +++ /dev/null @@ -1,93 +0,0 @@ -/* EXTRAS - * -------------------------- */ - -/* Stacked and layered icon */ -.icon-stack(); - -/* Animated rotating icon */ -.icon-spin { - display: inline-block; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} - -/* Prevent stack and spinners from being taken inline when inside a link */ -a .icon-stack, -a .icon-spin { - display: inline-block; - text-decoration: none; -} - -@-moz-keyframes spin { - 0% { -moz-transform: rotate(0deg); } - 100% { -moz-transform: rotate(359deg); } -} -@-webkit-keyframes spin { - 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(359deg); } -} -@-o-keyframes spin { - 0% { -o-transform: rotate(0deg); } - 100% { -o-transform: rotate(359deg); } -} -@-ms-keyframes spin { - 0% { -ms-transform: rotate(0deg); } - 100% { -ms-transform: rotate(359deg); } -} -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(359deg); } -} - -/* Icon rotations and mirroring */ -.icon-rotate-90:before { - -webkit-transform: rotate(90deg); - -moz-transform: rotate(90deg); - -ms-transform: rotate(90deg); - -o-transform: rotate(90deg); - transform: rotate(90deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); -} - -.icon-rotate-180:before { - -webkit-transform: rotate(180deg); - -moz-transform: rotate(180deg); - -ms-transform: rotate(180deg); - -o-transform: rotate(180deg); - transform: rotate(180deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); -} - -.icon-rotate-270:before { - -webkit-transform: rotate(270deg); - -moz-transform: rotate(270deg); - -ms-transform: rotate(270deg); - -o-transform: rotate(270deg); - transform: rotate(270deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); -} - -.icon-flip-horizontal:before { - -webkit-transform: scale(-1, 1); - -moz-transform: scale(-1, 1); - -ms-transform: scale(-1, 1); - -o-transform: scale(-1, 1); - transform: scale(-1, 1); -} - -.icon-flip-vertical:before { - -webkit-transform: scale(1, -1); - -moz-transform: scale(1, -1); - -ms-transform: scale(1, -1); - -o-transform: scale(1, -1); - transform: scale(1, -1); -} - -/* ensure rotation occurs inside anchor tags */ -a { - .icon-rotate-90, .icon-rotate-180, .icon-rotate-270, .icon-flip-horizontal, .icon-flip-vertical { - &:before { display: inline-block; } - } -} diff --git a/library/font_awesome/src/assets/font-awesome/less/fixed-width.less b/library/font_awesome/src/assets/font-awesome/less/fixed-width.less new file mode 100644 index 000000000..f3b657b52 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/less/fixed-width.less @@ -0,0 +1,9 @@ +--- +--- + +// Fixed Width Icons +// ------------------------- +.@{fa-css-prefix}-fw { + width: (18em / 14); + text-align: center; +} diff --git a/library/font_awesome/src/assets/font-awesome/less/font-awesome-ie7.less b/library/font_awesome/src/assets/font-awesome/less/font-awesome-ie7.less deleted file mode 100644 index 2822fdee6..000000000 --- a/library/font_awesome/src/assets/font-awesome/less/font-awesome-ie7.less +++ /dev/null @@ -1,67 +0,0 @@ ---- ---- -{% include license-code.less %} - -.icon-large { - font-size: 4/3em; - margin-top: -4px; - padding-top: 3px; - margin-bottom: -4px; - padding-bottom: 3px; - vertical-align: middle; -} - -.nav { - [class^="icon-"], - [class*=" icon-"] { - vertical-align: inherit; - margin-top: -4px; - padding-top: 3px; - margin-bottom: -4px; - padding-bottom: 3px; - &.icon-large { - vertical-align: -25%; - } - } -} - -.nav-pills, .nav-tabs { - [class^="icon-"], - [class*=" icon-"] { - &.icon-large { - line-height: .75em; - margin-top: -7px; - padding-top: 5px; - margin-bottom: -5px; - padding-bottom: 4px; - } - } -} - -.btn { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { vertical-align: inherit; } - &.icon-large { - margin-top: -.5em; - } - } -} - -a [class^="icon-"], -a [class*=" icon-"] { - cursor: pointer; -} - -.ie7icon(@inner) { *zoom: ~"expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '@{inner}')"; } - -{% for icon in icons %} -.icon-{{ icon.id }} { - .ie7icon('&#x{{ icon.unicode }};'); -} -{% for alias in icon.aliases %} -.icon-{{ alias }} { - .ie7icon('&#x{{ icon.unicode }};'); -} -{% endfor %} -{% endfor %} diff --git a/library/font_awesome/src/assets/font-awesome/less/font-awesome.less b/library/font_awesome/src/assets/font-awesome/less/font-awesome.less index fa87c2752..3fb656e35 100644 --- a/library/font_awesome/src/assets/font-awesome/less/font-awesome.less +++ b/library/font_awesome/src/assets/font-awesome/less/font-awesome.less @@ -1,11 +1,17 @@ --- --- -{% include license-code.less %} +{% include code/license.css %} @import "variables.less"; @import "mixins.less"; @import "path.less"; @import "core.less"; -@import "bootstrap.less"; -@import "extras.less"; +@import "larger.less"; +@import "fixed-width.less"; +@import "list.less"; +@import "bordered-pulled.less"; +@import "animated.less"; +@import "rotated-flipped.less"; +@import "stacked.less"; @import "icons.less"; +@import "screen-reader.less"; diff --git a/library/font_awesome/src/assets/font-awesome/less/icons.less b/library/font_awesome/src/assets/font-awesome/less/icons.less index faf238b5e..1d29b69a6 100644 --- a/library/font_awesome/src/assets/font-awesome/less/icons.less +++ b/library/font_awesome/src/assets/font-awesome/less/icons.less @@ -3,5 +3,5 @@ /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen readers do not read off random characters that represent icons */ {% for icon in icons %}{% for alias in icon.aliases %} -.icon-{{ alias }}:before,{% endfor %} -.icon-{{ icon.id }}:before { content: @{{ icon.id }}; }{% endfor %} +.@{fa-css-prefix}-{{ alias }}:before,{% endfor %} +.@{fa-css-prefix}-{{ icon.id }}:before { content: @fa-var-{{ icon.id }}; }{% endfor %} diff --git a/library/font_awesome/src/assets/font-awesome/less/larger.less b/library/font_awesome/src/assets/font-awesome/less/larger.less new file mode 100644 index 000000000..472643eb0 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/less/larger.less @@ -0,0 +1,16 @@ +--- +--- + +// Icon Sizes +// ------------------------- + +/* makes the font 33% larger relative to the icon container */ +.@{fa-css-prefix}-lg { + font-size: (4em / 3); + line-height: (3em / 4); + vertical-align: -15%; +} +.@{fa-css-prefix}-2x { font-size: 2em; } +.@{fa-css-prefix}-3x { font-size: 3em; } +.@{fa-css-prefix}-4x { font-size: 4em; } +.@{fa-css-prefix}-5x { font-size: 5em; } diff --git a/library/font_awesome/src/assets/font-awesome/less/list.less b/library/font_awesome/src/assets/font-awesome/less/list.less new file mode 100644 index 000000000..e32bc0d2e --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/less/list.less @@ -0,0 +1,22 @@ +--- +--- + +// List Icons +// ------------------------- + +.@{fa-css-prefix}-ul { + padding-left: 0; + margin-left: @fa-li-width; + list-style-type: none; + > li { position: relative; } +} +.@{fa-css-prefix}-li { + position: absolute; + left: -@fa-li-width; + width: @fa-li-width; + top: (2em / 14); + text-align: center; + &.@{fa-css-prefix}-lg { + left: (-@fa-li-width + (4em / 14)); + } +} diff --git a/library/font_awesome/src/assets/font-awesome/less/mixins.less b/library/font_awesome/src/assets/font-awesome/less/mixins.less index f7fdda590..588973976 100644 --- a/library/font_awesome/src/assets/font-awesome/less/mixins.less +++ b/library/font_awesome/src/assets/font-awesome/less/mixins.less @@ -1,48 +1,56 @@ +--- +--- // Mixins // -------------------------- -.icon(@icon) { - .icon-FontAwesome(); - content: @icon; +.fa-icon() { +{% include code/core.less %} } -.icon-FontAwesome() { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - -webkit-font-smoothing: antialiased; - *margin-right: .3em; // fixes ie7 issues +.fa-icon-rotate(@degrees, @rotation) { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation})"; + -webkit-transform: rotate(@degrees); + -ms-transform: rotate(@degrees); + transform: rotate(@degrees); } -.border-radius(@radius) { - -webkit-border-radius: @radius; - -moz-border-radius: @radius; - border-radius: @radius; +.fa-icon-flip(@horiz, @vert, @rotation) { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation}, mirror=1)"; + -webkit-transform: scale(@horiz, @vert); + -ms-transform: scale(@horiz, @vert); + transform: scale(@horiz, @vert); } -.icon-stack(@width: 2em, @height: 2em, @top-font-size: 1em, @base-font-size: 2em) { - .icon-stack { - position: relative; - display: inline-block; - width: @width; - height: @height; - line-height: @width; - vertical-align: -35%; - [class^="icon-"], - [class*=" icon-"] { - display: block; - text-align: center; - position: absolute; - width: 100%; - height: 100%; - font-size: @top-font-size; - line-height: inherit; - *line-height: @height; - } - .icon-stack-base { - font-size: @base-font-size; - *line-height: @height / @base-font-size; - } + +// Only display content to screen readers. A la Bootstrap 4. +// +// See: http://a11yproject.com/posts/how-to-hide-content/ + +.sr-only() { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0,0,0,0); + border: 0; +} + +// Use in conjunction with .sr-only to only display content when it's focused. +// +// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1 +// +// Credit: HTML5 Boilerplate + +.sr-only-focusable() { + &:active, + &:focus { + position: static; + width: auto; + height: auto; + margin: 0; + overflow: visible; + clip: auto; } } diff --git a/library/font_awesome/src/assets/font-awesome/less/path.less b/library/font_awesome/src/assets/font-awesome/less/path.less index 8ccef8cf0..835be41f8 100644 --- a/library/font_awesome/src/assets/font-awesome/less/path.less +++ b/library/font_awesome/src/assets/font-awesome/less/path.less @@ -3,12 +3,13 @@ @font-face { font-family: 'FontAwesome'; - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}'); - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'), - url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'), - url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'), - url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg'); -// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts + src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); + src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), + url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'), + url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), + url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), + url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); + // src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } diff --git a/library/font_awesome/src/assets/font-awesome/less/rotated-flipped.less b/library/font_awesome/src/assets/font-awesome/less/rotated-flipped.less new file mode 100644 index 000000000..bf7a0b423 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/less/rotated-flipped.less @@ -0,0 +1,23 @@ +--- +--- + +// Rotated & Flipped Icons +// ------------------------- + +.@{fa-css-prefix}-rotate-90 { .fa-icon-rotate(90deg, 1); } +.@{fa-css-prefix}-rotate-180 { .fa-icon-rotate(180deg, 2); } +.@{fa-css-prefix}-rotate-270 { .fa-icon-rotate(270deg, 3); } + +.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); } +.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); } + +// Hook for IE8-9 +// ------------------------- + +:root .@{fa-css-prefix}-rotate-90, +:root .@{fa-css-prefix}-rotate-180, +:root .@{fa-css-prefix}-rotate-270, +:root .@{fa-css-prefix}-flip-horizontal, +:root .@{fa-css-prefix}-flip-vertical { + filter: none; +} diff --git a/library/font_awesome/src/assets/font-awesome/less/screen-reader.less b/library/font_awesome/src/assets/font-awesome/less/screen-reader.less new file mode 100644 index 000000000..11c188196 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/less/screen-reader.less @@ -0,0 +1,5 @@ +// Screen Readers +// ------------------------- + +.sr-only { .sr-only(); } +.sr-only-focusable { .sr-only-focusable(); } diff --git a/library/font_awesome/src/assets/font-awesome/less/stacked.less b/library/font_awesome/src/assets/font-awesome/less/stacked.less new file mode 100644 index 000000000..2a1e4189b --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/less/stacked.less @@ -0,0 +1,23 @@ +--- +--- + +// Stacked Icons +// ------------------------- + +.@{fa-css-prefix}-stack { + position: relative; + display: inline-block; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: middle; +} +.@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x { + position: absolute; + left: 0; + width: 100%; + text-align: center; +} +.@{fa-css-prefix}-stack-1x { line-height: inherit; } +.@{fa-css-prefix}-stack-2x { font-size: 2em; } +.@{fa-css-prefix}-inverse { color: @fa-inverse; } diff --git a/library/font_awesome/src/assets/font-awesome/less/variables.less b/library/font_awesome/src/assets/font-awesome/less/variables.less index 4d5271896..83207e414 100644 --- a/library/font_awesome/src/assets/font-awesome/less/variables.less +++ b/library/font_awesome/src/assets/font-awesome/less/variables.less @@ -3,15 +3,15 @@ // Variables // -------------------------- -@FontAwesomePath: "../font"; -//@FontAwesomePath: "//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version}}/font"; // for referencing Bootstrap CDN font files directly -@FontAwesomeVersion: "{{ site.fontawesome.version }}"; -@borderColor: #eee; -@iconMuted: #eee; -@iconLight: #fff; -@iconDark: #333; -@icons-li-width: 30/14em; +@fa-font-path: "../fonts"; +@fa-font-size-base: 14px; +@fa-line-height-base: 1; +//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/{{site.fontawesome.version}}/fonts"; // for referencing Bootstrap CDN font files directly +@fa-css-prefix: {{ site.fontawesome.css_prefix }}; +@fa-version: "{{ site.fontawesome.version }}"; +@fa-border-color: #eee; +@fa-inverse: #fff; +@fa-li-width: (30em / 14); -{% for icon in icons %} - @{{ icon.id }}: "\{{ icon.unicode }}"; +{% assign sorted_icons = icons | expand_aliases | sort_by:'class' %}{% for icon in sorted_icons %}@fa-var-{{ icon.class }}: "\{{ icon.unicode }}"; {% endfor %} diff --git a/library/font_awesome/src/assets/font-awesome/scss/_animated.scss b/library/font_awesome/src/assets/font-awesome/scss/_animated.scss new file mode 100644 index 000000000..fed5a987f --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/scss/_animated.scss @@ -0,0 +1,37 @@ +--- +--- + +// Spinning Icons +// -------------------------- + +.#{$fa-css-prefix}-spin { + -webkit-animation: fa-spin 2s infinite linear; + animation: fa-spin 2s infinite linear; +} + +.#{$fa-css-prefix}-pulse { + -webkit-animation: fa-spin 1s infinite steps(8); + animation: fa-spin 1s infinite steps(8); +} + +@-webkit-keyframes fa-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} + +@keyframes fa-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} diff --git a/library/font_awesome/src/assets/font-awesome/scss/_bootstrap.scss b/library/font_awesome/src/assets/font-awesome/scss/_bootstrap.scss deleted file mode 100644 index 837d2df65..000000000 --- a/library/font_awesome/src/assets/font-awesome/scss/_bootstrap.scss +++ /dev/null @@ -1,84 +0,0 @@ -/* BOOTSTRAP SPECIFIC CLASSES - * -------------------------- */ - -/* Bootstrap 2.0 sprites.less reset */ -[class^="icon-"], -[class*=" icon-"] { - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} - -/* more sprites.less reset */ -.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: none; -} - - -/* keeps Bootstrap styles with and without icons the same */ -.btn, .nav { - [class^="icon-"], - [class*=" icon-"] { - // display: inline; - &.icon-large { line-height: .9em; } - &.icon-spin { display: inline-block; } - } -} -.nav-tabs, .nav-pills { - [class^="icon-"], - [class*=" icon-"] { - &, &.icon-large { line-height: .9em; } - } -} -.btn { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .18em; } - } - &.icon-spin.icon-large { line-height: .8em; } - } -} -.btn.btn-small { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .25em; } - } - } -} -.btn.btn-large { - [class^="icon-"], - [class*=" icon-"] { - margin-top: 0; // overrides bootstrap default - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .05em; } - } - &.pull-left.icon-2x { margin-right: .2em; } - &.pull-right.icon-2x { margin-left: .2em; } - } -} - -/* Fixes alignment in nav lists */ -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - line-height: inherit; -} diff --git a/library/font_awesome/src/assets/font-awesome/scss/_bordered-pulled.scss b/library/font_awesome/src/assets/font-awesome/scss/_bordered-pulled.scss new file mode 100644 index 000000000..40bafcba9 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/scss/_bordered-pulled.scss @@ -0,0 +1,28 @@ +--- +--- + +// Bordered & Pulled +// ------------------------- + +.#{$fa-css-prefix}-border { + padding: .2em .25em .15em; + border: solid .08em $fa-border-color; + border-radius: .1em; +} + +.#{$fa-css-prefix}-pull-left { float: left; } +.#{$fa-css-prefix}-pull-right { float: right; } + +.#{$fa-css-prefix} { + &.#{$fa-css-prefix}-pull-left { margin-right: .3em; } + &.#{$fa-css-prefix}-pull-right { margin-left: .3em; } +} + +/* Deprecated as of 4.4.0 */ +.pull-right { float: right; } +.pull-left { float: left; } + +.#{$fa-css-prefix} { + &.pull-left { margin-right: .3em; } + &.pull-right { margin-left: .3em; } +} diff --git a/library/font_awesome/src/assets/font-awesome/scss/_core.scss b/library/font_awesome/src/assets/font-awesome/scss/_core.scss index 0189c73df..45e548bac 100644 --- a/library/font_awesome/src/assets/font-awesome/scss/_core.scss +++ b/library/font_awesome/src/assets/font-awesome/scss/_core.scss @@ -1,129 +1,9 @@ -/* FONT AWESOME CORE - * -------------------------- */ +--- +--- -[class^="icon-"], -[class*=" icon-"] { - @include icon-FontAwesome(); -} - -[class^="icon-"]:before, -[class*=" icon-"]:before { - text-decoration: inherit; - display: inline-block; - speak: none; -} - -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: -10%; - font-size: (4em/3); -} - -/* makes sure icons active on rollover in links */ -a { - [class^="icon-"], - [class*=" icon-"] { - display: inline; - } -} - -/* increased font size for icon-large */ -[class^="icon-"], -[class*=" icon-"] { - &.icon-fixed-width { - display: inline-block; - width: (16em/14); - text-align: right; - padding-right: (4em/14); - &.icon-large { - width: (20em/14); - } - } -} - -.icons-ul { - margin-left: $icons-li-width; - list-style-type: none; - - > li { position: relative; } - - .icon-li { - position: absolute; - left: -$icons-li-width; - width: $icons-li-width; - text-align: center; - line-height: inherit; - } -} - -// allows usage of the hide class directly on font awesome icons -[class^="icon-"], -[class*=" icon-"] { - &.hide { - display: none; - } -} - -.icon-muted { color: $iconMuted; } -.icon-light { color: $iconLight; } -.icon-dark { color: $iconDark; } - -// Icon Borders -// ------------------------- - -.icon-border { - border: solid 1px $borderColor; - padding: .2em .25em .15em; - @include border-radius(3px); -} - -// Icon Sizes +// Base Class Definition // ------------------------- -.icon-2x { - font-size: 2em; - &.icon-border { - border-width: 2px; - @include border-radius(4px); - } -} -.icon-3x { - font-size: 3em; - &.icon-border { - border-width: 3px; - @include border-radius(5px); - } -} -.icon-4x { - font-size: 4em; - &.icon-border { - border-width: 4px; - @include border-radius(6px); - } -} - -.icon-5x { - font-size: 5em; - &.icon-border { - border-width: 5px; - @include border-radius(7px); - } -} - - -// Floats & Margins -// ------------------------- - -// Quick floats -.pull-right { float: right; } -.pull-left { float: left; } - -[class^="icon-"], -[class*=" icon-"] { - &.pull-left { - margin-right: .3em; - } - &.pull-right { - margin-left: .3em; - } +.#{$fa-css-prefix} { +{% include code/core.scss %} } diff --git a/library/font_awesome/src/assets/font-awesome/scss/_extras.scss b/library/font_awesome/src/assets/font-awesome/scss/_extras.scss deleted file mode 100644 index 9a25845d8..000000000 --- a/library/font_awesome/src/assets/font-awesome/scss/_extras.scss +++ /dev/null @@ -1,93 +0,0 @@ -/* EXTRAS - * -------------------------- */ - -/* Stacked and layered icon */ -@include icon-stack(); - -/* Animated rotating icon */ -.icon-spin { - display: inline-block; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} - -/* Prevent stack and spinners from being taken inline when inside a link */ -a .icon-stack, -a .icon-spin { - display: inline-block; - text-decoration: none; -} - -@-moz-keyframes spin { - 0% { -moz-transform: rotate(0deg); } - 100% { -moz-transform: rotate(359deg); } -} -@-webkit-keyframes spin { - 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(359deg); } -} -@-o-keyframes spin { - 0% { -o-transform: rotate(0deg); } - 100% { -o-transform: rotate(359deg); } -} -@-ms-keyframes spin { - 0% { -ms-transform: rotate(0deg); } - 100% { -ms-transform: rotate(359deg); } -} -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(359deg); } -} - -/* Icon rotations and mirroring */ -.icon-rotate-90:before { - -webkit-transform: rotate(90deg); - -moz-transform: rotate(90deg); - -ms-transform: rotate(90deg); - -o-transform: rotate(90deg); - transform: rotate(90deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); -} - -.icon-rotate-180:before { - -webkit-transform: rotate(180deg); - -moz-transform: rotate(180deg); - -ms-transform: rotate(180deg); - -o-transform: rotate(180deg); - transform: rotate(180deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); -} - -.icon-rotate-270:before { - -webkit-transform: rotate(270deg); - -moz-transform: rotate(270deg); - -ms-transform: rotate(270deg); - -o-transform: rotate(270deg); - transform: rotate(270deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); -} - -.icon-flip-horizontal:before { - -webkit-transform: scale(-1, 1); - -moz-transform: scale(-1, 1); - -ms-transform: scale(-1, 1); - -o-transform: scale(-1, 1); - transform: scale(-1, 1); -} - -.icon-flip-vertical:before { - -webkit-transform: scale(1, -1); - -moz-transform: scale(1, -1); - -ms-transform: scale(1, -1); - -o-transform: scale(1, -1); - transform: scale(1, -1); -} - -/* ensure rotation occurs inside anchor tags */ -a { - .icon-rotate-90, .icon-rotate-180, .icon-rotate-270, .icon-flip-horizontal, .icon-flip-vertical { - &:before { display: inline-block; } - } -} diff --git a/library/font_awesome/src/assets/font-awesome/scss/_fixed-width.scss b/library/font_awesome/src/assets/font-awesome/scss/_fixed-width.scss new file mode 100644 index 000000000..cfb14543a --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/scss/_fixed-width.scss @@ -0,0 +1,9 @@ +--- +--- + +// Fixed Width Icons +// ------------------------- +.#{$fa-css-prefix}-fw { + width: (18em / 14); + text-align: center; +} diff --git a/library/font_awesome/src/assets/font-awesome/scss/_icons.scss b/library/font_awesome/src/assets/font-awesome/scss/_icons.scss index 5febd993f..23128aaee 100644 --- a/library/font_awesome/src/assets/font-awesome/scss/_icons.scss +++ b/library/font_awesome/src/assets/font-awesome/scss/_icons.scss @@ -1,7 +1,7 @@ --- --- /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - * readers do not read off random characters that represent icons */ + readers do not read off random characters that represent icons */ {% for icon in icons %}{% for alias in icon.aliases %} -.icon-{{ alias }}:before,{% endfor %} -.icon-{{ icon.id }}:before { content: ${{ icon.id }}; }{% endfor %} +.#{$fa-css-prefix}-{{ alias }}:before,{% endfor %} +.#{$fa-css-prefix}-{{ icon.id }}:before { content: $fa-var-{{ icon.id }}; }{% endfor %} diff --git a/library/font_awesome/src/assets/font-awesome/scss/_larger.scss b/library/font_awesome/src/assets/font-awesome/scss/_larger.scss new file mode 100644 index 000000000..403572384 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/scss/_larger.scss @@ -0,0 +1,16 @@ +--- +--- + +// Icon Sizes +// ------------------------- + +/* makes the font 33% larger relative to the icon container */ +.#{$fa-css-prefix}-lg { + font-size: (4em / 3); + line-height: (3em / 4); + vertical-align: -15%; +} +.#{$fa-css-prefix}-2x { font-size: 2em; } +.#{$fa-css-prefix}-3x { font-size: 3em; } +.#{$fa-css-prefix}-4x { font-size: 4em; } +.#{$fa-css-prefix}-5x { font-size: 5em; } diff --git a/library/font_awesome/src/assets/font-awesome/scss/_list.scss b/library/font_awesome/src/assets/font-awesome/scss/_list.scss new file mode 100644 index 000000000..1c6498268 --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/scss/_list.scss @@ -0,0 +1,22 @@ +--- +--- + +// List Icons +// ------------------------- + +.#{$fa-css-prefix}-ul { + padding-left: 0; + margin-left: $fa-li-width; + list-style-type: none; + > li { position: relative; } +} +.#{$fa-css-prefix}-li { + position: absolute; + left: -$fa-li-width; + width: $fa-li-width; + top: (2em / 14); + text-align: center; + &.#{$fa-css-prefix}-lg { + left: -$fa-li-width + (4em / 14); + } +} diff --git a/library/font_awesome/src/assets/font-awesome/scss/_mixins.scss b/library/font_awesome/src/assets/font-awesome/scss/_mixins.scss index ca9c5931b..241166198 100644 --- a/library/font_awesome/src/assets/font-awesome/scss/_mixins.scss +++ b/library/font_awesome/src/assets/font-awesome/scss/_mixins.scss @@ -1,48 +1,56 @@ +--- +--- // Mixins // -------------------------- -@mixin icon($icon) { - @include icon-FontAwesome(); - content: $icon; +@mixin fa-icon() { +{% include code/core.scss %} } -@mixin icon-FontAwesome() { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - -webkit-font-smoothing: antialiased; - *margin-right: .3em; // fixes ie7 issues +@mixin fa-icon-rotate($degrees, $rotation) { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})"; + -webkit-transform: rotate($degrees); + -ms-transform: rotate($degrees); + transform: rotate($degrees); } -@mixin border-radius($radius) { - -webkit-border-radius: $radius; - -moz-border-radius: $radius; - border-radius: $radius; +@mixin fa-icon-flip($horiz, $vert, $rotation) { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)"; + -webkit-transform: scale($horiz, $vert); + -ms-transform: scale($horiz, $vert); + transform: scale($horiz, $vert); } -@mixin icon-stack($width: 2em, $height: 2em, $top-font-size: 1em, $base-font-size: 2em) { - .icon-stack { - position: relative; - display: inline-block; - width: $width; - height: $height; - line-height: $width; - vertical-align: -35%; - [class^="icon-"], - [class*=" icon-"] { - display: block; - text-align: center; - position: absolute; - width: 100%; - height: 100%; - font-size: $top-font-size; - line-height: inherit; - *line-height: $height; - } - .icon-stack-base { - font-size: $base-font-size; - *line-height: #{$height / $base-font-size}em; - } + +// Only display content to screen readers. A la Bootstrap 4. +// +// See: http://a11yproject.com/posts/how-to-hide-content/ + +@mixin sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0,0,0,0); + border: 0; +} + +// Use in conjunction with .sr-only to only display content when it's focused. +// +// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1 +// +// Credit: HTML5 Boilerplate + +@mixin sr-only-focusable { + &:active, + &:focus { + position: static; + width: auto; + height: auto; + margin: 0; + overflow: visible; + clip: auto; } } diff --git a/library/font_awesome/src/assets/font-awesome/scss/_path.scss b/library/font_awesome/src/assets/font-awesome/scss/_path.scss index bb3f36b70..bb457c23a 100644 --- a/library/font_awesome/src/assets/font-awesome/scss/_path.scss +++ b/library/font_awesome/src/assets/font-awesome/scss/_path.scss @@ -3,12 +3,13 @@ @font-face { font-family: 'FontAwesome'; - src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?v=#{$FontAwesomeVersion}'); - src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=#{$FontAwesomeVersion}') format('embedded-opentype'), - url('#{$FontAwesomePath}/fontawesome-webfont.woff?v=#{$FontAwesomeVersion}') format('woff'), - url('#{$FontAwesomePath}/fontawesome-webfont.ttf?v=#{$FontAwesomeVersion}') format('truetype'), - url('#{$FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=#{$FontAwesomeVersion}') format('svg'); -// src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts + src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}'); + src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'), + url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'), + url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'), + url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'), + url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg'); +// src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } diff --git a/library/font_awesome/src/assets/font-awesome/scss/_rotated-flipped.scss b/library/font_awesome/src/assets/font-awesome/scss/_rotated-flipped.scss new file mode 100644 index 000000000..6e95eb46a --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/scss/_rotated-flipped.scss @@ -0,0 +1,23 @@ +--- +--- + +// Rotated & Flipped Icons +// ------------------------- + +.#{$fa-css-prefix}-rotate-90 { @include fa-icon-rotate(90deg, 1); } +.#{$fa-css-prefix}-rotate-180 { @include fa-icon-rotate(180deg, 2); } +.#{$fa-css-prefix}-rotate-270 { @include fa-icon-rotate(270deg, 3); } + +.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); } +.#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); } + +// Hook for IE8-9 +// ------------------------- + +:root .#{$fa-css-prefix}-rotate-90, +:root .#{$fa-css-prefix}-rotate-180, +:root .#{$fa-css-prefix}-rotate-270, +:root .#{$fa-css-prefix}-flip-horizontal, +:root .#{$fa-css-prefix}-flip-vertical { + filter: none; +} diff --git a/library/font_awesome/src/assets/font-awesome/scss/_screen-reader.scss b/library/font_awesome/src/assets/font-awesome/scss/_screen-reader.scss new file mode 100644 index 000000000..637426f0d --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/scss/_screen-reader.scss @@ -0,0 +1,5 @@ +// Screen Readers +// ------------------------- + +.sr-only { @include sr-only(); } +.sr-only-focusable { @include sr-only-focusable(); } diff --git a/library/font_awesome/src/assets/font-awesome/scss/_stacked.scss b/library/font_awesome/src/assets/font-awesome/scss/_stacked.scss new file mode 100644 index 000000000..01c9443be --- /dev/null +++ b/library/font_awesome/src/assets/font-awesome/scss/_stacked.scss @@ -0,0 +1,23 @@ +--- +--- + +// Stacked Icons +// ------------------------- + +.#{$fa-css-prefix}-stack { + position: relative; + display: inline-block; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: middle; +} +.#{$fa-css-prefix}-stack-1x, .#{$fa-css-prefix}-stack-2x { + position: absolute; + left: 0; + width: 100%; + text-align: center; +} +.#{$fa-css-prefix}-stack-1x { line-height: inherit; } +.#{$fa-css-prefix}-stack-2x { font-size: 2em; } +.#{$fa-css-prefix}-inverse { color: $fa-inverse; } diff --git a/library/font_awesome/src/assets/font-awesome/scss/_variables.scss b/library/font_awesome/src/assets/font-awesome/scss/_variables.scss index 30bab220a..9dfa9018d 100644 --- a/library/font_awesome/src/assets/font-awesome/scss/_variables.scss +++ b/library/font_awesome/src/assets/font-awesome/scss/_variables.scss @@ -3,14 +3,15 @@ // Variables // -------------------------- -$FontAwesomePath: "../font" !default; -$FontAwesomeVersion: "{{ site.fontawesome.version }}" !default; -$borderColor: #eeeeee !default; -$iconMuted: #eeeeee !default; -$iconLight: white !default; -$iconDark: #333333 !default; -$icons-li-width: (30em/14); +$fa-font-path: "../fonts" !default; +$fa-font-size-base: 14px !default; +$fa-line-height-base: 1 !default; +//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/{{site.fontawesome.version}}/fonts" !default; // for referencing Bootstrap CDN font files directly +$fa-css-prefix: {{ site.fontawesome.css_prefix }} !default; +$fa-version: "{{ site.fontawesome.version }}" !default; +$fa-border-color: #eee !default; +$fa-inverse: #fff !default; +$fa-li-width: (30em / 14) !default; -{% for icon in icons %} -${{ icon.id }}: "\{{ icon.unicode }}"; +{% assign sorted_icons = icons | expand_aliases | sort_by:'class' %}{% for icon in sorted_icons %}$fa-var-{{ icon.class }}: "\{{ icon.unicode }}"; {% endfor %} diff --git a/library/font_awesome/src/assets/font-awesome/scss/font-awesome-ie7.scss b/library/font_awesome/src/assets/font-awesome/scss/font-awesome-ie7.scss deleted file mode 100644 index 3ba99da60..000000000 --- a/library/font_awesome/src/assets/font-awesome/scss/font-awesome-ie7.scss +++ /dev/null @@ -1,67 +0,0 @@ ---- ---- -{% include license-code.less %} - -.icon-large { - font-size: (4em/3); - margin-top: -4px; - padding-top: 3px; - margin-bottom: -4px; - padding-bottom: 3px; - vertical-align: middle; -} - -.nav { - [class^="icon-"], - [class*=" icon-"] { - vertical-align: inherit; - margin-top: -4px; - padding-top: 3px; - margin-bottom: -4px; - padding-bottom: 3px; - &.icon-large { - vertical-align: -25%; - } - } -} - -.nav-pills, .nav-tabs { - [class^="icon-"], - [class*=" icon-"] { - &.icon-large { - line-height: .75em; - margin-top: -7px; - padding-top: 5px; - margin-bottom: -5px; - padding-bottom: 4px; - } - } -} - -.btn { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { vertical-align: inherit; } - &.icon-large { - margin-top: -.5em; - } - } -} - -a [class^="icon-"], -a [class*=" icon-"] { - cursor: pointer; -} - -@mixin ie7icon($inner) { *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '#{$inner}'); } - -{% for icon in icons %} -.icon-{{ icon.id }} { - @include ie7icon('&#x{{ icon.unicode }};'); -} -{% for alias in icon.aliases %} -.icon-{{ alias }} { - @include ie7icon('&#x{{ icon.unicode }};'); -} -{% endfor %} -{% endfor %} diff --git a/library/font_awesome/src/assets/font-awesome/scss/font-awesome.scss b/library/font_awesome/src/assets/font-awesome/scss/font-awesome.scss index c7507de06..f7b78ecd1 100644 --- a/library/font_awesome/src/assets/font-awesome/scss/font-awesome.scss +++ b/library/font_awesome/src/assets/font-awesome/scss/font-awesome.scss @@ -1,11 +1,17 @@ --- --- -{% include license-code.less %} +{% include code/license.css %} @import "variables"; @import "mixins"; @import "path"; @import "core"; -@import "bootstrap"; -@import "extras"; +@import "larger"; +@import "fixed-width"; +@import "list"; +@import "bordered-pulled"; +@import "animated"; +@import "rotated-flipped"; +@import "stacked"; @import "icons"; +@import "screen-reader"; -- cgit v1.2.3