From a4284e62096430aabc68c9d63cf15a1e83cf110f Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Fri, 11 Apr 2014 23:07:48 -0700
Subject: [PATCH] Fixed #776 with some CSS/font fixes and \@therealbond's admin
 footerization.

---
 app/styles/base.sass           | 19 ++++++++++++++++++-
 app/styles/common/top_nav.sass |  2 +-
 app/templates/base.jade        |  8 ++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/styles/base.sass b/app/styles/base.sass
index 72ff4fe2f..b5a9a0752 100644
--- a/app/styles/base.sass
+++ b/app/styles/base.sass
@@ -212,7 +212,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
@@ -222,6 +222,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
diff --git a/app/styles/common/top_nav.sass b/app/styles/common/top_nav.sass
index 9a41771fe..f5c61685e 100644
--- a/app/styles/common/top_nav.sass
+++ b/app/styles/common/top_nav.sass
@@ -11,7 +11,7 @@
     letter-spacing: 1px
 
   .navbuttontext-user-name
-    max-width: 125px
+    max-width: 110px
     overflow: hidden
     text-overflow: ellipsis
     white-space: nowrap
diff --git a/app/templates/base.jade b/app/templates/base.jade
index f31bc2db3..96d184876 100644
--- a/app/templates/base.jade
+++ b/app/templates/base.jade
@@ -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")