diff --git a/Gruntfile.js b/Gruntfile.js
index 2b9bb3fa1..724c7f9b9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -30,7 +30,23 @@ module.exports = function (grunt) {
'UI/JsLibraries/lunr.js' : 'http://raw.github.com/olivernn/lunr.js/master/lunr.js',
'UI/Content/messenger.css' : 'http://raw.github.com/HubSpot/messenger/master/build/css/messenger.css',
'UI/Content/bootstrap.toggle-switch.css' : 'http://raw.github.com/ghinda/css-toggle-switch/gh-pages/toggle-switch.css',
- 'UI/Content/messenger.future.css' : 'http://raw.github.com/HubSpot/messenger/master/build/css/messenger-theme-future.css'
+ 'UI/Content/messenger.future.css' : 'http://raw.github.com/HubSpot/messenger/master/build/css/messenger-theme-future.css',
+
+ 'UI/Content/FontAwesome/fontawesome.otf' : 'http://github.com/FortAwesome/Font-Awesome/blob/master/build/assets/font-awesome/font/FontAwesome.otf?raw=true',
+ 'UI/Content/FontAwesome/fontawesome-webfont.eot' : 'https://github.com/FortAwesome/Font-Awesome/blob/master/build/assets/font-awesome/font/fontawesome-webfont.eot?raw=true',
+ 'UI/Content/FontAwesome/fontawesome-webfont.svg' : 'https://github.com/FortAwesome/Font-Awesome/blob/master/build/assets/font-awesome/font/fontawesome-webfont.svg?raw=true',
+ 'UI/Content/FontAwesome/fontawesome-webfont.ttf' : 'https://github.com/FortAwesome/Font-Awesome/blob/master/build/assets/font-awesome/font/fontawesome-webfont.ttf?raw=true',
+ 'UI/Content/FontAwesome/fontawesome-webfont.woff': 'https://github.com/FortAwesome/Font-Awesome/blob/master/build/assets/font-awesome/font/fontawesome-webfont.woff?raw=true',
+
+ 'UI/Content/FontAwesome/bootstrap.less' : 'https://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/bootstrap.less',
+ 'UI/Content/FontAwesome/core.less' : 'https://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/core.less',
+ 'UI/Content/FontAwesome/extras.less' : 'https://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/extras.less',
+ 'UI/Content/FontAwesome/font-awesome-ie7.less' : 'https://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/font-awesome-ie7.less',
+ 'UI/Content/FontAwesome/font-awesome.less' : 'https://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/font-awesome.less',
+ 'UI/Content/FontAwesome/icons.less' : 'https://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/icons.less',
+ 'UI/Content/FontAwesome/mixins.less' : 'https://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/mixins.less',
+ 'UI/Content/FontAwesome/path.less' : 'https://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/path.less',
+ 'UI/Content/FontAwesome/variables.less' : 'https://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/variables.less'
},
clean: {
@@ -46,7 +62,7 @@ module.exports = function (grunt) {
files: [
{
expand: true,
- src : ['UI/**/*.less', '!**/Bootstrap/**'],
+ src : ['UI/**/*.less', '!**/Bootstrap/**','!**/FontAwesome/**'],
dest : '_output/',
ext : '.css'
}
@@ -89,18 +105,18 @@ module.exports = function (grunt) {
dest: '_output/'
},
fonts : {
- src : 'UI/**/Fonts/*.*',
+ src : 'UI/**/FontAwesome/*.*',
dest: '_output/'
}
},
watch: {
bootstrap : {
- files: '<%= less.bootstrap.src %>',
+ files: ['<%= less.bootstrap.src %>', 'UI/**/FontAwesome/**'],
tasks: ['less:bootstrap']
},
generalLess: {
- files: ['UI/**/*.less', '!**/Bootstrap/**'],
+ files: ['UI/**/*.less', '!**/Bootstrap/**', '!**/FontAwesome/**'],
tasks: ['less:general']
},
handlebars : {
diff --git a/UI/Content/Bootstrap/bootstrap.less b/UI/Content/Bootstrap/bootstrap.less
index ca89418d8..6eddc678a 100644
--- a/UI/Content/Bootstrap/bootstrap.less
+++ b/UI/Content/Bootstrap/bootstrap.less
@@ -27,7 +27,7 @@
@import "tables.less";
// Components: common
-@import "font-awesome.less";
+@import "../fontawesome/font-awesome.less";
@import "dropdowns.less";
@import "wells.less";
@import "component-animations.less";
diff --git a/UI/Content/FontAwesome/bootstrap.less b/UI/Content/FontAwesome/bootstrap.less
new file mode 100644
index 000000000..444e29804
--- /dev/null
+++ b/UI/Content/FontAwesome/bootstrap.less
@@ -0,0 +1,78 @@
+/* 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; }
+ }
+}
diff --git a/UI/Content/FontAwesome/core.less b/UI/Content/FontAwesome/core.less
new file mode 100644
index 000000000..815d329e6
--- /dev/null
+++ b/UI/Content/FontAwesome/core.less
@@ -0,0 +1,132 @@
+/* FONT AWESOME CORE
+ * -------------------------- */
+
+[class^="icon-"],
+[class*=" icon-"] {
+ font-family: FontAwesome;
+ font-weight: normal;
+ font-style: normal;
+ text-decoration: inherit;
+ -webkit-font-smoothing: antialiased;
+ *margin-right: .3em; // fixes ie7 issues
+}
+
+[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-"] {
+ &, &:before { display: inline; }
+ }
+}
+
+/* increased font size for icon-large */
+[class^="icon-"],
+[class*=" icon-"] {
+ &.icon-fixed-width {
+ display: inline-block;
+ width: 18/14em;
+ text-align: center;
+ &.icon-large {
+ width: 22/14em;
+ }
+ }
+}
+
+ul.icons-ul {
+ list-style-type: none;
+ text-indent: -10/14em;
+ margin-left: 30/14em;
+
+ > li {
+ .icon-li {
+ width: 10/14em;
+ display: inline-block;
+ text-align: center;
+ }
+ }
+}
+
+// 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
+// -------------------------
+
+.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;
+ }
+}
diff --git a/UI/Content/FontAwesome/extras.less b/UI/Content/FontAwesome/extras.less
new file mode 100644
index 000000000..3d16eb6f3
--- /dev/null
+++ b/UI/Content/FontAwesome/extras.less
@@ -0,0 +1,79 @@
+/* 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;
+}
+
+@-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);
+}
\ No newline at end of file
diff --git a/UI/Content/Bootstrap/font-awesome-ie7.less b/UI/Content/FontAwesome/font-awesome-ie7.less
similarity index 80%
rename from UI/Content/Bootstrap/font-awesome-ie7.less
rename to UI/Content/FontAwesome/font-awesome-ie7.less
index 2bb1b5c15..9e5ac0ee8 100644
--- a/UI/Content/Bootstrap/font-awesome-ie7.less
+++ b/UI/Content/FontAwesome/font-awesome-ie7.less
@@ -1,22 +1,24 @@
/*!
- * Font Awesome 3.0.2
- * the iconic font designed for use with Twitter Bootstrap
+ * Font Awesome 3.1.0
+ * the iconic font designed for Bootstrap
* -------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation
- * can be found at: http://fortawesome.github.com/Font-Awesome/
+ * can be found at: http://fontawesome.io
*
* License
* -------------------------------------------------------
- * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
+ * - The Font Awesome font is licensed under the SIL Open Font License v1.1 -
+ * http://scripts.sil.org/OFL
* - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
* http://opensource.org/licenses/mit-license.html
- * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
+ * - Font Awesome documentation licensed under CC BY 3.0 License -
+ * http://creativecommons.org/licenses/by/3.0/
* - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
+ * "Font Awesome by Dave Gandy - http://fontawesome.io"
* Contact
* -------------------------------------------------------
- * Email: dave@davegandy.com
+ * Email: dave@fontawesome.io
* Twitter: http://twitter.com/fortaweso_me
* Work: Lead Product Designer @ http://kyruus.com
*/
@@ -57,6 +59,18 @@
}
}
+ul.icons-ul {
+ text-indent: -1em;
+ margin-left: 30/14em;
+
+ > li {
+ .icon-li {
+ width: 1em;
+ margin-right: 0;
+ }
+ }
+}
+
.btn {
[class^="icon-"],
[class*=" icon-"] {
@@ -72,15 +86,7 @@ a [class*=" icon-"] {
cursor: pointer;
}
-ul.icons {
- text-indent: -1.5em;
- margin-left: 3em;
-}
-
-
-.ie7icon(@inner) {
- *zoom: ~"expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '@{inner}')";
-}
+.ie7icon(@inner) { *zoom: ~"expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '@{inner}')"; }
.icon-glass { .ie7icon(''); }
.icon-music { .ie7icon(''); }
@@ -345,6 +351,63 @@ ul.icons {
.icon-spinner { .ie7icon(''); }
.icon-circle { .ie7icon(''); }
.icon-reply { .ie7icon(''); }
-.icon-github-alt { .ie7icon(''); }
.icon-folder-close-alt { .ie7icon(''); }
.icon-folder-open-alt { .ie7icon(''); }
+.icon-expand-alt { .ie7icon(''); }
+.icon-collapse-alt { .ie7icon(''); }
+.icon-smile { .ie7icon(''); }
+.icon-frown { .ie7icon(''); }
+.icon-meh { .ie7icon(''); }
+.icon-gamepad { .ie7icon(''); }
+.icon-keyboard { .ie7icon(''); }
+.icon-flag-alt { .ie7icon(''); }
+.icon-flag-checkered { .ie7icon(''); }
+
+.icon-terminal { .ie7icon(''); }
+.icon-code { .ie7icon(''); }
+.icon-reply-all { .ie7icon(''); }
+.icon-mail-reply-all { .ie7icon(''); }
+.icon-star-half-full,
+.icon-star-half-empty { .ie7icon(''); }
+.icon-location-arrow { .ie7icon(''); }
+.icon-crop { .ie7icon(''); }
+.icon-code-fork { .ie7icon(''); }
+.icon-unlink { .ie7icon(''); }
+.icon-question { .ie7icon(''); }
+.icon-info { .ie7icon(''); }
+.icon-exclamation { .ie7icon(''); }
+.icon-superscript { .ie7icon(''); }
+.icon-subscript { .ie7icon(''); }
+.icon-eraser { .ie7icon(''); }
+.icon-puzzle-piece { .ie7icon(''); }
+
+.icon-microphone { .ie7icon(''); }
+.icon-microphone-off { .ie7icon(''); }
+.icon-shield { .ie7icon(''); }
+.icon-calendar-empty { .ie7icon(''); }
+.icon-fire-extinguisher { .ie7icon(''); }
+.icon-rocket { .ie7icon(''); }
+.icon-maxcdn { .ie7icon(''); }
+.icon-chevron-sign-left { .ie7icon(''); }
+.icon-chevron-sign-right { .ie7icon(''); }
+.icon-chevron-sign-up { .ie7icon(''); }
+.icon-chevron-sign-down { .ie7icon(''); }
+.icon-html5 { .ie7icon(''); }
+.icon-css3 { .ie7icon(''); }
+.icon-anchor { .ie7icon(''); }
+.icon-unlock-alt { .ie7icon(''); }
+
+.icon-bullseye { .ie7icon(''); }
+.icon-ellipsis-horizontal { .ie7icon(''); }
+.icon-ellipsis-vertical { .ie7icon(''); }
+.icon-rss-sign { .ie7icon(''); }
+.icon-play-sign { .ie7icon(''); }
+.icon-ticket { .ie7icon(''); }
+.icon-minus-sign-alt { .ie7icon(''); }
+.icon-check-minus { .ie7icon(''); }
+.icon-level-up { .ie7icon(''); }
+.icon-level-down { .ie7icon(''); }
+.icon-check-sign { .ie7icon(''); }
+.icon-edit-sign { .ie7icon(''); }
+.icon-external-link-sign { .ie7icon(''); }
+.icon-share-sign { .ie7icon(''); }
diff --git a/UI/Content/FontAwesome/font-awesome.less b/UI/Content/FontAwesome/font-awesome.less
new file mode 100644
index 000000000..0a9518e51
--- /dev/null
+++ b/UI/Content/FontAwesome/font-awesome.less
@@ -0,0 +1,32 @@
+/*!
+ * Font Awesome 3.1.0
+ * the iconic font designed for Bootstrap
+ * -------------------------------------------------------
+ * The full suite of pictographic icons, examples, and documentation
+ * can be found at: http://fontawesome.io
+ *
+ * License
+ * -------------------------------------------------------
+ * - The Font Awesome font is licensed under the SIL Open Font License v1.1 -
+ * http://scripts.sil.org/OFL
+ * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
+ * http://opensource.org/licenses/mit-license.html
+ * - Font Awesome documentation licensed under CC BY 3.0 License -
+ * http://creativecommons.org/licenses/by/3.0/
+ * - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
+ * "Font Awesome by Dave Gandy - http://fontawesome.io"
+
+ * Contact
+ * -------------------------------------------------------
+ * Email: dave@fontawesome.io
+ * Twitter: http://twitter.com/fortaweso_me
+ * Work: Lead Product Designer @ http://kyruus.com
+ */
+
+@import "variables.less";
+@import "mixins.less";
+@import "path.less";
+@import "core.less";
+@import "bootstrap.less";
+@import "extras.less";
+@import "icons.less";
diff --git a/UI/Content/FontAwesome/fontawesome-webfont.eot b/UI/Content/FontAwesome/fontawesome-webfont.eot
new file mode 100644
index 000000000..c080283bd
Binary files /dev/null and b/UI/Content/FontAwesome/fontawesome-webfont.eot differ
diff --git a/UI/Content/fonts/fontawesome-webfont.svg b/UI/Content/FontAwesome/fontawesome-webfont.svg
similarity index 75%
rename from UI/Content/fonts/fontawesome-webfont.svg
rename to UI/Content/FontAwesome/fontawesome-webfont.svg
index ba0afe5ef..10a1e1bbf 100644
--- a/UI/Content/fonts/fontawesome-webfont.svg
+++ b/UI/Content/FontAwesome/fontawesome-webfont.svg
@@ -53,14 +53,14 @@
-
+
-
-
-
+
+
+
-
-
+
+
@@ -70,7 +70,7 @@
-
+
@@ -89,11 +89,11 @@
-
+
-
+
@@ -115,12 +115,12 @@
-
-
+
+
-
-
-
+
+
+
@@ -132,13 +132,13 @@
-
+
-
+
@@ -152,8 +152,8 @@
-
-
+
+
@@ -163,21 +163,21 @@
-
+
-
-
+
+
-
+
-
-
-
+
+
+
@@ -186,9 +186,9 @@
-
+
-
+
@@ -197,7 +197,7 @@
-
+
@@ -230,8 +230,8 @@
-
-
+
+
@@ -255,8 +255,8 @@
-
-
+
+
@@ -271,14 +271,69 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UI/Content/fonts/fontawesome-webfont.ttf b/UI/Content/FontAwesome/fontawesome-webfont.ttf
similarity index 60%
rename from UI/Content/fonts/fontawesome-webfont.ttf
rename to UI/Content/FontAwesome/fontawesome-webfont.ttf
index d46172476..908f69ec9 100644
Binary files a/UI/Content/fonts/fontawesome-webfont.ttf and b/UI/Content/FontAwesome/fontawesome-webfont.ttf differ
diff --git a/UI/Content/FontAwesome/fontawesome-webfont.woff b/UI/Content/FontAwesome/fontawesome-webfont.woff
new file mode 100644
index 000000000..a33af950a
Binary files /dev/null and b/UI/Content/FontAwesome/fontawesome-webfont.woff differ
diff --git a/UI/Content/FontAwesome/fontawesome.otf b/UI/Content/FontAwesome/fontawesome.otf
new file mode 100644
index 000000000..32dd8b1cd
Binary files /dev/null and b/UI/Content/FontAwesome/fontawesome.otf differ
diff --git a/UI/Content/Bootstrap/font-awesome.less b/UI/Content/FontAwesome/icons.less
similarity index 66%
rename from UI/Content/Bootstrap/font-awesome.less
rename to UI/Content/FontAwesome/icons.less
index 5830acd76..027933ad2 100644
--- a/UI/Content/Bootstrap/font-awesome.less
+++ b/UI/Content/FontAwesome/icons.less
@@ -1,275 +1,5 @@
-/*!
- * Font Awesome 3.0.2
- * the iconic font designed for use with Twitter Bootstrap
- * -------------------------------------------------------
- * The full suite of pictographic icons, examples, and documentation
- * can be found at: http://fortawesome.github.com/Font-Awesome/
- *
- * License
- * -------------------------------------------------------
- * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
- * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
- * http://opensource.org/licenses/mit-license.html
- * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
- * - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
-
- * Contact
- * -------------------------------------------------------
- * Email: dave@davegandy.com
- * Twitter: http://twitter.com/fortaweso_me
- * Work: Lead Product Designer @ http://kyruus.com
- */
-
-@FontAwesomePath: "fonts";
-@borderColor: #eee;
-@iconMuted: #eee;
-.border-radius(@radius) { -webkit-border-radius: @radius; -moz-border-radius: @radius; border-radius: @radius; }
-
-
-
-@font-face {
- font-family: 'FontAwesome';
- src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=3.0.1');
- src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'),
- url('@{FontAwesomePath}/fontawesome-webfont.woff?v=3.0.1') format('woff'),
- url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=3.0.1') format('truetype');
-// url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=3.0.1') format('svg');
-
-// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype');
-
- font-weight: normal;
- font-style: normal;
-}
-
-/* Font Awesome styles
- ------------------------------------------------------- */
-[class^="icon-"],
-[class*=" icon-"] {
- font-family: FontAwesome;
- font-weight: normal;
- font-style: normal;
- text-decoration: inherit;
- -webkit-font-smoothing: antialiased;
-
-/* sprites.less reset */
- 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;
-}
-
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
- text-decoration: inherit;
- display: inline-block;
- speak: none;
-}
-
-/* makes sure icons active on rollover in links */
-a {
- [class^="icon-"],
- [class*=" icon-"] {
- display: inline-block;
- }
-}
-
-/* makes the font 33% larger relative to the icon container */
-.icon-large:before {
- vertical-align: -10%;
- font-size: 4/3em;
-}
-
-.btn, .nav {
- [class^="icon-"],
- [class*=" icon-"] {
- display: inline;
- /* keeps button heights with and without icons the same */
- &.icon-large { line-height: .9em; }
- &.icon-spin { display: inline-block; }
- }
-}
-
-.nav-tabs, .nav-pills {
- [class^="icon-"],
- [class*=" icon-"] {
- /* keeps button heights with and without icons the same */
- &, &.icon-large { line-height: .9em; }
- }
-}
-
-li, .nav li {
- [class^="icon-"],
- [class*=" icon-"] {
- display: inline-block;
- width: 1.25em;
- text-align: center;
- &.icon-large {
- /* increased font size for icon-large */
- width: 1.25*1.25em;
- }
- }
-}
-
-ul.icons {
- list-style-type: none;
- text-indent: -.75em;
-
- li {
- [class^="icon-"],
- [class*=" icon-"] {
- width: .75em;
- }
- }
-}
-
-.icon-muted {
- color: @iconMuted;
-}
-
-// Icon Borders
-// -------------------------
-
-.icon-border {
- border: solid 1px @borderColor;
- padding: .2em .25em .15em;
- .border-radius(3px);
-}
-
-// Icon Sizes
-// -------------------------
-
-.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);
- }
-}
-
-// Floats
-// -------------------------
-
-// Quick floats
-.pull-right { float: right; }
-.pull-left { float: left; }
-
-[class^="icon-"],
-[class*=" icon-"] {
- &.pull-left {
- margin-right: .3em;
- }
- &.pull-right {
- margin-left: .3em;
- }
-}
-
-.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; }
- }
-}
-
-
-.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;
-}
-
-@-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); }
-}
-
-@-moz-document url-prefix() {
- .icon-spin { height: .9em; }
- .btn .icon-spin { height: auto; }
- .icon-spin.icon-large { height: 1.25em; }
- .btn .icon-spin.icon-large { height: .75em; }
-}
-
-/* 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"; }
.icon-music:before { content: "\f001"; }
.icon-search:before { content: "\f002"; }
@@ -300,9 +30,10 @@ ul.icons {
.icon-upload:before { content: "\f01b"; }
.icon-inbox:before { content: "\f01c"; }
.icon-play-circle:before { content: "\f01d"; }
-.icon-repeat:before { content: "\f01e"; }
+.icon-repeat:before,
+.icon-rotate-right:before { content: "\f01e"; }
-/* \f020 doesn't work in Safari. all shifted one down */
+/* F020 doesn't work in Safari. all shifted one down */
.icon-refresh:before { content: "\f021"; }
.icon-list-alt:before { content: "\f022"; }
.icon-lock:before { content: "\f023"; }
@@ -371,7 +102,8 @@ ul.icons {
.icon-arrow-right:before { content: "\f061"; }
.icon-arrow-up:before { content: "\f062"; }
.icon-arrow-down:before { content: "\f063"; }
-.icon-share-alt:before { content: "\f064"; }
+.icon-share-alt:before,
+.icon-mail-forward:before { content: "\f064"; }
.icon-resize-full:before { content: "\f065"; }
.icon-resize-small:before { content: "\f066"; }
.icon-plus:before { content: "\f067"; }
@@ -485,7 +217,8 @@ ul.icons {
.icon-envelope-alt:before { content: "\f0e0"; }
.icon-linkedin:before { content: "\f0e1"; }
-.icon-undo:before { content: "\f0e2"; }
+.icon-undo:before,
+.icon-rotate-left:before { content: "\f0e2"; }
.icon-legal:before { content: "\f0e3"; }
.icon-dashboard:before { content: "\f0e4"; }
.icon-comment-alt:before { content: "\f0e5"; }
@@ -533,7 +266,65 @@ ul.icons {
.icon-spinner:before { content: "\f110"; }
.icon-circle:before { content: "\f111"; }
-.icon-reply:before { content: "\f112"; }
-.icon-github-alt:before { content: "\f113"; }
+.icon-reply:before,
+.icon-mail-reply:before { content: "\f112"; }
.icon-folder-close-alt:before { content: "\f114"; }
.icon-folder-open-alt:before { content: "\f115"; }
+.icon-expand-alt:before { content: "\f116"; }
+.icon-collapse-alt:before { content: "\f117"; }
+.icon-smile:before { content: "\f118"; }
+.icon-frown:before { content: "\f119"; }
+.icon-meh:before { content: "\f11a"; }
+.icon-gamepad:before { content: "\f11b"; }
+.icon-keyboard:before { content: "\f11c"; }
+.icon-flag-alt:before { content: "\f11d"; }
+.icon-flag-checkered:before { content: "\f11e"; }
+
+.icon-terminal:before { content: "\f120"; }
+.icon-code:before { content: "\f121"; }
+.icon-reply-all:before, { content: "\f122"; }
+.icon-mail-reply-all:before { content: "\f122"; }
+.icon-star-half-full:before,
+.icon-star-half-empty:before { content: "\f123"; }
+.icon-location-arrow:before { content: "\f124"; }
+.icon-crop:before { content: "\f125"; }
+.icon-code-fork:before { content: "\f126"; }
+.icon-unlink:before { content: "\f127"; }
+.icon-question:before { content: "\f128"; }
+.icon-info:before { content: "\f129"; }
+.icon-exclamation:before { content: "\f12a"; }
+.icon-superscript:before { content: "\f12b"; }
+.icon-subscript:before { content: "\f12c"; }
+.icon-eraser:before { content: "\f12d"; }
+.icon-puzzle-piece:before { content: "\f12e"; }
+
+.icon-microphone:before { content: "\f130"; }
+.icon-microphone-off:before { content: "\f131"; }
+.icon-shield:before { content: "\f132"; }
+.icon-calendar-empty:before { content: "\f133"; }
+.icon-fire-extinguisher:before { content: "\f134"; }
+.icon-rocket:before { content: "\f135"; }
+.icon-maxcdn:before { content: "\f136"; }
+.icon-chevron-sign-left:before { content: "\f137"; }
+.icon-chevron-sign-right:before { content: "\f138"; }
+.icon-chevron-sign-up:before { content: "\f139"; }
+.icon-chevron-sign-down:before { content: "\f13a"; }
+.icon-html5:before { content: "\f13b"; }
+.icon-css3:before { content: "\f13c"; }
+.icon-anchor:before { content: "\f13d"; }
+.icon-unlock-alt:before { content: "\f13e"; }
+
+.icon-bullseye:before { content: "\f140"; }
+.icon-ellipsis-horizontal:before { content: "\f141"; }
+.icon-ellipsis-vertical:before { content: "\f142"; }
+.icon-rss-sign:before { content: "\f143"; }
+.icon-play-sign:before { content: "\f144"; }
+.icon-ticket:before { content: "\f145"; }
+.icon-minus-sign-alt:before { content: "\f146"; }
+.icon-check-minus:before { content: "\f147"; }
+.icon-level-up:before { content: "\f148"; }
+.icon-level-down:before { content: "\f149"; }
+.icon-check-sign:before { content: "\f14a"; }
+.icon-edit-sign:before { content: "\f14b"; }
+.icon-external-link-sign:before { content: "\f14c"; }
+.icon-share-sign:before { content: "\f14d"; }
diff --git a/UI/Content/FontAwesome/mixins.less b/UI/Content/FontAwesome/mixins.less
new file mode 100644
index 000000000..4f8858eda
--- /dev/null
+++ b/UI/Content/FontAwesome/mixins.less
@@ -0,0 +1,34 @@
+// Mixins
+// --------------------------
+
+.border-radius(@radius) {
+ -webkit-border-radius: @radius;
+ -moz-border-radius: @radius;
+ border-radius: @radius;
+}
+
+.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;
+ }
+ }
+}
diff --git a/UI/Content/FontAwesome/path.less b/UI/Content/FontAwesome/path.less
new file mode 100644
index 000000000..8162d7900
--- /dev/null
+++ b/UI/Content/FontAwesome/path.less
@@ -0,0 +1,15 @@
+/* FONT PATH
+ * -------------------------- */
+
+@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
+
+ font-weight: normal;
+ font-style: normal;
+}
diff --git a/UI/Content/FontAwesome/variables.less b/UI/Content/FontAwesome/variables.less
new file mode 100644
index 000000000..1f83dcc2a
--- /dev/null
+++ b/UI/Content/FontAwesome/variables.less
@@ -0,0 +1,9 @@
+// Variables
+// --------------------------
+
+@FontAwesomePath: "FontAwesome";
+@FontAwesomeVersion: "3.1.0";
+@borderColor: #eee;
+@iconMuted: #eee;
+@iconLight: #fff;
+@iconDark: #333;
\ No newline at end of file
diff --git a/UI/Content/fonts/FontAwesome.otf b/UI/Content/fonts/FontAwesome.otf
deleted file mode 100644
index 64049bf2e..000000000
Binary files a/UI/Content/fonts/FontAwesome.otf and /dev/null differ
diff --git a/UI/Content/fonts/fontawesome-webfont.eot b/UI/Content/fonts/fontawesome-webfont.eot
deleted file mode 100644
index 7d81019e4..000000000
Binary files a/UI/Content/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/UI/Content/fonts/fontawesome-webfont.woff b/UI/Content/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 3c89ae09b..000000000
Binary files a/UI/Content/fonts/fontawesome-webfont.woff and /dev/null differ