From fb779b8b3d01522fd0855d2fc9a490d575636147 Mon Sep 17 00:00:00 2001 From: fen Date: Sun, 27 Oct 2013 11:34:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E5=B1=8F=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=9A=84=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/css/style.css | 16 +++++++++++----- admin/scss/components/_editor.scss | 17 ++++++++++++----- usr/themes/replica/style.css | 2 -- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/admin/css/style.css b/admin/css/style.css index 0666b209..0e558ca5 100644 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -1124,7 +1124,6 @@ a.operate-reply { #wmd-preview { background: #FFF; padding: 10px 20px; - word-break: break-all; word-wrap: break-word; } #wmd-preview img { max-width: 100%; } @@ -1146,7 +1145,7 @@ a.operate-reply { border-width: 2px 0 0 0; } /* 编辑器全屏 */ -.fullscreen #wmd-button-bar, .fullscreen #text, .fullscreen #wmd-preview { +.fullscreen #wmd-button-bar, .fullscreen #text, .fullscreen #wmd-preview, .fullscreen .submit { position: absolute; top: 0; width: 50%; @@ -1157,14 +1156,14 @@ a.operate-reply { box-sizing: border-box; } .fullscreen #wmd-button-bar { left: 0; - padding: 10px 20px; + padding: 13px 20px; z-index: 1000; } .fullscreen #text { - top: 46px; + top: 52px; left: 0; padding: 20px; border: none; - border-top: 1px solid #F6F6F3; + border-top: 1px solid #F3F3F0; outline: none; -webkit-border-radius: 0; -moz-border-radius: 0; @@ -1172,13 +1171,20 @@ a.operate-reply { -o-border-radius: 0; border-radius: 0; } .fullscreen #wmd-preview { + top: 52px; right: 0; padding: 5px 20px; + border: 1px solid #F3F3F0; + border-width: 1px 0 0 1px; height: 100%; background: #F6F6F3; overflow: auto; } .fullscreen #wmd-preview code, .fullscreen #wmd-preview pre { background: #F0F0EC; } +.fullscreen .submit { + right: 0; + margin: 0; + padding: 10px 20px; } /** * Jquery Timepicker diff --git a/admin/scss/components/_editor.scss b/admin/scss/components/_editor.scss index c63a8663..503932da 100644 --- a/admin/scss/components/_editor.scss +++ b/admin/scss/components/_editor.scss @@ -67,7 +67,6 @@ #wmd-preview { background: #FFF; padding: 10px 20px; - word-break: break-all; word-wrap: break-word; img { max-width: 100%; } code, pre { @@ -92,7 +91,7 @@ /* 编辑器全屏 */ .fullscreen { - #wmd-button-bar, #text, #wmd-preview { + #wmd-button-bar, #text, #wmd-preview, .submit { position: absolute; top: 0; width: 50%; @@ -102,21 +101,24 @@ } #wmd-button-bar { left: 0; - padding: 10px 20px; + padding: 13px 20px; z-index: 1000; } #text { - top: 46px; + top: 52px; left: 0; padding: 20px; border: none; - border-top: 1px solid #F6F6F3; + border-top: 1px solid #F3F3F0; outline: none; @include border-radius(0); } #wmd-preview { + top: 52px; right: 0; padding: 5px 20px; + border: 1px solid #F3F3F0; + border-width: 1px 0 0 1px; height: 100%; background: #F6F6F3; overflow: auto; @@ -124,4 +126,9 @@ background: #F0F0EC; } } + .submit { + right: 0; + margin: 0; + padding: 10px 20px; + } } \ No newline at end of file diff --git a/usr/themes/replica/style.css b/usr/themes/replica/style.css index 24d80a4a..04f12d7f 100644 --- a/usr/themes/replica/style.css +++ b/usr/themes/replica/style.css @@ -279,7 +279,6 @@ textarea { #sidebar { display: none; padding-top: 20px; - word-break: break-all; word-wrap: break-word; } .widget { @@ -324,7 +323,6 @@ textarea { *--------------- */ .post-content, .comment-content { line-height: 1.5; - word-break: break-all; word-wrap: break-word; } .post-content h2, .comment-content h2 {