Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Fixing Font Paths for Proxima Nova, Glyphicons
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmbacon committed Sep 16, 2015
1 parent edfc488 commit 53e4e70
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 30 deletions.
12 changes: 6 additions & 6 deletions css/hale2015-blue.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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; }
/* - - - - - - - - - - - - - - - - - - -
Expand Down
12 changes: 6 additions & 6 deletions css/hale2015-green.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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; }
/* - - - - - - - - - - - - - - - - - - -
Expand Down
12 changes: 6 additions & 6 deletions css/hale2015-orange.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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; }
/* - - - - - - - - - - - - - - - - - - -
Expand Down
12 changes: 6 additions & 6 deletions css/hale2015-purple.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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; }
/* - - - - - - - - - - - - - - - - - - -
Expand Down
12 changes: 6 additions & 6 deletions css/hale2015-red.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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; }
/* - - - - - - - - - - - - - - - - - - -
Expand Down
4 changes: 4 additions & 0 deletions scss/_hale2015-common.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 53e4e70

Please sign in to comment.