codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-03 17:33:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed up our headings font family fallback.

Browse source
This commit is contained in:
Nick Winter 2014-12-07 17:57:57 -08:00
parent 01c6709c36
commit 5d1a34519b
17 changed files with 31 additions and 25 deletions

2
app/styles/achievements.sass
View file

@ -95,7 +95,7 @@ $user-achievements-scale: 0.8
padding: $overall-scale * 24px $overall-scale * 30px $overall-scale * 20px $overall-scale * 60px padding: $overall-scale * 24px $overall-scale * 30px $overall-scale * 20px $overall-scale * 60px
.achievement-title .achievement-title
font-family: Open Sans Condensed font-family: $headings-font-family
font-variant: small-caps font-variant: small-caps
font-size: $overall-scale * 28px font-size: $overall-scale * 28px
padding-left: $overall-scale * -50px padding-left: $overall-scale * -50px

2
app/styles/bootstrap/_variables.scss
View file

@ -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-base: 1.428571429 !default; // 20/14
$line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px $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-font-weight: 700 !default;
$headings-line-height: 1.1 !default; $headings-line-height: 1.1 !default;
$headings-color: #317EAC; $headings-color: #317EAC;

6
app/styles/common/common.sass
View file

@ -140,12 +140,12 @@ table.table
body[lang='ja'] body[lang='ja']
h1, h2, h3, h4, h5, h6 h1, h2, h3, h4, h5, h6
font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", "MS PGothic", 'Open Sans Condensed', sans-serif font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", "MS PGothic", 'Open Sans Condensed', 'Helvetica Neue', Helvetica, Arial, sans-serif
font-variant: small-caps font-variant: small-caps
letter-spacing: -1px !important letter-spacing: -1px !important
.header-font .header-font
font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", "MS PGothic", 'Open Sans Condensed', sans-serif font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", "MS PGothic", 'Open Sans Condensed', 'Helvetica Neue', Helvetica, Arial, sans-serif
font-variant: small-caps font-variant: small-caps
letter-spacing: -1px !important 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-image: url(/images/common/button-background-active-border.png) 14 20 20 20 fill round
border-width: 7px 10px 10px 10px border-width: 7px 10px 10px 10px
padding: 0 padding: 0
font-family: Open Sans Condensed font-family: $headings-font-family
text-transform: uppercase text-transform: uppercase
font-weight: bold font-weight: bold
color: rgb(248, 197, 146) color: rgb(248, 197, 146)

2
app/styles/common/site-chrome.sass
View file

@ -68,7 +68,7 @@
& > a, button, select & > a, button, select
font-size: 18px font-size: 18px
text-transform: uppercase text-transform: uppercase
font-family: Open Sans Condensed font-family: $headings-font-family
margin: 0 7px margin: 0 7px
button, select button, select

3
app/styles/game-menu/game-menu-modal.sass
View file

@ -1,3 +1,4 @@
@import "app/styles/bootstrap/variables"
@import "app/styles/mixins" @import "app/styles/mixins"
#game-menu-modal #game-menu-modal
@ -67,7 +68,7 @@
color: rgb(195,153,124) color: rgb(195,153,124)
font-weight: bold font-weight: bold
padding: 14px 20px padding: 14px 20px
font-family: Open Sans Condensed font-family: $headings-font-family
text-transform: uppercase text-transform: uppercase
.glyphicon .glyphicon

4
app/styles/modal/auth-modal.sass
View file

@ -92,7 +92,7 @@
label label
font-size: 20px font-size: 20px
text-transform: uppercase text-transform: uppercase
font-family: 'Open Sans Condensed' font-family: $headings-font-family
margin-bottom: 0 margin-bottom: 0
//- Check boxes //- Check boxes
@ -236,7 +236,7 @@
width: 200px width: 200px
color: rgb(254,188,68) color: rgb(254,188,68)
font-size: 20px font-size: 20px
font-family: 'Open Sans Condensed' font-family: $headings-font-family
font-weight: bold font-weight: bold
text-transform: uppercase 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 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

2
app/styles/play/ladder_home.sass
View file

@ -21,7 +21,7 @@
.overlay-text .overlay-text
color: $yellow color: $yellow
font-family: Open Sans Condensed font-family: $headings-font-family
font-variant: small-caps font-variant: small-caps
@include transition(color .10s linear) @include transition(color .10s linear)

2
app/styles/play/level.sass
View file

@ -187,7 +187,7 @@ $level-resize-transition-time: 0.5s
#play-footer #play-footer
text-align: center text-align: center
font-family: "Open Sans Condensed" font-family: $headings-font-family
font-variant: small-caps font-variant: small-caps
font-size: 25px font-size: 25px
padding: 10px 0 padding: 10px 0

2
app/styles/play/level/control_bar.sass
View file

@ -12,7 +12,7 @@
position: absolute position: absolute
z-index: 6 z-index: 6
text-transform: uppercase text-transform: uppercase
font-family: Open Sans Condensed font-family: $headings-font-family
font-weight: bold font-weight: bold
&.controls-disabled &.controls-disabled

2
app/styles/play/level/hud.sass
View file

@ -98,7 +98,7 @@
background-image: url(/images/level/hud_background.png) background-image: url(/images/level/hud_background.png)
color: white color: white
text-transform: uppercase text-transform: uppercase
font-family: Open Sans Condensed font-family: $headings-font-family
font-weight: bold font-weight: bold
font-size: 16px font-size: 16px
z-index: 4 z-index: 4

6
app/styles/play/level/modal/hero-victory-modal.sass
View file

@ -115,7 +115,7 @@
color: $hero-yellow-text color: $hero-yellow-text
font-weight: bold font-weight: bold
text-transform: uppercase text-transform: uppercase
font-family: 'Open Sans Condensed' font-family: $headings-font-family
white-space: nowrap white-space: nowrap
overflow: hidden overflow: hidden
text-overflow: ellipsis text-overflow: ellipsis
@ -259,7 +259,7 @@
color: rgb(103, 92, 76) color: rgb(103, 92, 76)
text-transform: uppercase text-transform: uppercase
font-weight: bold font-weight: bold
font-family: 'Open Sans Condensed' font-family: $headings-font-family
font-size: 18px font-size: 18px
margin-top: 13px margin-top: 13px
line-height: 18px line-height: 18px
@ -303,7 +303,7 @@
.sign-up-blurb .sign-up-blurb
width: 175px width: 175px
font-family: 'Open Sans Condensed' font-family: $headings-font-family
font-weight: bold font-weight: bold
text-transform: uppercase text-transform: uppercase
font-size: 18px font-size: 18px

5
app/styles/play/level/modal/victory.sass
View file

@ -1,3 +1,6 @@
@import "app/styles/mixins"
@import "app/styles/bootstrap/variables"
#level-victory-modal #level-victory-modal
.victory-banner .victory-banner
float: right float: right
@ -55,4 +58,4 @@ body.ipad #level-victory-modal
.modal-body .modal-body
font-size: 30px font-size: 30px
font-family: Open Sans Condensed font-family: $headings-font-family

2
app/styles/play/level/tome/spell_list_entry.sass
View file

@ -93,7 +93,7 @@
margin-top: 10px margin-top: 10px
text-transform: uppercase text-transform: uppercase
display: inline-block display: inline-block
font-family: Open Sans Condensed font-family: $headings-font-family
font-weight: bold font-weight: bold
.method-label .method-label

3
app/styles/play/modal/item-details-view.sass
View file

@ -1,10 +1,11 @@
@import "app/styles/bootstrap/variables"
@import "app/styles/mixins" @import "app/styles/mixins"
#item-details-view #item-details-view
.big-font .big-font
text-transform: uppercase text-transform: uppercase
font-family: "Open Sans Condensed" font-family: $headings-font-family
font-weight: bold font-weight: bold
.one-line .one-line

6
app/styles/play/modal/play-heroes-modal.sass
View file

@ -44,7 +44,7 @@ $heroCanvasHeight: 265px
top: 470px top: 470px
#gems-count #gems-count
font-family: 'Open Sans Condensed' font-family: $headings-font-family
font-size: 24.5px font-size: 24.5px
color: lighten(rgb(1,64,91), 50%) color: lighten(rgb(1,64,91), 50%)
@ -302,7 +302,7 @@ $heroCanvasHeight: 265px
text-align: center text-align: center
text-transform: uppercase text-transform: uppercase
font-size: 24.5px font-size: 24.5px
font-family: Open Sans Condensed font-family: $headings-font-family
color: white color: white
#purchase-hero-button #purchase-hero-button
@ -406,7 +406,7 @@ $heroCanvasHeight: 265px
text-align: center text-align: center
text-transform: uppercase text-transform: uppercase
font-size: 26px font-size: 26px
font-family: Open Sans Condensed font-family: $headings-font-family
color: white color: white

5
app/styles/play/modal/play-items-modal.sass
View file

@ -1,10 +1,11 @@
@import "app/styles/bootstrap/variables"
@import "app/styles/mixins" @import "app/styles/mixins"
#play-items-modal #play-items-modal
.big-font .big-font
text-transform: uppercase text-transform: uppercase
font-family: "Open Sans Condensed" font-family: $headings-font-family
font-weight: bold font-weight: bold
.one-line .one-line
@ -287,7 +288,7 @@
top: 70px top: 70px
font-size: 20px font-size: 20px
line-height: 20px line-height: 20px
font-family: Open Sans Condensed font-family: $headings-font-family
text-transform: uppercase text-transform: uppercase
font-weight: bold font-weight: bold
z-index: 2 z-index: 2

2
app/styles/play/modal/subscribe-modal.sass
View file

@ -63,7 +63,7 @@
font-weight: bold font-weight: bold
line-height: 18px line-height: 18px
color: black color: black
font-family: 'Open Sans Condensed' font-family: $headings-font-family
font-size: 18px font-size: 18px
.point .point