diff --git a/admin/css/style.css b/admin/css/style.css index f3966643..fabb62b5 100644 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -147,7 +147,8 @@ select { * Buttons */ /* line 28, ../scss/_buttons.scss */ -.btn { +.btn, #ui-datepicker-div .ui-datepicker-current, +#ui-datepicker-div .ui-datepicker-close { border: none; background-color: #e9e9e6; cursor: pointer; @@ -163,39 +164,46 @@ select { vertical-align: middle; zoom: 1; } /* line 15, ../scss/_buttons.scss */ - .btn:hover { + .btn:hover, #ui-datepicker-div .ui-datepicker-current:hover, + #ui-datepicker-div .ui-datepicker-close:hover { -webkit-transition-duration: 0.4s; -moz-transition-duration: 0.4s; -o-transition-duration: 0.4s; transition-duration: 0.4s; background-color: #dbdbd6; } /* line 19, ../scss/_buttons.scss */ - .btn:active, .btn.active { + .btn:active, #ui-datepicker-div .ui-datepicker-current:active, + #ui-datepicker-div .ui-datepicker-close:active, .btn.active, #ui-datepicker-div .active.ui-datepicker-current, + #ui-datepicker-div .active.ui-datepicker-close { background-color: #d6d6d0; } /* line 22, ../scss/_buttons.scss */ - .btn:disabled { + .btn:disabled, #ui-datepicker-div .ui-datepicker-current:disabled, + #ui-datepicker-div .ui-datepicker-close:disabled { background-color: #f7f7f6; cursor: default; } /* line 38, ../scss/_buttons.scss */ - .btn:disabled { + .btn:disabled, #ui-datepicker-div .ui-datepicker-current:disabled, + #ui-datepicker-div .ui-datepicker-close:disabled { color: #999; } /* line 43, ../scss/_buttons.scss */ -.btn-xs { +.btn-xs, #ui-datepicker-div .ui-datepicker-current, +#ui-datepicker-div .ui-datepicker-close { padding: 0 10px; - height: 25px; } + height: 25px; + font-size: 13px; } -/* line 47, ../scss/_buttons.scss */ +/* line 48, ../scss/_buttons.scss */ .btn-s { height: 28px; } -/* line 48, ../scss/_buttons.scss */ +/* line 49, ../scss/_buttons.scss */ .btn-l { height: 40px; font-size: 1.14286em; font-weight: bold; } -/* line 54, ../scss/_buttons.scss */ +/* line 55, ../scss/_buttons.scss */ .primary { border: none; background-color: #467b96; @@ -221,11 +229,11 @@ select { background-color: #508cab; cursor: default; } -/* line 59, ../scss/_buttons.scss */ +/* line 60, ../scss/_buttons.scss */ .btn-group { display: inline-block; } -/* line 63, ../scss/_buttons.scss */ +/* line 64, ../scss/_buttons.scss */ .btn-warn { border: none; background-color: #b94a48; @@ -251,7 +259,7 @@ select { background-color: #c1605e; cursor: default; } -/* line 72, ../scss/_buttons.scss */ +/* line 73, ../scss/_buttons.scss */ .btn-link, .btn-link:hover, .btn-link:focus, @@ -260,15 +268,15 @@ select { background-color: transparent; } /* 下拉菜单 */ -/* line 77, ../scss/_buttons.scss */ +/* line 78, ../scss/_buttons.scss */ .btn-drop { position: relative; } -/* line 80, ../scss/_buttons.scss */ +/* line 81, ../scss/_buttons.scss */ .dropdown-toggle { padding-right: 8px; } -/* line 83, ../scss/_buttons.scss */ +/* line 84, ../scss/_buttons.scss */ .dropdown-menu { list-style: none; position: absolute; @@ -281,18 +289,18 @@ select { text-align: left; min-width: 108px; display: none; } - /* line 96, ../scss/_buttons.scss */ + /* line 97, ../scss/_buttons.scss */ .dropdown-menu li { white-space: nowrap; } - /* line 98, ../scss/_buttons.scss */ + /* line 99, ../scss/_buttons.scss */ .dropdown-menu li.multiline { padding: 5px 12px 12px; } - /* line 103, ../scss/_buttons.scss */ + /* line 104, ../scss/_buttons.scss */ .dropdown-menu a { display: block; padding: 5px 12px; color: #666; } - /* line 107, ../scss/_buttons.scss */ + /* line 108, ../scss/_buttons.scss */ .dropdown-menu a:hover { background: #F6F6F3; text-decoration: none !important; } @@ -1169,67 +1177,63 @@ a.operate-reply { resize: none; } /* line 730, ../scss/style.scss */ -#advance-panel-btn { - font-size: .92857em; } - -/* line 734, ../scss/style.scss */ #advance-panel { display: none; } -/* line 738, ../scss/style.scss */ +/* line 734, ../scss/style.scss */ #custom-field { margin: 1em 0; padding: 10px 15px; background: #FFF; } - /* line 743, ../scss/style.scss */ + /* line 739, ../scss/style.scss */ #custom-field.fold table, #custom-field.fold .description { display: none; } - /* line 746, ../scss/style.scss */ + /* line 742, ../scss/style.scss */ #custom-field .description { margin-top: 10px; text-align: right; } - /* line 749, ../scss/style.scss */ + /* line 745, ../scss/style.scss */ #custom-field .description button { float: left; } - /* line 754, ../scss/style.scss */ + /* line 750, ../scss/style.scss */ #custom-field .typecho-label { margin: 0; } - /* line 756, ../scss/style.scss */ + /* line 752, ../scss/style.scss */ #custom-field .typecho-label a { display: block; color: #444; } - /* line 759, ../scss/style.scss */ + /* line 755, ../scss/style.scss */ #custom-field .typecho-label a:hover { color: #467B96; text-decoration: none; } - /* line 765, ../scss/style.scss */ + /* line 761, ../scss/style.scss */ #custom-field table { margin-top: 10px; } - /* line 768, ../scss/style.scss */ + /* line 764, ../scss/style.scss */ #custom-field td { padding: 10px 5px; font-size: .92857em; border-bottom: 1px solid #F0F0EC; vertical-align: top; } - /* line 773, ../scss/style.scss */ + /* line 769, ../scss/style.scss */ #custom-field td label { font-size: 1em; font-weight: normal; } - /* line 778, ../scss/style.scss */ + /* line 774, ../scss/style.scss */ #custom-field select { height: 27px; } -/* line 781, ../scss/style.scss */ +/* line 777, ../scss/style.scss */ .typecho-post-area .is-draft { background: #FFF1A8; } -/* line 785, ../scss/style.scss */ +/* line 781, ../scss/style.scss */ .typecho-post-option .description { margin-top: -0.5em; color: #999; font-size: .92857em; } -/* line 791, ../scss/style.scss */ +/* line 787, ../scss/style.scss */ .category-option ul { list-style: none; border: 1px solid #D9D9D6; @@ -1239,11 +1243,11 @@ a.operate-reply { background-color: #FFF; border-radius: 2px; } -/* line 800, ../scss/style.scss */ +/* line 796, ../scss/style.scss */ .category-option li { margin: 3px 0; } -/* line 805, ../scss/style.scss */ +/* line 801, ../scss/style.scss */ .visibility-option ul, .allow-option ul { list-style: none; @@ -1252,61 +1256,61 @@ a.operate-reply { /** * 标签列表 */ -/* line 815, ../scss/style.scss */ +/* line 811, ../scss/style.scss */ .typecho-page-main ul.tag-list { list-style: none; margin: 0; padding: 20px; background-color: #FFF; } -/* line 822, ../scss/style.scss */ +/* line 818, ../scss/style.scss */ .typecho-page-main ul.tag-list li { display: inline-block; margin: 0 0 5px 0; padding: 5px 5px 5px 10px; cursor: pointer; } -/* line 828, ../scss/style.scss */ +/* line 824, ../scss/style.scss */ .typecho-page-main ul.tag-list li:hover { background-color: #E9E9E6; } -/* line 832, ../scss/style.scss */ +/* line 828, ../scss/style.scss */ .typecho-page-main ul.tag-list li input { display: none; } -/* line 837, ../scss/style.scss */ +/* line 833, ../scss/style.scss */ .typecho-page-main ul.tag-list li.checked { background-color: #FFFBCC; } -/* line 841, ../scss/style.scss */ +/* line 837, ../scss/style.scss */ .typecho-page-main ul.tag-list li.size-5 { font-size: 1em; } -/* line 842, ../scss/style.scss */ +/* line 838, ../scss/style.scss */ .typecho-page-main ul.tag-list li.size-10 { font-size: 1.2em; } -/* line 843, ../scss/style.scss */ +/* line 839, ../scss/style.scss */ .typecho-page-main ul.tag-list li.size-20 { font-size: 1.4em; } -/* line 844, ../scss/style.scss */ +/* line 840, ../scss/style.scss */ .typecho-page-main ul.tag-list li.size-30 { font-size: 1.6em; } -/* line 845, ../scss/style.scss */ +/* line 841, ../scss/style.scss */ .typecho-page-main ul.tag-list li.size-0 { font-size: 1.8em; } -/* line 847, ../scss/style.scss */ +/* line 843, ../scss/style.scss */ .typecho-page-main .tag-edit-link { visibility: hidden; } -/* line 848, ../scss/style.scss */ +/* line 844, ../scss/style.scss */ .typecho-page-main li:hover .tag-edit-link { visibility: visible; } -/* line 850, ../scss/style.scss */ +/* line 846, ../scss/style.scss */ .typecho-attachment-photo { border: 1px solid #E6E6E3; max-width: 100%; } @@ -1314,61 +1318,61 @@ a.operate-reply { /* * Upload */ -/* line 859, ../scss/style.scss */ +/* line 855, ../scss/style.scss */ #upload-panel { border: 1px dashed #D9D9D6; background-color: #FFF; color: #999; font-size: .92857em; } - /* line 864, ../scss/style.scss */ + /* line 860, ../scss/style.scss */ #upload-panel.drag { background-color: #FFFBCC; } -/* line 869, ../scss/style.scss */ +/* line 865, ../scss/style.scss */ .upload-area { padding: 15px; text-align: center; } -/* line 874, ../scss/style.scss */ +/* line 870, ../scss/style.scss */ #file-list { list-style: none; margin: 0 10px; padding: 0; word-break: break-all; } - /* line 880, ../scss/style.scss */ + /* line 876, ../scss/style.scss */ #file-list li, #file-list .insert { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 885, ../scss/style.scss */ + /* line 881, ../scss/style.scss */ #file-list li { padding: 8px 0; border-top: 1px dashed #D9D9D6; } - /* line 889, ../scss/style.scss */ + /* line 885, ../scss/style.scss */ #file-list .insert { display: block; max-width: 100%; } - /* line 893, ../scss/style.scss */ + /* line 889, ../scss/style.scss */ #file-list .file { margin-left: 5px; } - /* line 896, ../scss/style.scss */ + /* line 892, ../scss/style.scss */ #file-list .info { text-transform: uppercase; } -/* line 901, ../scss/style.scss */ +/* line 897, ../scss/style.scss */ #btn-fullscreen-upload { visibility: hidden; } /** * 附件管理 */ -/* line 909, ../scss/style.scss */ +/* line 905, ../scss/style.scss */ .edit-media button { margin-right: 6px; } /* 拖动调整 textarea 大小 */ -/* line 912, ../scss/style.scss */ +/* line 908, ../scss/style.scss */ .resize { display: block; margin: 2px auto 0; @@ -1377,14 +1381,14 @@ a.operate-reply { border-width: 1px 0; width: 60px; cursor: row-resize; } - /* line 920, ../scss/style.scss */ + /* line 916, ../scss/style.scss */ .resize i { display: block; height: 1px; background-color: #D9D9D6; } /* 拖动排序 */ -/* line 928, ../scss/style.scss */ +/* line 924, ../scss/style.scss */ .tDnD_whileDrag { background-color: #FFFBCC; } @@ -1865,19 +1869,16 @@ a.operate-reply { padding-top: 10px; border-top: 1px solid #EEE; } -/* line 74, ../scss/components/_timepicker.scss */ -#ui-datepicker-div button { - height: 28px; } - /* line 75, ../scss/components/_timepicker.scss */ -#ui-datepicker-div .ui-datepicker-current { +#ui-datepicker-div .ui-datepicker-current, +#ui-datepicker-div .ui-datepicker-close { float: left; } -/* line 78, ../scss/components/_timepicker.scss */ +/* line 80, ../scss/components/_timepicker.scss */ #ui-datepicker-div .ui-datepicker-close { float: right; } -/* line 80, ../scss/components/_timepicker.scss */ +/* line 84, ../scss/components/_timepicker.scss */ .ui-effects-transfer { border: 2px dotted #ccc; } diff --git a/admin/scss/_buttons.scss b/admin/scss/_buttons.scss index a965bf30..3c7292fb 100644 --- a/admin/scss/_buttons.scss +++ b/admin/scss/_buttons.scss @@ -43,6 +43,7 @@ .btn-xs { padding: 0 10px; height: 25px; + font-size: 13px; } .btn-s { height: 28px; } .btn-l { diff --git a/admin/scss/components/_timepicker.scss b/admin/scss/components/_timepicker.scss index aa14387f..3e088a67 100644 --- a/admin/scss/components/_timepicker.scss +++ b/admin/scss/components/_timepicker.scss @@ -71,10 +71,14 @@ padding-top: 10px; border-top: 1px solid #EEE; } -#ui-datepicker-div button { height: 28px; } -#ui-datepicker-div .ui-datepicker-current { +#ui-datepicker-div .ui-datepicker-current, +#ui-datepicker-div .ui-datepicker-close { float: left; + @extend .btn; + @extend .btn-xs; +} +#ui-datepicker-div .ui-datepicker-close { + float: right; } -#ui-datepicker-div .ui-datepicker-close { float: right; } .ui-effects-transfer { border: 2px dotted #ccc; } \ No newline at end of file diff --git a/admin/scss/style.scss b/admin/scss/style.scss index 30fd7e75..3abe6557 100644 --- a/admin/scss/style.scss +++ b/admin/scss/style.scss @@ -727,10 +727,6 @@ a.operate-reply { resize: none; } -#advance-panel-btn { - font-size: .92857em; -} - #advance-panel { display: none; }