diff --git a/admin/css/style.css b/admin/css/style.css index 703711b5..a4151395 100644 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -122,6 +122,11 @@ button { border: none; background-color: #e9e9e6; cursor: pointer; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + -ms-border-radius: 2px; + -o-border-radius: 2px; + border-radius: 2px; display: inline-block; padding: 0 12px; height: 32px; @@ -146,17 +151,15 @@ button { font-size: 1.14286em; font-weight: bold; } -button, .dropdown-menu { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - -ms-border-radius: 2px; - -o-border-radius: 2px; - border-radius: 2px; } - .primary { border: none; background-color: #467b96; cursor: pointer; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + -ms-border-radius: 2px; + -o-border-radius: 2px; + border-radius: 2px; color: #FFF; } .primary:hover { background-color: #41728c; } @@ -169,17 +172,13 @@ button, .dropdown-menu { .btn-group { display: inline-block; } -.btn-group > a, .btn-group > span { - -webkit-border-radius: 0; - -moz-border-radius: 0; - -ms-border-radius: 0; - -o-border-radius: 0; - border-radius: 0; - margin-left: -1px; } - +/* 下拉菜单 */ .btn-drop { position: relative; } +.dropdown-toggle { + padding-right: 8px; } + .dropdown-menu { list-style: none; position: absolute; @@ -187,23 +186,22 @@ button, .dropdown-menu { left: 0; margin: 0; padding: 0; - background: #f9f9f7; + border: 1px solid #D9D9D6; + background: #FFF; text-align: left; min-width: 108px; display: none; } .dropdown-menu li { white-space: nowrap; } - -.dropdown-menu li p { - padding: 5px 15px; } - -.dropdown-menu li a { - display: block; - padding: 3px 15px; - color: #666; } - .dropdown-menu li a:hover { - background: #e9e9e9; - text-decoration: none !important; } + .dropdown-menu li.multiline { + padding: 5px 12px 12px; } + .dropdown-menu a { + display: block; + padding: 5px 12px; + color: #666; } + .dropdown-menu a:hover { + background: #F6F6F3; + text-decoration: none !important; } /** * 提示信息框 @@ -661,13 +659,19 @@ a.operate-reply { border-top: 1px solid #F0F0EC; word-break: break-all; } +.typecho-list-table .status { + margin-left: 5px; + color: #999; + font-size: .92857em; + font-style: normal; } + .typecho-list-table tbody tr:hover td { background-color: #F6F6F3; } .typecho-list-table tbody tr.checked td { background-color: #FFF9E8; } -.typecho-list-table .warning { +.warning { color: #B94A48; } .typecho-list-table tr td .hidden-by-mouse { @@ -884,7 +888,7 @@ a.operate-reply { .typecho-page-main ul.tag-list li { display: inline-block; margin: 0 0 5px 0; - padding: 5px 10px; + padding: 5px 5px 5px 10px; cursor: pointer; } .typecho-page-main ul.tag-list li:hover { @@ -931,19 +935,9 @@ a.operate-reply { color: #999; font-size: .92857em; } -#upload-panel.drag, .tDnD_whileDrag { +#upload-panel.drag { background-color: #FFFBCC; } -.tDnD_whileDrag { - -ms-transform-origin: 20% 0; - -moz-transform-origin: 20% 0; - -webkit-transform-origin: 20% 0; - transform-origin: 20% 0; - -ms-transform: rotate(2deg); - -moz-transform: rotate(2deg); - -webkit-transform: rotate(2deg); - webkit-transform: rotate(2deg); } - #file-list { list-style: none; margin: 0; @@ -956,9 +950,49 @@ a.operate-reply { margin-left: 5px; color: #B94A48; } +/* 拖动排序 */ +.tDnD_whileDrag { + background-color: #FFFBCC; + -webkit-transform-origin: 20% 0; + -moz-transform-origin: 20% 0; + -ms-transform-origin: 20% 0; + -o-transform-origin: 20% 0; + transform-origin: 20% 0; + -webkit-transform: rotate(2deg); + -moz-transform: rotate(2deg); + -ms-transform: rotate(2deg); + -o-transform: rotate(2deg); + transform: rotate(2deg); } + /** * 导入扩展样式 */ +/** + * icons + */ +.i-edit, .i-delete, .i-caret-up, .i-caret-down, .i-exlink { + width: 16px; + height: 16px; + display: inline-block; + vertical-align: text-bottom; + background: url('../images/icons-s2ae04ce87c.png'); + background: url(../images/icons.png) no-repeat; } + +.i-edit { + background-position: 0 -32px; } + +.i-delete { + background-position: 0 -16px; } + +.i-caret-up { + background-position: 0 -64px; } + +.i-caret-down { + background-position: 0 -48px; } + +.i-exlink { + background-position: 0 0; } + .typecho-mime { background-image: url(../images/mime.gif); background-repeat: no-repeat; diff --git a/admin/file-upload.php b/admin/file-upload.php index 32f9b7d3..37b9d077 100644 --- a/admin/file-upload.php +++ b/admin/file-upload.php @@ -16,7 +16,7 @@ if (isset($post) || isset($page)) { 将要上传的文件拖放到这里 或者 选择文件上传 diff --git a/admin/images/icons.png b/admin/images/icons.png new file mode 100644 index 00000000..83c8be1a Binary files /dev/null and b/admin/images/icons.png differ diff --git a/admin/images/icons/icon-caret-down.png b/admin/images/icons/icon-caret-down.png new file mode 100644 index 00000000..01459bb8 Binary files /dev/null and b/admin/images/icons/icon-caret-down.png differ diff --git a/admin/images/icons/icon-caret-up.png b/admin/images/icons/icon-caret-up.png new file mode 100644 index 00000000..69d8bb87 Binary files /dev/null and b/admin/images/icons/icon-caret-up.png differ diff --git a/admin/images/icons/icon-delete.png b/admin/images/icons/icon-delete.png new file mode 100644 index 00000000..db8f6faa Binary files /dev/null and b/admin/images/icons/icon-delete.png differ diff --git a/admin/images/icons/icon-edit.png b/admin/images/icons/icon-edit.png new file mode 100644 index 00000000..5256fa87 Binary files /dev/null and b/admin/images/icons/icon-edit.png differ diff --git a/admin/images/icons/icon-exlink.png b/admin/images/icons/icon-exlink.png new file mode 100644 index 00000000..dcb008f8 Binary files /dev/null and b/admin/images/icons/icon-exlink.png differ diff --git a/admin/images/link.png b/admin/images/link.png deleted file mode 100644 index 25eacb7c..00000000 Binary files a/admin/images/link.png and /dev/null differ diff --git a/admin/images/noscreen.gif b/admin/images/noscreen.gif deleted file mode 100644 index 2ff8a29e..00000000 Binary files a/admin/images/noscreen.gif and /dev/null differ diff --git a/admin/images/size-btn.gif b/admin/images/size-btn.gif deleted file mode 100644 index 911ee9f9..00000000 Binary files a/admin/images/size-btn.gif and /dev/null differ diff --git a/admin/manage-comments.php b/admin/manage-comments.php index 6c15f7e1..aeaa86cd 100644 --- a/admin/manage-comments.php +++ b/admin/manage-comments.php @@ -45,7 +45,7 @@ $comments = Typecho_Widget::widget('Widget_Comments_Admin');
- +
author(true); ?> - type): ?> - () - mail): ?>
mail(); ?> diff --git a/admin/manage-medias.php b/admin/manage-medias.php index c5cc77b5..acc63e55 100644 --- a/admin/manage-medias.php +++ b/admin/manage-medias.php @@ -18,7 +18,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
- +
@@ -63,7 +63,7 @@ $stat = Typecho_Widget::widget('Widget_Stat'); commentsNum(); ?> title(); ?> - view + author(); ?> diff --git a/admin/manage-metas.php b/admin/manage-metas.php index cd44e9cd..83631078 100644 --- a/admin/manage-metas.php +++ b/admin/manage-metas.php @@ -23,14 +23,16 @@ include 'menu.php';
- +
    • -

  • -

    • +
  • + + +
@@ -58,7 +60,7 @@ include 'menu.php'; name(); ?> - view + slug(); ?> @@ -86,12 +88,14 @@ include 'menu.php';
- +
    • -

  • -

    • +
  • + + +
@@ -103,7 +107,7 @@ include 'menu.php';
  • name(); ?> - ✎ +
    • diff --git a/admin/manage-pages.php b/admin/manage-pages.php index f2fd16cd..6c025614 100644 --- a/admin/manage-pages.php +++ b/admin/manage-pages.php @@ -15,7 +15,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
    - +
    @@ -73,7 +73,7 @@ $stat = Typecho_Widget::widget('Widget_Stat'); } ?> type): ?> - view + slug(); ?> diff --git a/admin/manage-posts.php b/admin/manage-posts.php index f78cfefc..e43ff199 100644 --- a/admin/manage-posts.php +++ b/admin/manage-posts.php @@ -15,7 +15,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
    - +
    @@ -72,17 +72,17 @@ $stat = Typecho_Widget::widget('Widget_Stat'); title(); ?> hasSaved || 'post_draft' == $posts->type) { - echo '(' . _t('草稿') . ')'; + echo '' . _t('草稿') . ''; } else if ('waiting' == $posts->status) { - echo '(' . _t('待审核') . ')'; + echo '' . _t('待审核') . ''; } else if ('private' == $posts->status) { - echo '(' . _t('私密') . ')'; + echo '' . _t('私密') . ''; } else if ($posts->password) { - echo '(' . _t('密码保护') . ')'; + echo '' . _t('密码保护') . ''; } ?> type): ?> - view + author(); ?> diff --git a/admin/manage-users.php b/admin/manage-users.php index 2d648666..39d149c9 100644 --- a/admin/manage-users.php +++ b/admin/manage-users.php @@ -13,7 +13,7 @@ include 'menu.php';
    - +
    @@ -56,7 +56,7 @@ include 'menu.php'; postsNum(); ?> name(); ?> - view + screenName(); ?> mail): ?>mail(); ?> diff --git a/admin/scss/_buttons.scss b/admin/scss/_buttons.scss index 6dbba693..96a2f576 100644 --- a/admin/scss/_buttons.scss +++ b/admin/scss/_buttons.scss @@ -9,6 +9,8 @@ background-color: $color; cursor: pointer; + @include border-radius(2px); + &:hover { background-color: darken($color, 3%); // @include background-image(linear-gradient($color, darken($color, 3%))); @@ -40,10 +42,6 @@ button { .btn-s { height: 28px; } .btn-l { height: 40px; font-size: 1.14286em; font-weight: bold; } -button, .dropdown-menu { - @include border-radius(2px); -} - .primary { @include button(#467B96); color: #FFF; @@ -53,19 +51,13 @@ button, .dropdown-menu { display: inline-block; } -.btn-group > a, .btn-group > span { - -webkit-border-radius: 0; - -moz-border-radius: 0; - -ms-border-radius: 0; - -o-border-radius: 0; - border-radius: 0; - margin-left: -1px; -} - +/* 下拉菜单 */ .btn-drop { position: relative; } - +.dropdown-toggle { + padding-right: 8px; +} .dropdown-menu { list-style: none; position: absolute; @@ -73,27 +65,26 @@ button, .dropdown-menu { left: 0; margin: 0; padding: 0; - background: #f9f9f7; + border: 1px solid #D9D9D6; + background: #FFF; text-align: left; min-width: 108px; display: none; li { white-space: nowrap; + &.multiline { + padding: 5px 12px 12px; + } + } + + a { + display: block; + padding: 5px 12px; + color: #666; + &:hover { + background: #F6F6F3; + text-decoration: none !important; + } } } - -.dropdown-menu li p { - padding: 5px 15px; -} - -.dropdown-menu li a { - display: block; - padding: 3px 15px; - color: #666; - &:hover { - background: #e9e9e9; - text-decoration: none !important; - } -} - diff --git a/admin/scss/_icons.scss b/admin/scss/_icons.scss new file mode 100644 index 00000000..7cc82791 --- /dev/null +++ b/admin/scss/_icons.scss @@ -0,0 +1,35 @@ +/** + * icons + */ + +$icons: sprite-map("icons/*.png"); + +%i-16 { + width: 16px; + height: 16px; + display: inline-block; + vertical-align: text-bottom; + background: $icons; + background: url(../images/icons.png) no-repeat; +} + +.i-edit { + @extend %i-16; + background-position: sprite-position($icons, icon-edit); +} +.i-delete { + @extend %i-16; + background-position: sprite-position($icons, icon-delete); +} +.i-caret-up { + @extend %i-16; + background-position: sprite-position($icons, icon-caret-up); +} +.i-caret-down { + @extend %i-16; + background-position: sprite-position($icons, icon-caret-down); +} +.i-exlink { + @extend %i-16; + background-position: sprite-position($icons, icon-exlink); +} diff --git a/admin/scss/style.scss b/admin/scss/style.scss index 2c35a56e..be2ebdce 100644 --- a/admin/scss/style.scss +++ b/admin/scss/style.scss @@ -8,6 +8,8 @@ * @version $Id: grid.source.css 470 2008-09-26 15:23:38Z i.feelinglucky $ */ +@import "compass"; + /** * Typecho 全局样式 */ @@ -419,6 +421,12 @@ a.operate-reply { border-top: 1px solid #F0F0EC; word-break: break-all; } +.typecho-list-table .status { + margin-left: 5px; + color: #999; + font-size: .92857em; + font-style: normal; +} .typecho-list-table tbody tr:hover td { background-color: #F6F6F3; } @@ -427,7 +435,7 @@ a.operate-reply { background-color: #FFF9E8; } -.typecho-list-table .warning { +.warning { color: #B94A48; } @@ -698,7 +706,7 @@ background: #FFF1A8; .typecho-page-main ul.tag-list li { display: inline-block; margin: 0 0 5px 0; - padding: 5px 10px; + padding: 5px 5px 5px 10px; cursor: pointer; } .typecho-page-main ul.tag-list li:hover { @@ -740,20 +748,9 @@ background: #FFF1A8; font-size: .92857em; } -#upload-panel.drag, .tDnD_whileDrag { +#upload-panel.drag { background-color: #FFFBCC; } -.tDnD_whileDrag { - -ms-transform-origin: 20% 0; - -moz-transform-origin: 20% 0; - -webkit-transform-origin: 20% 0; - transform-origin: 20% 0; - - -ms-transform: rotate(2deg); - -moz-transform: rotate(2deg); - -webkit-transform: rotate(2deg); - webkit-transform: rotate(2deg); -} #file-list { list-style: none; @@ -764,9 +761,18 @@ background: #FFF1A8; #file-list .delete { margin-left: 5px; color: #B94A48; } +/* 拖动排序 */ +.tDnD_whileDrag { + background-color: #FFFBCC; + @include transform-origin(20%, 0); + @include rotate(2deg); +} + + /** * 导入扩展样式 */ +@import "icons"; @import "components"; -@import "hidden"; \ No newline at end of file +@import "hidden"; diff --git a/admin/upgrade.php b/admin/upgrade.php index 0258db46..98cf23f3 100644 --- a/admin/upgrade.php +++ b/admin/upgrade.php @@ -9,18 +9,15 @@ include 'menu.php';
    -
    +
    -
    -
    +

    • %s 升级到 %s', $options->version, Typecho_Common::VERSION); ?>
      • -
      • +
    -
    -