From 7c4da04be1c37e5c87ff6101a8370693aa8ab797 Mon Sep 17 00:00:00 2001 From: fen Date: Wed, 25 Dec 2013 20:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E5=B1=8F=E6=92=B0?= =?UTF-8?q?=E5=86=99=E6=97=B6=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=EF=BC=8C?= =?UTF-8?q?=E8=BF=98=E4=B8=8D=E5=AE=8C=E7=BE=8E=20fixed=20Issue=20#145?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/css/style.css | 16 +++++++++------- admin/profile.php | 3 ++- admin/scss/_buttons.scss | 5 +---- admin/scss/_hidden.scss | 5 +++-- admin/scss/components/_editor.scss | 14 +++++++------- admin/scss/style.scss | 1 - admin/write-js.php | 16 +++++++++------- admin/write-page.php | 1 + admin/write-post.php | 2 +- 9 files changed, 33 insertions(+), 30 deletions(-) diff --git a/admin/css/style.css b/admin/css/style.css index 21a2661c..18791c31 100644 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -210,9 +210,7 @@ button { cursor: default; } .btn-text { - background: transparent; } - .btn-text:hover, .btn-text:active, .btn-text.active { - background: #F3F3F0; } + background-color: transparent !important; } /* 下拉菜单 */ .btn-drop { @@ -974,8 +972,7 @@ a.operate-reply { color: #666; } .typecho-post-area #text { - resize: none; - font-size: .92857em; } + resize: none; } #advance-panel-btn { font-size: .92857em; } @@ -1428,6 +1425,12 @@ a.operate-reply { margin: 0; padding: 10px 20px; border-bottom: 1px solid #F3F3F0; } +.fullscreen #tab-files { + position: absolute; + top: 52px; + right: 20px; + width: 280px; + z-index: 1001; } .fullscreen .wmd-edittab, .fullscreen .typecho-post-option, .fullscreen .title, @@ -1635,8 +1638,7 @@ div.token-input-dropdown ul li.token-input-selected-dropdown-item { * Hide from both screenreaders and browsers: h5bp.com/u */ .hidden { - display: none !important; - visibility: hidden; } + display: none; } /* * Hide only visually, but have it available for screenreaders: h5bp.com/v diff --git a/admin/profile.php b/admin/profile.php index 05652b65..9c443d51 100644 --- a/admin/profile.php +++ b/admin/profile.php @@ -14,7 +14,8 @@ $stat = Typecho_Widget::widget('Widget_Stat');

isSecure() ? 'https://secure' : 'http://www') . '.gravatar.com/avatar/' . md5($user->mail) . '?s=220&r=X' . '&d=mm" alt="' . $user->screenName . '" />'; ?>

-

screenName(); ?>
name(); ?>

+

screenName(); ?>

+

name(); ?>

%s 篇日志, 并有 %s 条关于你的评论在 %s 个分类中.', $stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?>

' + ' (' + o.time + ')').effect('highlight', 1000); + autoSave.text('' + ' (' + o.time + ')').effect('highlight', 1000); locked = false; }, 'json'); } @@ -189,7 +189,7 @@ $(document).ready(function() { $('#text').bind('input propertychange', function () { if (!locked) { - autoSave.text('' + (lastSaveTime ? ' (: ' + lastSaveTime + ')' : '')); + autoSave.text('' + (lastSaveTime ? ' (: ' + lastSaveTime + ')' : '')); } if (!autoSaveOnce) { @@ -258,11 +258,13 @@ $(document).ready(function() { }); // 全屏上传按钮控制 - // $('#btn-fullscreen-upload').click(function() { - // $(this).toggleClass('active'); - // $('#tab-files').toggle(); - // return false; - // }); + $('#btn-fullscreen-upload').click(function() { + $(this).toggleClass('active'); + $('.tab-content').toggleClass('hidden'); + $('.typecho-option-tabs li').toggleClass('active'); + + return false; + }); }); diff --git a/admin/write-page.php b/admin/write-page.php index 7e87ee8d..f1314b1f 100644 --- a/admin/write-page.php +++ b/admin/write-page.php @@ -41,6 +41,7 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);

+ diff --git a/admin/write-post.php b/admin/write-post.php index e9219b45..b29fd16c 100644 --- a/admin/write-post.php +++ b/admin/write-post.php @@ -46,7 +46,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);

- +