From ae5017df1e6c856d1a34c8e6386b1d1324dc70de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= Date: Mon, 18 Jun 2018 23:11:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=BA=E7=A1=80=E8=89=B2?= =?UTF-8?q?=E8=B0=83,=E5=A2=9E=E5=8A=A0=E8=97=8F=E9=9D=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/var.scss | 17 +++++++++-------- src/js/datepicker/style.scss | 12 ++++++------ src/js/form/style.scss | 27 ++++++++++++++++++++++----- src/js/layer/skin/default.scss | 2 +- src/js/meditor/addon/attach.scss | 6 +++--- src/js/meditor/skin/main.scss | 12 ++++++------ src/js/pager/index.js | 10 +++++----- src/js/pager/main.scss | 29 ++++++++++++++++++++--------- src/js/tree/main.scss | 10 +++++----- 9 files changed, 77 insertions(+), 48 deletions(-) diff --git a/src/css/var.scss b/src/css/var.scss index 67f125f..4f2ba63 100644 --- a/src/css/var.scss +++ b/src/css/var.scss @@ -1,11 +1,12 @@ -$ct: #1abc9c #48c9b0 #16a085; -$cg: #4caf50 #81c784 #388e3c; -$cpp: #651fff #7c4dff #6200ea; -$cb: #2196f3 #64b5f6 #1976d2; -$cr: #ff5722 #ff7043 #e64a19; -$co: #ff9800 #ffa726 #f57c00; -$cp: #e7e8eb #ecf0f1 #d3d5db; -$cgr: #546e7a #607d8b #37474f; +$ct: #19b491 #3fc2a7 #16967a; +$cg: #2ecc71 #58d68d #27ae60; +$cpp: #9b59b6 #ac61ce #8e44ad; +$cb: #2d8dd6 #52a3de #2776b1; +$cr: #e34235 #e96458 #be382d; +$co: #f39c12 #ffb618 #e67e22; +$cp: #e7e8eb #ecf0f1 #bdc3c7; +$cgr: #8a9b9c #98acae #748182; +$cnb: #526273 #62778d #34495E; @mixin ts($c: all, $t: .2s, $m: ease-in-out){ transition:$c $t $m; diff --git a/src/js/datepicker/style.scss b/src/js/datepicker/style.scss index 75697f7..ff97f2b 100644 --- a/src/js/datepicker/style.scss +++ b/src/js/datepicker/style.scss @@ -7,21 +7,21 @@ */ @import "var.scss"; -.do-datepicker { position:relative;display:inline-block;width:100%; height:100%;color:nth($cgr, 1);font-size:14px; +.do-datepicker { position:relative;display:inline-block;width:100%; height:100%;color:nth($cnb, 1);font-size:14px; &.mini {width:155px;height:30px;line-height:30px;} &.medium {width:175px;height:35px;line-height:35px;} &.large {width:195px;height:40px;line-height:40px;} - a { text-decoration:none;color:nth($cgr, 1); + a { text-decoration:none;color:nth($cnb, 1); - &:hover {color:nth($cgr, 2);} - &:active {color:nth($cgr, 3);} + &:hover {color:nth($cnb, 2);} + &:active {color:nth($cnb, 3);} } .date-input {position:relative; display:block; width:100%; height:100%; - .input { width:100%; height:100%;padding:0 5px; line-height:18px; border:1px solid nth($cp, 1);color:nth($cgr, 1); @include ts(); + .input { width:100%; height:100%;padding:0 5px; line-height:18px; border:1px solid nth($cp, 3);color:nth($cnb, 1); @include ts(); &:focus { border-color:nth($ct, 1); } &[disabled] {background:#f7f8fb;cursor:not-allowed;} @@ -29,7 +29,7 @@ .icon {position:absolute;right:0;top:0;width:35px;text-align:center;font-size:25px;color:nth($cp, 3); } } - .calendar-box { position:absolute; left:0; top:100%; z-index:65534; width:267px; height:auto; min-height:60px;padding:10px;line-height:35px; border:1px solid #ddd; background:#fff; font-size:14px; color:nth($cgr, 1); text-align:center; box-shadow:0 1px 5px rgba(0, 0, 0, 0.1); + .calendar-box { position:absolute; left:0; top:100%; z-index:65534; width:267px; height:auto; min-height:60px;padding:10px;line-height:35px; border:1px solid #ddd; background:#fff; font-size:14px; color:nth($cnb, 1); text-align:center; box-shadow:0 1px 5px rgba(0, 0, 0, 0.1); &::before {position:absolute;left:0;top:0;z-index:-1;width:100%;height:85px;background:nth($ct, 1);content:""} diff --git a/src/js/form/style.scss b/src/js/form/style.scss index ab70830..cf227aa 100644 --- a/src/js/form/style.scss +++ b/src/js/form/style.scss @@ -11,7 +11,7 @@ .do-button {overflow:hidden;position:relative;display:inline-block;width:auto;height:30px;padding:0 10px;line-height:30px;text-align:center;cursor:pointer;font-size:14px; - &::before {position:absolute;left:-50%;top:-50%;display:block;width:200%;height:200%;border-radius:50%;background:nth($cp, 2); content:"";opacity:0;transform: scale(0, .0); transition:opacity 1.3s cubic-bezier(0.23, 1, 0.32, 1),transform 1.3s cubic-bezier(0.23, 1, 0.32, 1);} + &::before {position:absolute;left:-50%;top:-50%;display:block;width:200%;height:200%;border-radius:50%;background:rgba(220,220,220,.5); content:"";opacity:0;transform: scale(0, .0); transition:opacity 1.3s cubic-bezier(0.23, 1, 0.32, 1),transform 1.3s cubic-bezier(0.23, 1, 0.32, 1);} &:hover { &::before {opacity:1;transform:scale(1, .8);} @@ -31,7 +31,7 @@ i {padding-right:5px;font-size:24px;} } - &.large {min-width:150px;height:50px;padding:0 13px;line-height:50px;font-size:18px; + &.large {min-width:160px;height:50px;padding:0 13px;line-height:50px;font-size:18px; i {padding-right:10px;font-size:28px;} } @@ -45,6 +45,7 @@ &.orange {color:nth($co, 1);} &.plain {color:nth($cp, 3);} &.grey {color:nth($cgr, 1);} + &.navy-blue {color:nth($cnb, 1);} &.disabled {color:nth($cp, 1);cursor:not-allowed; @@ -99,9 +100,14 @@ } &.grey {color:nth($cgr, 1);} + &.navy-blue &__box {border-color:nth($cnb, 1); + &::after {background:nth($cnb, 1);} + } + &.navy-blue {color:nth($cnb, 1);} + &.disabled {color:nth($cp, 3);cursor:not-allowed;text-decoration:line-through;} - &.disabled.checked {color:nth($cgr, 2);} + &.disabled.checked {color:nth($cnb, 2);} &.disabled &__box {border-color:nth($cp, 3); &::after {background:nth($cp, 3);} } @@ -145,6 +151,9 @@ &.grey.checked &__dot {background:nth($cgr, 1);} &.grey.checked &__label {background:nth($cgr, 2) + a0;} + &.navy-blue.checked &__dot {background:nth($cnb, 1);} + &.navy-blue.checked &__label {background:nth($cnb, 2) + a0;} + &.disabled.checked &__dot {background:#fff;} &.disabled &__label, &.disabled.checked &__label {background:nth($cp, 2); @@ -167,6 +176,10 @@ &.grey &__box {border-color:nth($cgr, 1);} &.grey.checked &__box {background:nth($cgr, 1);} + &.navy-blue {color:nth($cnb, 1);} + &.navy-blue &__box {border-color:nth($cnb, 1);} + &.navy-blue.checked &__box {background:nth($cnb, 1);} + &.teal {color:nth($ct, 1);} &.teal &__box {border-color:nth($ct, 1);} &.teal.checked &__box {background:nth($ct, 1);} @@ -197,7 +210,7 @@ &.disabled {cursor:not-allowed;color:nth($cp, 3);text-decoration:line-through;} &.disabled &__box {border-color:nth($cp, 3);} - &.disabled.checked {color:nth($cgr, 2);} + &.disabled.checked {color:nth($cnb, 2);} &.disabled.checked &__box {background:nth($cp, 3);} } @@ -213,7 +226,7 @@ &.visible {visibility:visible;} } - &__input {position:relative;width:100%;height:30px;border:0;background:none;font-size:14px;color:nth($cgr, 1);} + &__input {position:relative;width:100%;height:30px;padding:0 5px;border:0;background:none;font-size:14px;color:nth($cnb, 1);} &__icon {position:absolute;bottom:0;width:30px;height:30px;text-align:center;font-size:20px;} &::after {position:absolute;left:50%;bottom:-1px;width:0;height:2px;content:"";transition:left .15s linear,width .15s linear;} @@ -231,6 +244,10 @@ &::after {background:nth($cgr, 2);} } + &.navy-blue {color:nth($cnb, 1); + &::after {background:nth($cnb, 2);} + } + &.teal{color:nth($ct, 1); &::after {background:nth($ct, 2);} } diff --git a/src/js/layer/skin/default.scss b/src/js/layer/skin/default.scss index 1c2ed6b..e2bfb75 100644 --- a/src/js/layer/skin/default.scss +++ b/src/js/layer/skin/default.scss @@ -36,7 +36,7 @@ /* 弹层标题栏 */ - .layer-title {width:100%;height:43px;padding:0 10px;line-height:43px;font-size:16px;color:nth($cgr, 1);} + .layer-title {width:100%;height:43px;padding:0 10px;line-height:43px;font-size:16px;color:nth($cnb, 1);} /* 弹层主体内容 */ .layer-content {position:relative;width:100%;height:auto;min-height:50px;padding:10px;word-break:break-all;word-wrap: break-word; diff --git a/src/js/meditor/addon/attach.scss b/src/js/meditor/addon/attach.scss index 86a82ca..66148a2 100644 --- a/src/js/meditor/addon/attach.scss +++ b/src/js/meditor/addon/attach.scss @@ -7,7 +7,7 @@ */ @import 'var.scss'; -.do-meditor-attach {width:630px;height:300px;cursor:default;color:nth($cgr, 1); +.do-meditor-attach {width:630px;height:300px;cursor:default;color:nth($cnb, 1); ::-webkit-scrollbar {width:5px;height:5px;background:nth($cp, 2);} ::-webkit-scrollbar:hover {background:nth($cp, 1);} @@ -34,7 +34,7 @@ .section {display:block;width:100%;height:auto;margin:15px 0;line-height:35px; - .txt {width:100%;height:45px;padding:0 10px;border:0;border-radius:5px;background:nth($cp, 2);color:nth($cgr, 1);font-size:14px;} + .txt {width:100%;height:45px;padding:0 10px;border:0;border-radius:5px;background:nth($cp, 2);color:nth($cnb, 1);font-size:14px;} .submit {float:right;width:30%;height:45px;line-height:45px;} } @@ -63,7 +63,7 @@ p {display:block;width:100%;height:30px;line-height:30px;} } - .insert {display:inline-block;padding:3px 5px;line-height:13px;background:nth($cp, 2);color:nth($cgr, 1);cursor:pointer;} + .insert {display:inline-block;padding:3px 5px;line-height:13px;background:nth($cp, 2);color:nth($cnb, 1);cursor:pointer;} .red {color:#f30;} } diff --git a/src/js/meditor/skin/main.scss b/src/js/meditor/skin/main.scss index 9fd9ee4..a22a0ee 100644 --- a/src/js/meditor/skin/main.scss +++ b/src/js/meditor/skin/main.scss @@ -12,7 +12,7 @@ src: url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'); } -.do-meditor {position:relative;display:block;width:100%;height:100%;padding-top:41px;border:1px solid nth($cp, 3);background:#fff;color:#666; +.do-meditor {position:relative;display:block;width:100%;height:100%;padding-top:41px;border:1px solid nth($cp, 3);background:#fff;color:nth($cgr, 3); ::-webkit-scrollbar {width:5px;height:5px;background:nth($cp, 2);} ::-webkit-scrollbar:hover {background:nth($cp, 1);} @@ -22,7 +22,7 @@ - .tool-bar {overflow:hidden;position:absolute;top:0;left:0;z-index:99;width:100%;height:41px;padding:0 3px;line-height:40px;border-bottom:1px solid nth($cp, 1);background:#fff;color:nth($cgr, 2);text-align:center;font-size:24px; + .tool-bar {overflow:hidden;position:absolute;top:0;left:0;z-index:99;width:100%;height:41px;padding:0 3px;line-height:40px;border-bottom:1px solid nth($cp, 1);background:#fff;color:nth($cnb, 1);text-align:center;font-size:24px; span {float:left;width:40px;height:40px; @@ -122,11 +122,11 @@ } /*通用输入模块, 链接/图片插入/文件插入/代码块插入*/ -.do-meditor-common {width:360px;height:auto;padding:0 20px;font-size:14px;color:nth($cgr, 2); +.do-meditor-common {width:360px;height:auto;padding:0 20px;font-size:14px;color:nth($cnb, 2); section {width:100%;height: 40px;margin:10px 0;line-height:40px; - .txt {width:100%;height:40px;padding:0 10px;border:0;border-radius:5px;background:nth($cp, 2);color:nth($cgr, 1);font-size:14px;} + .txt {width:100%;height:40px;padding:0 10px;border:0;border-radius:5px;background:nth($cp, 2);color:nth($cnb, 1);font-size:14px;} .label {float: left;width:50%;} .submit {float:right;width:30%;} } @@ -136,13 +136,13 @@ section {display:block;width:100%;height:auto;margin:10px 0;line-height:35px; .label {float: left;width:80px;} - select {float:left;width:200px;height:35px;padding:0 30px 0 10px;border:0;border-radius:0;border-bottom:1px solid nth($cp, 3);background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAMCAMAAABV0m3JAAAADFBMVEUAAAD///+Pj4+JiYkxcGihAAAABHRSTlMAABBwqVQF9wAAADNJREFUeNqlzjEOACAMw8DQ/v/PSE5FFhaEx5usdekBuzRVH0RtCqJYELUFrVjQigX/5jdvzgDh9izlMQAAAABJRU5ErkJggg==) no-repeat right 12px;color:nth($cgr, 1);outline:none;-webkit-appearance:none;-moz-appearance: none;@include ts; + select {float:left;width:200px;height:35px;padding:0 30px 0 10px;border:0;border-radius:0;border-bottom:1px solid nth($cp, 3);background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAMCAMAAABV0m3JAAAADFBMVEUAAAD///+Pj4+JiYkxcGihAAAABHRSTlMAABBwqVQF9wAAADNJREFUeNqlzjEOACAMw8DQ/v/PSE5FFhaEx5usdekBuzRVH0RtCqJYELUFrVjQigX/5jdvzgDh9izlMQAAAABJRU5ErkJggg==) no-repeat right 12px;color:nth($cnb, 1);outline:none;-webkit-appearance:none;-moz-appearance: none;@include ts; &::-ms-expand {display:none;} &:focus {box-shadow:0 0 5px nth($ct, 2)} } - textarea {width:100%;height:300px;padding:5px 10px;border:0;border-radius:5px;background:nth($cp, 2);font-size:14px;resize:none;outline:none; + textarea {width:100%;height:300px;padding:5px 10px;border:0;border-radius:5px;background:nth($cp, 2);font-size:14px;resize:none;outline:none;color:nth($cnb, 1); &:focus {box-shadow:0 0 5px nth($ct, 2)} } diff --git a/src/js/pager/index.js b/src/js/pager/index.js index 87ead70..cd96f80 100644 --- a/src/js/pager/index.js +++ b/src/js/pager/index.js @@ -83,7 +83,7 @@ const tmpls = { :text="el" :click="setPage(el, $event)">`, curr: ``, - total: `共 {{totalPage}} 页 {{totalItems}} 条`, + total: `共 {{totalPage}} 页 {{totalItem}} 条`, jumper: `
前往 页
`, @@ -107,7 +107,7 @@ export default Anot.component('pager', { ) if (props.total) { - state.totalItems = +props.total + state.totalItem = +props.total } if (props.pageSize) { state.pageSize = +props.pageSize @@ -164,14 +164,14 @@ export default Anot.component('pager', { state: { classList: [], currPage: 1, - totalItems: 1, + totalItem: 1, pageSize: 20, inputPage: 1, pageList: [] }, computed: { totalPage: function() { - return Math.ceil(this.totalItems / this.pageSize) + return Math.ceil(this.totalItem / this.pageSize) } }, props: { @@ -235,7 +235,7 @@ export default Anot.component('pager', { update(1, this) }, setTotalItems: function(num) { - this.totalItems = +num + this.totalItem = +num update(1, this) } } diff --git a/src/js/pager/main.scss b/src/js/pager/main.scss index 11907a3..2858b1c 100644 --- a/src/js/pager/main.scss +++ b/src/js/pager/main.scss @@ -20,7 +20,7 @@ .button,.page {min-width:40px;height:40px} } - .button,.page {display:inline-block;border:0;color: nth($cgr, 1);text-decoration:none;cursor:pointer;vertical-align:top;font-size:14px;font-weight:100;} + .button,.page {display:inline-block;border:0;color: nth($cgr, 1);text-decoration:none;cursor:pointer;vertical-align:top;font-size:14px;font-weight:100;appearance:none;} .button {font-size:18px;} .curr, .disabled {cursor:default;} @@ -46,15 +46,16 @@ &.skin-2 {float:right;width:auto; - .page, - .button, - .disabled, - .curr {float:left;margin:0;padding:0 5px;color:#fff;} + .page, + .button, + .disabled, + .curr {float:left;margin:0;padding:0 5px;color:#fff;} - .page.disabled {display:none;} - .button[disabled] {cursor:not-allowed;} - - .input-box {display:none;} + .page.disabled {display:none;} + .button[disabled] {cursor:not-allowed;} + + .input-box {display:none;} + .total-box {display:inline-block;padding:0 8px;} } &.plain { @@ -77,6 +78,16 @@ &.skin-2 .curr {background:nth($cgr, 3)} } + &.navy-blue { + .page,.button {background:nth($cnb, 1);color: #fff; + + &:hover {background:nth($cnb, 2)} + &:active {background:nth($cnb, 3)} + } + .button[disabled] {background:nth($cnb, 1);} + &.skin-2 .curr {background:nth($cnb, 3)} + } + &.red { .page,.button {background:nth($cr, 1);color: #fff; diff --git a/src/js/tree/main.scss b/src/js/tree/main.scss index b57ed17..cd171f0 100644 --- a/src/js/tree/main.scss +++ b/src/js/tree/main.scss @@ -9,20 +9,20 @@ @import '../../css/var.scss'; -.do-tree {overflow:hidden;overflow-y:auto;position:relative;display:inline-block;width:100%;height:100%;line-height:36px;font-size:15px;color:nth($cgr, 1); +.do-tree {overflow:hidden;overflow-y:auto;position:relative;display:inline-block;width:100%;height:100%;line-height:36px;font-size:15px;color:nth($cnb, 1); &__item {overflow:hidden; min-height:35px;margin:1px 0; white-space:nowrap; text-overflow:ellipsis; .do-tree {display:none;margin-left:20px;} - em,span {display:inline-block;cursor:pointer;color:nth($cgr, 2);} + em,span {display:inline-block;cursor:pointer;color:nth($cnb, 2);} em {float:left;padding:0 5px;font-size:20px;} span { - &:hover {color:nth($cgr, 2);} - &.active {color:nth($cgr, 3);font-weight:bold;} - &.checkbox {float:left;position:relative;width:20px;height:20px;margin:8px 5px 8px 0;line-height:18px;border:1px solid nth($cgr, 1);border-radius:3px; font-size:20px;text-align:center;} + &:hover {color:nth($cnb, 2);} + &.active {color:nth($cnb, 3);font-weight:bold;} + &.checkbox {float:left;position:relative;width:20px;height:20px;margin:8px 5px 8px 0;line-height:18px;border:1px solid nth($cnb, 1);border-radius:3px; font-size:20px;text-align:center;} } } &__item.open>.do-tree {display:block;}