From 27221acda7b53fc32e807b31ed59062891629415 Mon Sep 17 00:00:00 2001 From: lealife Date: Sun, 22 May 2016 10:34:40 +0800 Subject: [PATCH] new logo --- app/views/home/find_password.html | 2 +- app/views/home/find_password2.html | 2 +- app/views/home/find_password2_timeout.html | 2 +- app/views/home/footer.html | 2 +- app/views/home/header.html | 18 ++++---- app/views/home/header_box.html | 6 +-- app/views/home/login.html | 4 +- app/views/home/register.html | 2 +- app/views/note/note-dev.html | 10 ++--- messages/zh-cn/msg.conf | 1 + messages/zh-hk/msg.conf | 1 + public/css/index.css | 49 +++++++++++++++++++++- public/css/index.less | 11 ++++- 13 files changed, 81 insertions(+), 29 deletions(-) diff --git a/app/views/home/find_password.html b/app/views/home/find_password.html index 2410c37..5321b52 100644 --- a/app/views/home/find_password.html +++ b/app/views/home/find_password.html @@ -27,7 +27,7 @@ {{msg . "home"}}

- leanote © 2014-2015 + Leanote © 2014-2016

diff --git a/app/views/home/find_password2.html b/app/views/home/find_password2.html index 4c6bcf2..03e928f 100644 --- a/app/views/home/find_password2.html +++ b/app/views/home/find_password2.html @@ -36,7 +36,7 @@ {{msg . "home"}}

- leanote © 2014-2015 + Leanote © 2014-2016

diff --git a/app/views/home/find_password2_timeout.html b/app/views/home/find_password2_timeout.html index bdf58ef..7677879 100644 --- a/app/views/home/find_password2_timeout.html +++ b/app/views/home/find_password2_timeout.html @@ -21,7 +21,7 @@ {{msg . "home"}}

- leanote © 2014-2015 + Leanote © 2014-2016

diff --git a/app/views/home/footer.html b/app/views/home/footer.html index 3c1ffe3..33c3b78 100644 --- a/app/views/home/footer.html +++ b/app/views/home/footer.html @@ -8,7 +8,7 @@
leanote@leanote.com
- Copyright © 2014-2015 Leanote + Copyright © 2014-2016 Leanote
diff --git a/app/views/home/header.html b/app/views/home/header.html index a44a0f8..0610f0e 100644 --- a/app/views/home/header.html +++ b/app/views/home/header.html @@ -4,16 +4,14 @@ - - - + + + {{.title}} - - +
@@ -127,9 +127,9 @@ function log(o) {
-
+
- + {{.userInfo.Username}} {{.userInfo.Username}} diff --git a/messages/zh-cn/msg.conf b/messages/zh-cn/msg.conf index 90f7bf4..8230a81 100644 --- a/messages/zh-cn/msg.conf +++ b/messages/zh-cn/msg.conf @@ -15,6 +15,7 @@ try=体验一下 usernameOrEmail=用户名或Email password=密码 home=主页 +Leanote Explore=Leanote探索 desktopApp=客户端 aboutLeanote=关于Leanote suggestions=建议 diff --git a/messages/zh-hk/msg.conf b/messages/zh-hk/msg.conf index c90fa1f..4c756ab 100644 --- a/messages/zh-hk/msg.conf +++ b/messages/zh-hk/msg.conf @@ -15,6 +15,7 @@ try=體驗一下 usernameOrEmail=使用者名稱或Email password=密碼 home=首頁 +Leanote Explore=Leanote探索 desktopApp=客戶端 aboutLeanote=關於Leanote suggestions=建議 diff --git a/public/css/index.css b/public/css/index.css index 454a484..ba2724e 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -1,3 +1,45 @@ +@font-face { + font-family: 'leanote'; + src: url('../../fonts/leanote-font3/leanote.eot?-vcf23i'); + src: url('../../fonts/leanote-font3/leanote.eot?#iefix-vcf23i') format('embedded-opentype'), url('../../fonts/leanote-font3/leanote.ttf?-vcf23i') format('truetype'), url('../../fonts/leanote-font3/leanote.woff?-vcf23i') format('woff'), url('../../fonts/leanote-font3/leanote.svg?-vcf23i#leanote') format('svg'); + font-weight: normal; + font-style: normal; +} +#logo, +.mce-i-mind, +.mce-i-ace-pre, +.lea-icon { + font-family: 'leanote' !important; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +.icon-markdown:before { + content: "\e604"; +} +.mce-i-mind:before { + content: "\e602"; +} +.mce-i-ace-pre:before { + content: "\e603"; +} +#logo:before { + content: "\e901"; + line-height: 1; + margin-top: 5px; + display: inline-block; + vertical-align: top; +} +#logo.icon-only:before { + content: "\e902"; +} +.lang-zh-cn #logo:before { + content: "\e900"; +} @font-face { font-family: 'Open Sans'; font-style: normal; @@ -22,6 +64,11 @@ font-weight: 400; src: local('Open Sans Italic'), local('OpenSans-Italic'), url('../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff'); } +#logo { + font-size: 32px; + color: #000; + padding-top: 8px; +} /*"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue", Helvetica, "Microsoft Yahei", Verdana, Simsun, "Segoe UI", "Segoe UI Web Regular", "Segoe UI Symbol", "BBAlpha Sans", "S60 Sans", Arial, sans-serif;*/ ::selection { background: #000000; @@ -60,9 +107,7 @@ a:hover { margin: 0; } #headerContainer .navbar-brand { - padding: 0; padding-left: 10px; - line-height: 60px; } #headerContainer .navbar-brand img { height: 50px; diff --git a/public/css/index.less b/public/css/index.less index 896500b..4999d2b 100644 --- a/public/css/index.less +++ b/public/css/index.less @@ -13,6 +13,8 @@ @containerWidth: 945px; @titleColor: #5AD4A0; +@import "./theme/includes/icon.less"; + // font @font-face { font-family: 'Open Sans'; @@ -39,6 +41,12 @@ src: local('Open Sans Italic'), local('OpenSans-Italic'), url('../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff'); } +#logo { + font-size: 32px; + color: #000; + padding-top: 8px; +} + /*"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue", Helvetica, "Microsoft Yahei", Verdana, Simsun, "Segoe UI", "Segoe UI Web Regular", "Segoe UI Symbol", "BBAlpha Sans", "S60 Sans", Arial, sans-serif;*/ @selectionBg: @aBlackColor; @selectionColor: #fff; @@ -74,9 +82,8 @@ a:hover { box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.1); margin: 0; .navbar-brand { - padding: 0; padding-left: 10px; - line-height: @headerHeight; + // line-height: @headerHeight; img { height: 50px; display: inline-block;