codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-27 17:45:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Scott Erickson 2014-04-12 08:52:50 -07:00
commit 775821feec
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/styles/base.sass
View file

@ -215,7 +215,7 @@ table.table
.header-font
font-family: $headings-font-family
body[lang='ru'], body[lang|='zh'], body[lang='ja'], body[lang='pl'], body[lang='tr'], body[lang='cs'], body[lang='el'], body[lang='ro'], body[lang='vi'], body[lang='th'], body[lang='ko'], body[lang='sk'], body[lang='sl'], body[lang='bg'], body[lang='he'], body[lang='lt'], body[lang='sr'], body[lang='uk'], body[lang='hi'], body[lang='ur'],
body[lang='ru'], body[lang|='zh'], body[lang='pl'], body[lang='tr'], body[lang='cs'], body[lang='el'], body[lang='ro'], body[lang='vi'], body[lang='th'], body[lang='ko'], body[lang='sk'], body[lang='sl'], body[lang='bg'], body[lang='he'], body[lang='lt'], body[lang='sr'], body[lang='uk'], body[lang='hi'], body[lang='ur'], body[lang='hu']
h1, h2, h3, h4, h5, h6
font-family: 'Open Sans Condensed', Impact, "Arial Narrow", "Arial", sans-serif
text-transform: uppercase
@ -225,6 +225,23 @@ body[lang='ru'], body[lang|='zh'], body[lang='ja'], body[lang='pl'], body[lang='
font-family: 'Open Sans Condensed', Impact, "Arial Narrow", "Arial", sans-serif !important
text-transform: uppercase
letter-spacing: -1px !important
body[lang='ja']
h1, h2, h3, h4, h5, h6
font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", "MS PGothic", 'Open Sans Condensed', sans-serif
text-transform: uppercase
letter-spacing: -1px !important
.header-font
font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", "MS PGothic", 'Open Sans Condensed', sans-serif
text-transform: uppercase
letter-spacing: -1px !important
#top-nav
.navbar-nav
li
a.header-font
font-size: 16px
@media only screen and (max-width: 800px)
.main-content-area

2
app/styles/common/top_nav.sass
View file

@ -11,7 +11,7 @@
letter-spacing: 1px
.navbuttontext-user-name
max-width: 125px
max-width: 110px
overflow: hidden
text-overflow: ellipsis
white-space: nowrap

8
app/templates/base.jade
View file

@ -51,12 +51,6 @@ body
a.header-font(href='http://blog.codecombat.com/', data-i18n="nav.blog") Blog
li.forum
a.header-font(href='http://discourse.codecombat.com/', data-i18n="nav.forum") Forum
if me.isAdmin()
li.admin
a.header-font(href='/admin', data-i18n="nav.admin") Admin
block outer_content
@ -79,6 +73,8 @@ body
a(href='/legal', title='Legal', tabindex=-1, data-i18n="nav.legal") Legal
a(href='/about', title='About', tabindex=-1, data-i18n="nav.about") About
a(title='Contact', tabindex=-1, data-toggle="coco-modal", data-target="modal/contact", data-i18n="nav.contact") Contact
if me.isAdmin()
a(href='/admin', data-i18n="nav.admin") Admin
.share-buttons
.g-plusone(data-href="http://codecombat.com", data-size="medium")