From 53e4e7072df1f6fc387338f491d26d95be7c5f08 Mon Sep 17 00:00:00 2001 From: andrewmbacon Date: Wed, 16 Sep 2015 13:58:20 -0400 Subject: [PATCH] Fixing Font Paths for Proxima Nova, Glyphicons --- css/hale2015-blue.css | 12 ++++++------ css/hale2015-green.css | 12 ++++++------ css/hale2015-orange.css | 12 ++++++------ css/hale2015-purple.css | 12 ++++++------ css/hale2015-red.css | 12 ++++++------ scss/_hale2015-common.scss | 4 ++++ 6 files changed, 34 insertions(+), 30 deletions(-) diff --git a/css/hale2015-blue.css b/css/hale2015-blue.css index 5f5f15b..d4a40c5 100644 --- a/css/hale2015-blue.css +++ b/css/hale2015-blue.css @@ -260,8 +260,8 @@ th { border: 1px solid #ddd !important; } } @font-face { font-family: 'Glyphicons Halflings'; - src: url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot"); - src: url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } + src: url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot"); + src: url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } .glyphicon { position: relative; top: 1px; @@ -5668,14 +5668,14 @@ button.close { - - - - - - - - - - - - - - - - - - - */ @font-face { font-family: 'Proxima Nova'; - src: url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot"); - src: url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular") format("svg"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff") format("woff"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf") format("truetype"); + src: url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot"); + src: url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix") format("embedded-opentype"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular") format("svg"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff") format("woff"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf") format("truetype"); font-weight: normal; font-style: normal; } @font-face { font-family: 'Proxima Nova'; - src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); - src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype"); + src: url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); + src: url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype"); font-weight: 500; font-style: normal; } /* - - - - - - - - - - - - - - - - - - - diff --git a/css/hale2015-green.css b/css/hale2015-green.css index c6c5b70..54c9eb2 100644 --- a/css/hale2015-green.css +++ b/css/hale2015-green.css @@ -260,8 +260,8 @@ th { border: 1px solid #ddd !important; } } @font-face { font-family: 'Glyphicons Halflings'; - src: url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot"); - src: url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } + src: url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot"); + src: url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } .glyphicon { position: relative; top: 1px; @@ -5668,14 +5668,14 @@ button.close { - - - - - - - - - - - - - - - - - - - */ @font-face { font-family: 'Proxima Nova'; - src: url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot"); - src: url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular") format("svg"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff") format("woff"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf") format("truetype"); + src: url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot"); + src: url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix") format("embedded-opentype"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular") format("svg"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff") format("woff"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf") format("truetype"); font-weight: normal; font-style: normal; } @font-face { font-family: 'Proxima Nova'; - src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); - src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype"); + src: url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); + src: url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype"); font-weight: 500; font-style: normal; } /* - - - - - - - - - - - - - - - - - - - diff --git a/css/hale2015-orange.css b/css/hale2015-orange.css index 5097f23..924c70c 100644 --- a/css/hale2015-orange.css +++ b/css/hale2015-orange.css @@ -260,8 +260,8 @@ th { border: 1px solid #ddd !important; } } @font-face { font-family: 'Glyphicons Halflings'; - src: url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot"); - src: url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } + src: url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot"); + src: url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } .glyphicon { position: relative; top: 1px; @@ -5668,14 +5668,14 @@ button.close { - - - - - - - - - - - - - - - - - - - */ @font-face { font-family: 'Proxima Nova'; - src: url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot"); - src: url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular") format("svg"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff") format("woff"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf") format("truetype"); + src: url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot"); + src: url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix") format("embedded-opentype"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular") format("svg"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff") format("woff"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf") format("truetype"); font-weight: normal; font-style: normal; } @font-face { font-family: 'Proxima Nova'; - src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); - src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype"); + src: url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); + src: url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype"); font-weight: 500; font-style: normal; } /* - - - - - - - - - - - - - - - - - - - diff --git a/css/hale2015-purple.css b/css/hale2015-purple.css index 8998d02..408825b 100644 --- a/css/hale2015-purple.css +++ b/css/hale2015-purple.css @@ -260,8 +260,8 @@ th { border: 1px solid #ddd !important; } } @font-face { font-family: 'Glyphicons Halflings'; - src: url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot"); - src: url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } + src: url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot"); + src: url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } .glyphicon { position: relative; top: 1px; @@ -5668,14 +5668,14 @@ button.close { - - - - - - - - - - - - - - - - - - - */ @font-face { font-family: 'Proxima Nova'; - src: url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot"); - src: url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular") format("svg"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff") format("woff"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf") format("truetype"); + src: url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot"); + src: url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix") format("embedded-opentype"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular") format("svg"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff") format("woff"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf") format("truetype"); font-weight: normal; font-style: normal; } @font-face { font-family: 'Proxima Nova'; - src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); - src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype"); + src: url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); + src: url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype"); font-weight: 500; font-style: normal; } /* - - - - - - - - - - - - - - - - - - - diff --git a/css/hale2015-red.css b/css/hale2015-red.css index 1f52707..f4e64eb 100644 --- a/css/hale2015-red.css +++ b/css/hale2015-red.css @@ -260,8 +260,8 @@ th { border: 1px solid #ddd !important; } } @font-face { font-family: 'Glyphicons Halflings'; - src: url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot"); - src: url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } + src: url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot"); + src: url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../../global/bootstrap-3.3.4/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } .glyphicon { position: relative; top: 1px; @@ -5668,14 +5668,14 @@ button.close { - - - - - - - - - - - - - - - - - - - */ @font-face { font-family: 'Proxima Nova'; - src: url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot"); - src: url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular") format("svg"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff") format("woff"), url("../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf") format("truetype"); + src: url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot"); + src: url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix") format("embedded-opentype"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular") format("svg"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff") format("woff"), url("../../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf") format("truetype"); font-weight: normal; font-style: normal; } @font-face { font-family: 'Proxima Nova'; - src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); - src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype"); + src: url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); + src: url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype"); font-weight: 500; font-style: normal; } /* - - - - - - - - - - - - - - - - - - - diff --git a/scss/_hale2015-common.scss b/scss/_hale2015-common.scss index d84e04f..b156a1f 100644 --- a/scss/_hale2015-common.scss +++ b/scss/_hale2015-common.scss @@ -3,6 +3,10 @@ //== BOOTSTRAP vars + +$uc-font-path: "../../../global/fonts"; +$icon-font-path: "../../../global/bootstrap-3.3.4/fonts/bootstrap/" !default; + $link-color: $nav-color-base; $brand-primary: #006dcc; $brand-danger: #da4f49;