diff --git a/app/styles/achievements.sass b/app/styles/achievements.sass index 396472b6a..f39b6c968 100644 --- a/app/styles/achievements.sass +++ b/app/styles/achievements.sass @@ -95,7 +95,7 @@ $user-achievements-scale: 0.8 padding: $overall-scale * 24px $overall-scale * 30px $overall-scale * 20px $overall-scale * 60px .achievement-title - font-family: Open Sans Condensed + font-family: $headings-font-family font-variant: small-caps font-size: $overall-scale * 28px padding-left: $overall-scale * -50px diff --git a/app/styles/bootstrap/_variables.scss b/app/styles/bootstrap/_variables.scss index e2b5af123..06930f639 100644 --- a/app/styles/bootstrap/_variables.scss +++ b/app/styles/bootstrap/_variables.scss @@ -75,7 +75,7 @@ $font-size-h6: ceil($font-size-base * 0.85) !default; // ~12px $line-height-base: 1.428571429 !default; // 20/14 $line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px -$headings-font-family: 'Open Sans Condensed', cursive; // empty to use BS default, $baseFontFamily; +$headings-font-family: 'Open Sans Condensed', "Helvetica Neue", Helvetica, Arial, sans-serif; // empty to use BS default, $baseFontFamily; $headings-font-weight: 700 !default; $headings-line-height: 1.1 !default; $headings-color: #317EAC; diff --git a/app/styles/common/common.sass b/app/styles/common/common.sass index ef1dda935..5a17efca4 100644 --- a/app/styles/common/common.sass +++ b/app/styles/common/common.sass @@ -140,12 +140,12 @@ table.table body[lang='ja'] h1, h2, h3, h4, h5, h6 - font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "MS Pゴシック", "MS PGothic", 'Open Sans Condensed', sans-serif + font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "MS Pゴシック", "MS PGothic", 'Open Sans Condensed', 'Helvetica Neue', Helvetica, Arial, sans-serif font-variant: small-caps letter-spacing: -1px !important .header-font - font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "MS Pゴシック", "MS PGothic", 'Open Sans Condensed', sans-serif + font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "MS Pゴシック", "MS PGothic", 'Open Sans Condensed', 'Helvetica Neue', Helvetica, Arial, sans-serif font-variant: small-caps letter-spacing: -1px !important @@ -247,7 +247,7 @@ kbd border-image: url(/images/common/button-background-active-border.png) 14 20 20 20 fill round border-width: 7px 10px 10px 10px padding: 0 - font-family: Open Sans Condensed + font-family: $headings-font-family text-transform: uppercase font-weight: bold color: rgb(248, 197, 146) diff --git a/app/styles/common/site-chrome.sass b/app/styles/common/site-chrome.sass index dd4926a4e..c9b3c5349 100644 --- a/app/styles/common/site-chrome.sass +++ b/app/styles/common/site-chrome.sass @@ -68,7 +68,7 @@ & > a, button, select font-size: 18px text-transform: uppercase - font-family: Open Sans Condensed + font-family: $headings-font-family margin: 0 7px button, select diff --git a/app/styles/game-menu/game-menu-modal.sass b/app/styles/game-menu/game-menu-modal.sass index 2707d39b0..a9390ea01 100644 --- a/app/styles/game-menu/game-menu-modal.sass +++ b/app/styles/game-menu/game-menu-modal.sass @@ -1,3 +1,4 @@ +@import "app/styles/bootstrap/variables" @import "app/styles/mixins" #game-menu-modal @@ -67,7 +68,7 @@ color: rgb(195,153,124) font-weight: bold padding: 14px 20px - font-family: Open Sans Condensed + font-family: $headings-font-family text-transform: uppercase .glyphicon diff --git a/app/styles/modal/auth-modal.sass b/app/styles/modal/auth-modal.sass index d79f7bf0f..f87d478f3 100644 --- a/app/styles/modal/auth-modal.sass +++ b/app/styles/modal/auth-modal.sass @@ -92,7 +92,7 @@ label font-size: 20px text-transform: uppercase - font-family: 'Open Sans Condensed' + font-family: $headings-font-family margin-bottom: 0 //- Check boxes @@ -236,7 +236,7 @@ width: 200px color: rgb(254,188,68) font-size: 20px - font-family: 'Open Sans Condensed' + font-family: $headings-font-family font-weight: bold text-transform: uppercase text-shadow: black 1px 1px 0, black -1px -1px 0, black 1px -1px 0, black -1px 1px 0, black 1px 0px 0, black 0px -1px 0, black -1px 0px 0, black 0px 1px 0 diff --git a/app/styles/play/ladder_home.sass b/app/styles/play/ladder_home.sass index e9406ef18..e9b474a6a 100644 --- a/app/styles/play/ladder_home.sass +++ b/app/styles/play/ladder_home.sass @@ -21,7 +21,7 @@ .overlay-text color: $yellow - font-family: Open Sans Condensed + font-family: $headings-font-family font-variant: small-caps @include transition(color .10s linear) diff --git a/app/styles/play/level.sass b/app/styles/play/level.sass index c54f94ad5..f0a44d523 100644 --- a/app/styles/play/level.sass +++ b/app/styles/play/level.sass @@ -187,7 +187,7 @@ $level-resize-transition-time: 0.5s #play-footer text-align: center - font-family: "Open Sans Condensed" + font-family: $headings-font-family font-variant: small-caps font-size: 25px padding: 10px 0 diff --git a/app/styles/play/level/control_bar.sass b/app/styles/play/level/control_bar.sass index 253e00cfa..1c036f936 100644 --- a/app/styles/play/level/control_bar.sass +++ b/app/styles/play/level/control_bar.sass @@ -12,7 +12,7 @@ position: absolute z-index: 6 text-transform: uppercase - font-family: Open Sans Condensed + font-family: $headings-font-family font-weight: bold &.controls-disabled diff --git a/app/styles/play/level/hud.sass b/app/styles/play/level/hud.sass index be3502933..eb124d8aa 100644 --- a/app/styles/play/level/hud.sass +++ b/app/styles/play/level/hud.sass @@ -98,7 +98,7 @@ background-image: url(/images/level/hud_background.png) color: white text-transform: uppercase - font-family: Open Sans Condensed + font-family: $headings-font-family font-weight: bold font-size: 16px z-index: 4 diff --git a/app/styles/play/level/modal/hero-victory-modal.sass b/app/styles/play/level/modal/hero-victory-modal.sass index 463adc798..c881afa9f 100644 --- a/app/styles/play/level/modal/hero-victory-modal.sass +++ b/app/styles/play/level/modal/hero-victory-modal.sass @@ -115,7 +115,7 @@ color: $hero-yellow-text font-weight: bold text-transform: uppercase - font-family: 'Open Sans Condensed' + font-family: $headings-font-family white-space: nowrap overflow: hidden text-overflow: ellipsis @@ -259,7 +259,7 @@ color: rgb(103, 92, 76) text-transform: uppercase font-weight: bold - font-family: 'Open Sans Condensed' + font-family: $headings-font-family font-size: 18px margin-top: 13px line-height: 18px @@ -303,7 +303,7 @@ .sign-up-blurb width: 175px - font-family: 'Open Sans Condensed' + font-family: $headings-font-family font-weight: bold text-transform: uppercase font-size: 18px diff --git a/app/styles/play/level/modal/victory.sass b/app/styles/play/level/modal/victory.sass index 9a343b3ce..c89731517 100644 --- a/app/styles/play/level/modal/victory.sass +++ b/app/styles/play/level/modal/victory.sass @@ -1,3 +1,6 @@ +@import "app/styles/mixins" +@import "app/styles/bootstrap/variables" + #level-victory-modal .victory-banner float: right @@ -55,4 +58,4 @@ body.ipad #level-victory-modal .modal-body font-size: 30px - font-family: Open Sans Condensed + font-family: $headings-font-family diff --git a/app/styles/play/level/tome/spell_list_entry.sass b/app/styles/play/level/tome/spell_list_entry.sass index 60f700c31..9599039cb 100644 --- a/app/styles/play/level/tome/spell_list_entry.sass +++ b/app/styles/play/level/tome/spell_list_entry.sass @@ -93,7 +93,7 @@ margin-top: 10px text-transform: uppercase display: inline-block - font-family: Open Sans Condensed + font-family: $headings-font-family font-weight: bold .method-label diff --git a/app/styles/play/modal/item-details-view.sass b/app/styles/play/modal/item-details-view.sass index 0741b68d8..9b7b17918 100644 --- a/app/styles/play/modal/item-details-view.sass +++ b/app/styles/play/modal/item-details-view.sass @@ -1,10 +1,11 @@ +@import "app/styles/bootstrap/variables" @import "app/styles/mixins" #item-details-view .big-font text-transform: uppercase - font-family: "Open Sans Condensed" + font-family: $headings-font-family font-weight: bold .one-line diff --git a/app/styles/play/modal/play-heroes-modal.sass b/app/styles/play/modal/play-heroes-modal.sass index 7d73a2858..4aa7d6c0c 100644 --- a/app/styles/play/modal/play-heroes-modal.sass +++ b/app/styles/play/modal/play-heroes-modal.sass @@ -44,7 +44,7 @@ $heroCanvasHeight: 265px top: 470px #gems-count - font-family: 'Open Sans Condensed' + font-family: $headings-font-family font-size: 24.5px color: lighten(rgb(1,64,91), 50%) @@ -302,7 +302,7 @@ $heroCanvasHeight: 265px text-align: center text-transform: uppercase font-size: 24.5px - font-family: Open Sans Condensed + font-family: $headings-font-family color: white #purchase-hero-button @@ -406,7 +406,7 @@ $heroCanvasHeight: 265px text-align: center text-transform: uppercase font-size: 26px - font-family: Open Sans Condensed + font-family: $headings-font-family color: white diff --git a/app/styles/play/modal/play-items-modal.sass b/app/styles/play/modal/play-items-modal.sass index d0db31efb..24862eb9e 100644 --- a/app/styles/play/modal/play-items-modal.sass +++ b/app/styles/play/modal/play-items-modal.sass @@ -1,10 +1,11 @@ +@import "app/styles/bootstrap/variables" @import "app/styles/mixins" #play-items-modal .big-font text-transform: uppercase - font-family: "Open Sans Condensed" + font-family: $headings-font-family font-weight: bold .one-line @@ -287,7 +288,7 @@ top: 70px font-size: 20px line-height: 20px - font-family: Open Sans Condensed + font-family: $headings-font-family text-transform: uppercase font-weight: bold z-index: 2 diff --git a/app/styles/play/modal/subscribe-modal.sass b/app/styles/play/modal/subscribe-modal.sass index 638a5992c..6d7a87f6e 100644 --- a/app/styles/play/modal/subscribe-modal.sass +++ b/app/styles/play/modal/subscribe-modal.sass @@ -63,7 +63,7 @@ font-weight: bold line-height: 18px color: black - font-family: 'Open Sans Condensed' + font-family: $headings-font-family font-size: 18px .point