From 490d48734d2383ce814d96d1c4d5d999192dfb67 Mon Sep 17 00:00:00 2001 From: Van Date: Fri, 19 Dec 2014 15:44:49 +0800 Subject: [PATCH] heko --- i18n/en_US.json | 3 +- i18n/ja_JP.json | 3 +- i18n/zh_CN.json | 3 +- i18n/zh_TW.json | 3 +- static/css/fonts/icomoon.eot | Bin 12660 -> 13204 bytes static/css/fonts/icomoon.svg | 9 ++++-- static/css/fonts/icomoon.ttf | Bin 12496 -> 13040 bytes static/css/fonts/icomoon.woff | Bin 12572 -> 13116 bytes static/css/sign.css | 51 ++++++++++++++++++++++++---------- static/css/themes/default.css | 2 +- static/css/wide.css | 12 ++++++++ static/js/editors.js | 3 +- views/index.html | 14 ++++++---- views/login.html | 5 ++-- views/sign_up.html | 5 ++-- 15 files changed, 81 insertions(+), 32 deletions(-) diff --git a/i18n/en_US.json b/i18n/en_US.json index ed37c33..939f54e 100644 --- a/i18n/en_US.json +++ b/i18n/en_US.json @@ -159,5 +159,6 @@ "email": "Email", "no_empty": "Can not Empty!", "change_avatar": "Avatar modify go", - "open": "Open" + "open": "Open", + "pricing": "Pricing" } \ No newline at end of file diff --git a/i18n/ja_JP.json b/i18n/ja_JP.json index 0907614..9ae2bb1 100644 --- a/i18n/ja_JP.json +++ b/i18n/ja_JP.json @@ -159,5 +159,6 @@ "email": "Eメール", "no_empty": "空ではありません", "change_avatar": "アバターの変更は行く", - "open": "オープン" + "open": "オープン", + "pricing": "价格" } diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json index ac26387..38f6218 100644 --- a/i18n/zh_CN.json +++ b/i18n/zh_CN.json @@ -159,5 +159,6 @@ "email": "电子邮件", "no_empty": "不能为空", "change_avatar": "头像修改请到", - "open": "打开" + "open": "打开", + "pricing": "价格" } \ No newline at end of file diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json index 878554d..ab5d6ca 100644 --- a/i18n/zh_TW.json +++ b/i18n/zh_TW.json @@ -159,5 +159,6 @@ "email": "電子郵件", "no_empty": "不能為空", "change_avatar": "頭像修改請到", - "open": "打開" + "open": "打開", + "pricing": "價格" } \ No newline at end of file diff --git a/static/css/fonts/icomoon.eot b/static/css/fonts/icomoon.eot index 61fd4416eb97f045e738153eacef585447ce0d99..2857e4998d77a48deb64085e7a502be6157ca342 100644 GIT binary patch delta 1515 zcmY*YYitx%6ux)f?>p~(ciG+9S6jF3PTNJgrR61>NEAVd3Xxi>C6TsbK`fG^@^E1OosM@Lzf10@*t$hB)q4fa3IRFZs<6|Sc=u~$VfUaKv z0R7`w!EL492B6!-*csn5ecAhJwk>q(7RK-57#pT0Uz-M`f3#Th?SQ1bQFw$*EnM~ffZ_IqtBb;7V)6OK?-&2P z9liZ%v)*h1*t`*@?9FOi(9=2UFVJtdXCP2LX?rXA_#MB?1YJn6w+} z1njfnTcj{~ZyP*3L1g@x6o6oiY!Zv!H{27Ilmb(2Fwh2LFwxhW$rfOW_&QcJ4BIx0 zVl3t^OKz<3e$3TgG(}WNuO|ua4p=p`b(|np@7eJH@kZ*d|<;N`6v~kkz zs@7ZVFRg}sz5QNUX{%%yR)H+jGTXkP^j}#QtwK2ba6H&ynvNRIDheV_kQ6Dfj4p{0 zRgFlZ#xOidVkITeBuh~|9W~8%g%b#pfDjT4O{Xo>p(%#&F(e2=U>L-8pok!9G>>Se z!ia(pH-EGoMNx4XvYfK4v@a{N>{#R)WOFP_)3hpRossCetQZhQOB7V>o1$o$<8@vz z1zzVkm7_R{W+_8KDUA;)$T0~Dha?HSu@X&lG>14=X5ykH@ER*e5K6@Lm}}b(s?S1M zmK@to%QAwpv@9y9`a1f7u0U|5StD+d?|>(9(-a`Scg!Cq%PsoE1>BY@+n2I1mkP96 zZ2N{bEc*nfl76pbmwP8*xqX;t{|;JOc&BsF&{f0G`;w_16(M38+LpaKeB&i zCrt0<6T#q6rm!I#&d5?sRUKVPD2k~glnZp={}bHaSGl%8U?{(GQzVj*03g6{^E?H} z^MC;ssBW>AP^C43Sa%47K_1{yhTW|J&{`bybhr4>l76{8iB|0aZJ8GhwrF9sR@Ehq z0KMh%g`+bU2gcN(F^5rZ{yJ5Xf`)s+XK1m=pYIHk8+h@FjogT{Ph>vl4#tD zL8)FBL!ziN1X-^$x`+WmN3ZECVFG~WHJtdTK)}TSm=>W7$uv!-AzR80!8l|C zSqd~}XJ;F;5R@T)$`CZbeEXTDsi~zi?em1|hTxjUx9(Eo<5Q>L&ZWlj{deb_8#kP} zyZft;r@Q&+{K@0zUO?qLK&1Sjp!U`N$o<{>s8E7MuU5#?yRj8|_X-iX;03!<^c9SU zy`5bl@98eb+tkH*2fK2kMe;P2q~@rbbQ}F8{T*|RImcY$wsN2GfY0&I@Ne*c2~pt@ z;ga~P)G1T)F8QQVRJN;}_K*IQe%N@ delta 979 zcmZuvUuYaf9G=XYnp?a zHekSjfkY`j_z;ZiQy)c&HXtPjZ7qE$MX(QA;=@rv%|peY1@#L0A|`R}sQThCKj!=9 zoB6((VLq7t{S=+60@$;JceMbMvd$=sSY%5&Y(B=TA?5zwz^5g8wA=D>IYxv)~YX z0f6X;;JI^?GgB|_y7a5yO_A~R?D^N{01^tQh&+%32*;=41>|lP;s-EQ-t;?aC*L{I z`J(g7!}P-=J6k(D0Pg&d!YO2>Eoy#co-&^@E#t>lD7{Q;Z7_@)!jB2_Ql8g%&Che` z4BuWl_8W&~X|=I649g9;3NRQ3OQ}Ye0X#-jLNw|OXqpbecoa?-VY|2N|F-t# zf}VHJui@Cv{^HrQ#r*<6Xbjj+*?&Y^S6LCu_W(eTp^NeT#51m&^u(cSPxkuA=-5HH z?;wopMs~44Wdq7R+4p+FX!lwr>1%hSKYgIED|Eepr^|+ENuOYZHCc9aJ;QlM*KL`q z2w{S;N|8)3qgmJ8Ycdr{2ttWcQu4eK!7`L!w@DIGscf>)O6xkO%%XIWYMPe!HoTH) z*w8eL!1MowK00poDT*SDxW=Pw=5Sf>(=}hyIiW=48jLxb>T0UZ7*{YOSiwol47ipu zt-zD8NJK~?P)QKN2(uK~q`8ErsSm$aVn6sz@8DPrm6rdvO09{2-jxceKy`r4)FpE3TZG6tjgyGkkF7V5C5EV>TH zx+@>mk{EA^x)<-R4#IjoTkVghtA%)_I&`9fuHYR06mOC=StGaT`}8XPTzOvkSlMO) zn_%x#C>y_FW3|IH_n3dXYzRRhI`rF@GJmDWCWiBX7_AB Nir=a^t!QKl{tfvjygmQ` diff --git a/static/css/fonts/icomoon.svg b/static/css/fonts/icomoon.svg index 3fc37bf..3065495 100644 --- a/static/css/fonts/icomoon.svg +++ b/static/css/fonts/icomoon.svg @@ -12,15 +12,15 @@ - - + + - + @@ -29,6 +29,7 @@ + @@ -41,6 +42,8 @@ + + diff --git a/static/css/fonts/icomoon.ttf b/static/css/fonts/icomoon.ttf index e8f1eb889162e38ce6b5951bb1e5a032cc3c0e58..9baf6d649cfc4665618ad7165ab09cdf30e1745e 100644 GIT binary patch delta 1545 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 Ph12@KfkNfOWz+CKU-~Mt delta 994 zcmZuwONbOl7_REBs_yD{^>f^L?d&++n^~Qnb#&JRvt|!52!bTpF<>BOP23%#tAc_X zSXhyeg9nM}oFu0lBymAxC*&a>atI^`6U<>S5V8=#MRPDCiI=dCR5y}bQq)I%|M&g% z|5Zizt(lLHy5|n=+Xo=vW3&L&bZy>ADy`h*ZCe+=|N6?w+37Q<0f2vTLw*Wt_Qbn0 zTw4QR+h7WN@4}JJvFWz~XcTzPSPJZY@Jok_T$|$Y))ev-y3mt3!RIU+KTz|E~Y&apCd)&GpSqzL}R;1*<`F9p>Bt(JENP{J}hGK5tsaeINqJ zFP!f_ffJOC#RK_K7S?#P|+p(S9wd2QYyE%c-DBDgwcp7%!pfx1j z1wed8ypmkh_j{h}^Fz0u%jS-;@d>zV0wxdi(&7-23@BxG;Ah5IdaX$K$=i`H>>1k9 z@cfV!>V|0vpCJ*clH_Pwk+Gtt*%DDi5n+TBB1#xhQu4g*CRId1gis&^N4_6nBtZeD zLl8uTNG5Gq1x;gwT7)bTRaGngiXWMV4Nb!c{or33h=;A5EX%wQQ(0UpzEsz8ni{AY z!vyob2BnUwc&cJk%49?_l96kfAyWrTEA$1#JBp%!p{!#}F|}mLB!jxID7LH@EvxF3 z%i}>XY_6X(bUn=FBEvBGW2QV9HVg}PtLBfm`1Y$${oLjFb185$%;n2`aSa!Td=3>pPdEgZ}+f!)4S%a_*V8e K$K9Kw7vMivBED__ diff --git a/static/css/sign.css b/static/css/sign.css index 115baad..f749628 100644 --- a/static/css/sign.css +++ b/static/css/sign.css @@ -31,12 +31,13 @@ .header li { float: left; + margin-left: 25px; } .header a { display: block; font-weight: bold; - padding: 4px 8px; + padding: 5px 0; color: #333; line-height: 30px; text-decoration: none; @@ -70,6 +71,8 @@ } .content .form input { + border: 1px solid #ccc; + border-radius: 3px; width: 100%; background-color: #fafafa; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset; @@ -84,34 +87,56 @@ } .content .form input:focus { + background-color: #FFF; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset, 0 0 12px rgba(255, 255, 255, 0.75); } -.button { +.btn { width: 100%; color: #fff; - font-size: 16px; text-shadow: 0 -1px 0 rgba(0,0,0,0.25); background-color: #60b044; background-image: linear-gradient(#8add6d, #60b044); border: 1px solid #5ca941; padding: 10px; + border-radius: 3px; + cursor: pointer; } -.button:hover { +.btn:hover { background-color: #569e3d; background-image: linear-gradient(#79d858, #569e3d); border-color: #4a993e; } -.header .button { - color: #fff; - padding: 0 8px; - font-size: 13px; +.btn.btn-white, +.btn.btn-red { + color: #333; + text-shadow: 0 1px 0 rgba(255,255,255,0.9); + background-color: #eee; + background-image: linear-gradient(#fcfcfc, #eee); + border-color: #d5d5d5; } -.header .button:hover { - color: #FFF; +.btn.btn-red { + color: #9d0000; +} + +.btn.btn-white:hover { + color: #333; + text-shadow: 0 1px 0 rgba(255,255,255,0.9); + background-color: #ddd; + background-image: linear-gradient(#eee, #ddd); + border-color: #ccc; +} + +.btn.btn-red:hover { + background-color: #b33630; + background-image: linear-gradient(#dc5f59, #b33630); + background-repeat: repeat-x; + border-color: #cd504a; + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); } #msg { @@ -158,11 +183,9 @@ margin-top: -108px; } +#loginBtn, #signUpBtn { margin-top: 20px; -} - -#loginBtn { - margin-top: 20px; + font-size: 16px; } /* end sign up */ \ No newline at end of file diff --git a/static/css/themes/default.css b/static/css/themes/default.css index bac4aac..a394616 100644 --- a/static/css/themes/default.css +++ b/static/css/themes/default.css @@ -100,7 +100,7 @@ } .tabs > div.current { - background-color: #9F9F9F; + background-color: #bbb; color: #FFF; text-shadow: 0 1px rgba(0, 0, 0, 0.4); } diff --git a/static/css/wide.css b/static/css/wide.css index bf7fd0b..d3de974 100644 --- a/static/css/wide.css +++ b/static/css/wide.css @@ -36,6 +36,18 @@ line-height: 20px; } +.ico-book:before { + content: "\e623"; +} + +.ico-price:before { + content: "\e616"; +} + +.ico-start:before { + content: "\e9d7"; +} + .ico-share:before { content: "\e61f"; } diff --git a/static/js/editors.js b/static/js/editors.js index e56851f..99e06c7 100644 --- a/static/js/editors.js +++ b/static/js/editors.js @@ -263,7 +263,8 @@ var editors = { editors.tabs.add({ id: "startPage", - title: '' + config.label.start_page + '', + title: ' ' + config.label.start_page + '', content: '
', after: function () { $("#startPage").load(config.context + '/start?sid=' + config.wideSessionId); diff --git a/views/index.html b/views/index.html index 6230ee2..d3c6f8d 100644 --- a/views/index.html +++ b/views/index.html @@ -52,10 +52,10 @@ {{.i18n.close_all_files}}
  • -
  • +
  • {{.i18n.import}}
    • -
  • +
  • {{.i18n.export}}
  • @@ -324,7 +324,7 @@
    • - + {{.i18n.wide_doc}}
    • @@ -337,8 +337,12 @@ {{.i18n.keyboard_shortcuts}}
    • +
    • + + {{.i18n.pricing}} +
    • - + {{.i18n.start_page}}
    • @@ -450,7 +454,7 @@ {{.i18n.close_other}}
    • -
    • +
    • {{.i18n.copy_file_path}}
    diff --git a/views/login.html b/views/login.html index a82c34f..6048e5e 100644 --- a/views/login.html +++ b/views/login.html @@ -17,7 +17,8 @@
  • GitHub
  • {{.i18n.help}}
  • {{.i18n.report_issues}}
    • -
  • {{.i18n.sign_up}}
    • +
    • +
    • @@ -31,7 +32,7 @@


    - + diff --git a/views/sign_up.html b/views/sign_up.html index ce072ce..5299314 100644 --- a/views/sign_up.html +++ b/views/sign_up.html @@ -17,7 +17,8 @@
  • GitHub
  • {{.i18n.help}}
  • {{.i18n.report_issues}}
    • -
  • {{.i18n.login}}
    • +
    • +
    • @@ -37,7 +38,7 @@

    - +