diff --git a/i18n/en_US.json b/i18n/en_US.json index a2326f4..a6a6d4c 100644 --- a/i18n/en_US.json +++ b/i18n/en_US.json @@ -157,5 +157,6 @@ "toggle_comment": "Toggle Comment", "find_in_files": "Find in Files", "email": "Email", - "no_empty": "Can not Empty!" + "no_empty": "Can not Empty!", + "change_avatar": "Avatar modify go" } \ No newline at end of file diff --git a/i18n/ja_JP.json b/i18n/ja_JP.json index 00098de..12bc375 100644 --- a/i18n/ja_JP.json +++ b/i18n/ja_JP.json @@ -157,5 +157,6 @@ "toggle_comment": "トグルコメント", "find_in_files": "ファイルから検索", "email": "Eメール", - "no_empty": "空ではありません" + "no_empty": "空ではありません", + "change_avatar": "アバターの変更は行く" } diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json index e50c7c7..7732873 100644 --- a/i18n/zh_CN.json +++ b/i18n/zh_CN.json @@ -157,5 +157,6 @@ "toggle_comment": "注释", "find_in_files": "在文件中查找", "email": "电子邮件", - "no_empty": "不能为空" + "no_empty": "不能为空", + "change_avatar": "头像修改请到" } \ No newline at end of file diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json index 8f5cc15..8dd6ed9 100644 --- a/i18n/zh_TW.json +++ b/i18n/zh_TW.json @@ -157,5 +157,6 @@ "toggle_comment": "註釋", "find_in_files": "在文件中查找", "email": "電子郵件", - "no_empty": "不能為空" + "no_empty": "不能為空", + "change_avatar": "頭像修改請到" } \ No newline at end of file diff --git a/static/css/base.css b/static/css/base.css index 9351459..79104b9 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -57,6 +57,19 @@ ul { box-sizing: border-box; } +a { + color: #4183c4; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + +img { + vertical-align: middle; +} + input, button { font-family: Helvetica; diff --git a/static/css/fonts/icomoon.eot b/static/css/fonts/icomoon.eot index ea91e38..61fd441 100644 Binary files a/static/css/fonts/icomoon.eot and b/static/css/fonts/icomoon.eot differ diff --git a/static/css/fonts/icomoon.svg b/static/css/fonts/icomoon.svg index f18bbd3..3fc37bf 100644 --- a/static/css/fonts/icomoon.svg +++ b/static/css/fonts/icomoon.svg @@ -29,7 +29,6 @@ - @@ -40,6 +39,8 @@ + + diff --git a/static/css/fonts/icomoon.ttf b/static/css/fonts/icomoon.ttf index d04686d..e8f1eb8 100644 Binary files a/static/css/fonts/icomoon.ttf and b/static/css/fonts/icomoon.ttf differ diff --git a/static/css/fonts/icomoon.woff b/static/css/fonts/icomoon.woff index 43f093b..8aa6a8d 100644 Binary files a/static/css/fonts/icomoon.woff and b/static/css/fonts/icomoon.woff differ diff --git a/static/css/wide.css b/static/css/wide.css index 346c600..cc7c807 100644 --- a/static/css/wide.css +++ b/static/css/wide.css @@ -36,6 +36,38 @@ line-height: 20px; } +.ico-share:before { + content: "\e61f"; +} + +.ico-github:before { + content: "\f00a"; +} + +.ico-tencent:before { + content: "\e622"; +} + +.ico-weibo:before { + content: "\e621"; +} + +.ico-googleplus:before { + content: "\e61a"; +} + +.ico-twitter:before { + content: "\e61c"; +} + +.ico-email:before { + content: "\e619"; +} + +.ico-facebook:before { + content: "\e61b"; +} + .ico-moveup:before { content: "\f148"; } @@ -247,6 +279,11 @@ margin: 0 5px 0 0px } +.menu img.gravatar { + float: left; + margin: 2px 8px; +} + #buildRun { color: #6DB14C; padding: 0px 3px 0 5px; @@ -258,6 +295,25 @@ color: #9d0000; padding: 0 4px 0 4px; } + +.share-panel { + position: absolute; + z-index: 20; + width: 226px; + padding: 5px 0; + right: 0px; +} + +.share-panel .font-ico { + font-size: 20px; + transition:all .2s ease-out 0s; + margin: 0 5px; + width: 24px; +} + +.share-panel .font-ico:hover { + transform:rotate(360deg); +} /* end menu */ /* start editor */ diff --git a/static/js/menu.js b/static/js/menu.js index 7b45d1f..d464262 100644 --- a/static/js/menu.js +++ b/static/js/menu.js @@ -19,12 +19,39 @@ var menu = { this.subMenu(); this._initPreference(); this._initAbout(); + this._initShare(); // 点击子菜单后消失 $(".frame li").click(function () { $(this).closest(".frame").hide(); $(".menu > ul > li > a, .menu > ul> li > span").removeClass("selected"); }); + + + }, + _initShare: function () { + $(".menu .ico-share").hover(function () { + $(".menu .share-panel").show(); + }); + + $(".share-panel .font-ico").click(function () { + var key = $(this).attr('class').split('-')[2]; + var title = encodeURIComponent($('title').text() + '. \n' + $('meta[name=description]').attr('content')), + url = "http://wide.b3log.org", + pic = 'http://wide.b3log.org/static/images/wide-logo.png'; + var urls = {}; + urls.email = "mailto:?subject=" + $('title').text() + + "body=" + $('meta[name=description]').attr('content') + ' ' + url; + urls.twitter = "https://twitter.com/intent/tweet?status=" + + $('meta[name=description]').attr('content') + " " + url; + urls.facebook = "https://www.facebook.com/sharer/sharer.php?u=" + url; + urls.googleplus = "https://plus.google.com/share?url=" + url; + urls.weibo = "http://v.t.sina.com.cn/share/share.php?title=" + + title + "&url=" + url + "&pic=" + pic; + urls.tencent = "http://share.v.t.qq.com/index.php?c=share&a=index&title=" + title + + "&url=" + url + "&pic=" + pic; + window.open(urls[key], "_blank", "top=100,left=200,width=648,height=618"); + }); }, _initAbout: function () { $("#dialogAbout").load(config.context + '/about', function () { diff --git a/views/index.html b/views/index.html index b2533f1..bf81ab5 100644 --- a/views/index.html +++ b/views/index.html @@ -7,6 +7,7 @@ + @@ -341,7 +342,25 @@ + + +
+ +   +   + +
@@ -519,7 +538,7 @@