diff --git a/.gitignore b/.gitignore index cd0f9ed8..73f184b8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .*.swo ._* .DS_Store -/Debug/ /ImgCache/ /Backup_rar/ /Debug/ diff --git a/admin/css/style.css b/admin/css/style.css index 7e84092d..15a27499 100644 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -209,6 +209,11 @@ button { background-color: #c1605e; cursor: default; } +.btn-text { + background: transparent; } + .btn-text:hover, .btn-text:active, .btn-text.active { + background: #F3F3F0; } + /* 下拉菜单 */ .btn-drop { position: relative; } @@ -1022,6 +1027,8 @@ a.operate-reply { list-style: none; border: 1px solid #D9D9D6; padding: 6px 12px; + max-height: 240px; + overflow: auto; background-color: #FFF; border-radius: 2px; } @@ -1103,7 +1110,8 @@ a.operate-reply { #file-list { list-style: none; margin: 0 10px; - padding: 0; } + padding: 0; + word-break: break-all; } #file-list li { padding: 8px 0; border-top: 1px dashed #D9D9D6; } @@ -1118,6 +1126,9 @@ a.operate-reply { #file-list .info { text-transform: uppercase; } +#btn-fullscreen-upload { + visibility: hidden; } + /** * 附件管理 */ @@ -1148,24 +1159,25 @@ a.operate-reply { /** * icons */ -.icon-sprite-hack { - background: url('../img/icons-s2ebed63329.png'); } - -.i-edit, .i-delete, .i-exlink, .mime-office, .mime-text, .mime-image, .mime-html, .mime-archive, .mime-application, .mime-audio, .mime-script, .mime-video, .mime-unknow { +.i-edit, .i-delete, .i-upload, .i-exlink, .mime-office, .mime-text, .mime-image, .mime-html, .mime-archive, .mime-application, .mime-audio, .mime-script, .mime-video, .mime-unknow { width: 16px; height: 16px; display: inline-block; vertical-align: text-bottom; - background: url(../img/icons.png) no-repeat; } - .i-edit:hover, .i-delete:hover, .i-exlink:hover, .mime-office:hover, .mime-text:hover, .mime-image:hover, .mime-html:hover, .mime-archive:hover, .mime-application:hover, .mime-audio:hover, .mime-script:hover, .mime-video:hover, .mime-unknow:hover { + background: url('../img/icons-s93f9ba6074.png') no-repeat; + text-indent: -9999em; } + .i-edit:hover, .i-delete:hover, .i-upload:hover, .i-exlink:hover, .mime-office:hover, .mime-text:hover, .mime-image:hover, .mime-html:hover, .mime-archive:hover, .mime-application:hover, .mime-audio:hover, .mime-script:hover, .mime-video:hover, .mime-unknow:hover { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=75); opacity: 0.75; } .i-edit { - background-position: 0 -32px; } + background-position: 0 -48px; } .i-delete { - background-position: 0 -16px; } + background-position: 0 -32px; } + +.i-upload { + background-position: 0 0; } .i-caret-up, .i-caret-down, .i-caret-left, .i-caret-right { display: inline-block; @@ -1186,35 +1198,35 @@ a.operate-reply { border-width: 4px 3px 4px 5px; } .i-exlink { - background-position: 0 0; } + background-position: 0 -16px; } /* 文件类型图标 */ .mime-office { - background-position: 0 -80px; } + background-position: 0 -96px; } .mime-text { background-position: 0 -176px; } .mime-image { - background-position: 0 -48px; } + background-position: 0 -64px; } .mime-html { - background-position: 0 -96px; } + background-position: 0 -112px; } .mime-archive { background-position: 0 -192px; } .mime-application { - background-position: 0 -112px; } + background-position: 0 -128px; } .mime-audio { - background-position: 0 -224px; } + background-position: 0 -208px; } .mime-script { background-position: 0 -144px; } .mime-video { - background-position: 0 -64px; } + background-position: 0 -80px; } .mime-unknow { background-position: 0 -160px; } @@ -1350,7 +1362,7 @@ a.operate-reply { background: #F3F3F0; font-size: .92857em; } #wmd-preview code { - color: #B94A48; } + color: #C13; } #wmd-preview pre { padding: 1em; } #wmd-preview pre code { @@ -1417,18 +1429,24 @@ 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, .fullscreen .url-slug, .fullscreen .typecho-page-title, .fullscreen .typecho-head-nav, -.fullscreen .message, -.fullscreen #upload-panel { +.fullscreen .message { display: none; } .fullscreen .wmd-hidetab { display: block; } -.fullscreen .wmd-visualhide { +.fullscreen .wmd-visualhide, +.fullscreen #btn-fullscreen-upload { visibility: visible; } /** diff --git a/admin/img/icons-2x/icon-arrow-down-2x.png b/admin/img/icons-2x/icon-arrow-down-2x.png deleted file mode 100644 index 1fefa5a0..00000000 Binary files a/admin/img/icons-2x/icon-arrow-down-2x.png and /dev/null differ diff --git a/admin/img/icons-2x/icon-arrow-up-2x.png b/admin/img/icons-2x/icon-arrow-up-2x.png deleted file mode 100644 index b7a7e475..00000000 Binary files a/admin/img/icons-2x/icon-arrow-up-2x.png and /dev/null differ diff --git a/admin/img/icons-2x/icon-upload-2x.png b/admin/img/icons-2x/icon-upload-2x.png new file mode 100644 index 00000000..fe50c19a Binary files /dev/null and b/admin/img/icons-2x/icon-upload-2x.png differ diff --git a/admin/img/icons-s2ebed63329.png b/admin/img/icons-s2ebed63329.png deleted file mode 100644 index 1a21b00d..00000000 Binary files a/admin/img/icons-s2ebed63329.png and /dev/null differ diff --git a/admin/img/icons-s93f9ba6074.png b/admin/img/icons-s93f9ba6074.png new file mode 100644 index 00000000..91cae2f0 Binary files /dev/null and b/admin/img/icons-s93f9ba6074.png differ diff --git a/admin/img/icons/icon-caret-down.png b/admin/img/icons/icon-caret-down.png deleted file mode 100644 index 01459bb8..00000000 Binary files a/admin/img/icons/icon-caret-down.png and /dev/null differ diff --git a/admin/img/icons/icon-caret-up.png b/admin/img/icons/icon-caret-up.png deleted file mode 100644 index 69d8bb87..00000000 Binary files a/admin/img/icons/icon-caret-up.png and /dev/null differ diff --git a/admin/img/icons/icon-upload.png b/admin/img/icons/icon-upload.png new file mode 100644 index 00000000..d39fc572 Binary files /dev/null and b/admin/img/icons/icon-upload.png differ diff --git a/admin/scss/_buttons.scss b/admin/scss/_buttons.scss index 64dd2eb8..b547754b 100644 --- a/admin/scss/_buttons.scss +++ b/admin/scss/_buttons.scss @@ -65,6 +65,13 @@ button { color: #FFF; } +.btn-text { + background: transparent; + &:hover, &:active, &.active { + background: #F3F3F0; + } +} + /* 下拉菜单 */ .btn-drop { position: relative; diff --git a/admin/scss/_icons.scss b/admin/scss/_icons.scss index 1d146fe5..a04557ca 100644 --- a/admin/scss/_icons.scss +++ b/admin/scss/_icons.scss @@ -5,19 +5,13 @@ $icons: sprite-map("icons/*.png"); $icons-2x: sprite-map("icons-2x/*.png"); -.icon-sprite-hack { - background: $icons; -} -// .icon-2x-sprite-hack { -// background: $icons-2x; -// } - %i-16 { width: 16px; height: 16px; display: inline-block; vertical-align: text-bottom; - background: url(../img/icons.png) no-repeat; + background: $icons no-repeat; + text-indent: -9999em; &:hover { @include opacity(0.75); } @@ -31,6 +25,10 @@ $icons-2x: sprite-map("icons-2x/*.png"); @extend %i-16; background-position: sprite-position($icons, icon-delete); } +.i-upload { + @extend %i-16; + background-position: sprite-position($icons, icon-upload); +} // 小箭头 .i-caret-up, .i-caret-down, .i-caret-left, .i-caret-right { diff --git a/admin/scss/_mixin.scss b/admin/scss/_mixin.scss deleted file mode 100644 index 52924c9a..00000000 --- a/admin/scss/_mixin.scss +++ /dev/null @@ -1,5 +0,0 @@ -@mixin calc($property, $expression) { - #{$property}: -moz-calc(#{$expression}); - #{$property}: -webkit-calc(#{$expression}); - #{$property}: calc(#{$expression}); -} \ No newline at end of file diff --git a/admin/scss/components/_editor.scss b/admin/scss/components/_editor.scss index d3947337..01f775b4 100644 --- a/admin/scss/components/_editor.scss +++ b/admin/scss/components/_editor.scss @@ -108,7 +108,7 @@ background: #F3F3F0; font-size: .92857em; } - code { color: #B94A48; } + code { color: #C13; } pre { padding: 1em; code { @@ -183,16 +183,26 @@ padding: 10px 20px; border-bottom: 1px solid #F3F3F0; } + + // 全屏附件上传 + #tab-files { + position: absolute; + top: 52px; + right: 20px; + width: 280px; + z-index: 1001; + } + .wmd-edittab, .typecho-post-option, .title, .url-slug, .typecho-page-title, .typecho-head-nav, - .message, - #upload-panel { display: none; } + .message { display: none; } .wmd-hidetab { display: block; } - .wmd-visualhide { + .wmd-visualhide, + #btn-fullscreen-upload { visibility: visible; } } \ No newline at end of file diff --git a/admin/scss/style.scss b/admin/scss/style.scss index a843cca2..71b6d44f 100644 --- a/admin/scss/style.scss +++ b/admin/scss/style.scss @@ -10,7 +10,6 @@ */ @import "compass"; -@import "mixin"; /** * Typecho 全局样式 @@ -794,6 +793,8 @@ background: #FFF1A8; list-style: none; border: 1px solid #D9D9D6; padding: 6px 12px; + max-height: 240px; + overflow: auto; background-color: #FFF; border-radius: 2px; } @@ -878,6 +879,7 @@ background: #FFF1A8; list-style: none; margin: 0 10px; padding: 0; + word-break: break-all; li { padding: 8px 0; border-top: 1px dashed #D9D9D6; @@ -897,6 +899,10 @@ background: #FFF1A8; } } +#btn-fullscreen-upload { + visibility: hidden; +} + /** * 附件管理 diff --git a/admin/write-js.php b/admin/write-js.php index f7586856..5c5c6246 100644 --- a/admin/write-js.php +++ b/admin/write-js.php @@ -256,6 +256,13 @@ $(document).ready(function() { return false; }); + + // 全屏上传按钮控制 + // $('#btn-fullscreen-upload').click(function() { + // $(this).toggleClass('active'); + // $('#tab-files').toggle(); + // return false; + // }); }); diff --git a/admin/write-post.php b/admin/write-post.php index 50e2b4a6..700524aa 100644 --- a/admin/write-post.php +++ b/admin/write-post.php @@ -46,6 +46,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);

+