Skip to content

I
integral-mall
Commit 1aeb9da4 by caoyanzhi
Options

Merge branch 'feature/3月迭代-主题色' into dev

parents 24833d01 f645625e
Showing with 72 additions and 72 deletions
dist/js/main.4bd052607edc6c2f1f81.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/common.css
......@@ -127,12 +127,12 @@ table {
}
/* custom */
a {
color:#1890ff;
color:#2F54EB;
text-decoration: none;
-webkit-backface-visibility: hidden;
}
a:hover{
color:#46a6ff;
color:#597EF7;
}
li {
list-style: none;
......@@ -270,7 +270,7 @@ input:focus {
color:#808995!important;
}
.el-icon-edit:hover{
color:#1890ff!important;
color:#2F54EB!important;
}
/*tab选项卡*/
.el-tabs__header{
......@@ -397,7 +397,7 @@ input[type="number"] {
}
.infoTipsIcon {
width: 12px;
color:#1890FF;
color:#2F54EB;
font-size: 12px;
margin-right: 9px;
}
......
dist/static/tinymce/skins/lightgray/skin.min.css
......@@ -1256,25 +1256,25 @@ html .mce-abs-layout-item,
/* background: white;
color: #595959;
border-color: #e2e4e7*/
color: #409EFF;
color: #2F54EB;
}
.mce-btn:hover button .mce-preview,
.mce-btn:active button .mce-preview {
color: #409EFF;
background: #409eff;
color: #2F54EB;
background: #2F54EB;
}
.mce-btn:focus button .mce-ico {
/*background: white;
color: #595959;
border-color: #e2e4e7*/
color: #409EFF;
color: #2F54EB;
}
.mce-btn:focus button .mce-preview {
color: #409EFF;
background: #409eff;
color: #2F54EB;
background: #2F54EB;
}
.mce-btn.mce-disabled button,
......@@ -1302,7 +1302,7 @@ html .mce-abs-layout-item,
-moz-box-shadow: none;
box-shadow: none;
background: #fff;
color: #409eff;
color: #2F54EB;
border-color: transparent
}
......@@ -1310,7 +1310,7 @@ html .mce-abs-layout-item,
.mce-btn.mce-active:hover button,
.mce-btn.mce-active i,
.mce-btn.mce-active:hover i {
color: #409eff
color: #2F54EB
}
.mce-btn:hover .mce-caret {
......@@ -1319,7 +1319,7 @@ html .mce-abs-layout-item,
.mce-btn.mce-active .mce-caret,
.mce-btn.mce-active:hover .mce-caret {
border-top-color: #409eff
border-top-color: #2F54EB
}
.mce-btn button {
......@@ -1351,7 +1351,7 @@ html .mce-abs-layout-item,
color: white;
border: 1px solid transparent;
border-color: transparent;
background-color: #409eff;
background-color: #2F54EB;
}
.mce-primary:hover,
......@@ -1375,7 +1375,7 @@ html .mce-abs-layout-item,
.mce-primary.mce-active,
.mce-primary.mce-active:hover,
.mce-primary:not(.mce-disabled):active {
background-color: #409eff;
background-color: #2F54EB;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none
......
src/components/eqCode.vue
......@@ -97,9 +97,9 @@ export default {
text-align: center;
}
/* .force-button {
background: #1890ff;
background: #2F54EB;
color: #fff;
border-color: #1890ff;
border-color: #2F54EB;
font-size: 14px;
line-height: 14px;
padding: 8px 15px;
......
src/components/ruleDetail.vue
......@@ -26,7 +26,7 @@
/>
</el-form-item>
<el-form-item label="适用人群" prop="memberType">
<span v-if="$store.state.product.ruleMemberFilterClose==0" class="tips">【人群筛选器】类型的上架规则最多支持20条,目前已创建 <span style="color:#1890ff">{{ memberTypeTotal }}</span> 条</span>
<span v-if="$store.state.product.ruleMemberFilterClose==0" class="tips">【人群筛选器】类型的上架规则最多支持20条,目前已创建 <span style="color:#2F54EB">{{ memberTypeTotal }}</span> 条</span>
<div>
<!-- <el-radio v-model="ruleForm.memberType" :label="1" v-if="$store.state.product.ruleMemberFilterClose==0">
全部客户
......
src/components/updateSkuStock.vue
......@@ -174,9 +174,9 @@ export default {
text-align: center;
}
/* .force-button {
background: #1890ff;
background: #2F54EB;
color: #fff;
border-color: #1890ff;
border-color: #2F54EB;
font-size: 14px;
line-height: 14px;
padding: 8px 15px;
......
src/components/visible.vue
......@@ -34,7 +34,7 @@
<div class="info">
<div>
<div class="title">
<i class="iconfont icon-xinxixianshi" style="color:#1890ff" />
<i class="iconfont icon-xinxixianshi" style="color:#2F54EB" />
<span>商品展示规则升级说明</span>
</div>
<div class="content">
......@@ -307,7 +307,7 @@ font-size: 14px;
}
.button{
font-size: 14px;
color: #1890ff;
color: #2F54EB;
cursor: pointer;
span{
margin-right: 5px;
......
src/views/activities/flashSale/detail.vue
......@@ -1378,7 +1378,7 @@ export default {
}
/* 图片上传 */
.avatar-uploader .el-upload:hover {
border-color: #409eff;
border-color: #2F54EB;
}
.avatar-icon {
width: 100px;
......@@ -1457,10 +1457,10 @@ export default {
color: #606266;
}
.add-sku-button:hover {
border: 1px dashed #1890ff;
border: 1px dashed #2F54EB;
}
.add-sku-button:hover .el-button {
color: #1890ff;
color: #2F54EB;
}
.gift-info img {
......@@ -1532,7 +1532,7 @@ export default {
margin-bottom: 4px;
}
.page-info .el-icon-info {
color: #1890ff;
color: #2F54EB;
margin-right: 10px;
font-size: 14px;
}
......
src/views/activities/flashSale/list.vue
......@@ -360,7 +360,7 @@ export default {
margin-bottom: 4px;
}
.page-info .el-icon-info {
color: #1890ff;
color: #2F54EB;
margin-right: 10px;
font-size: 14px;
}
......
src/views/goods/coupon/coupon.vue
......@@ -376,7 +376,7 @@
@command="command => handleCommand(command, scope.row, scope.$index)"
placement="bottom-start"
>
<span class="el-dropdown-link" style="color:#1890ff;cursor: pointer;"> <i class="el-icon-more" /> </span>
<span class="el-dropdown-link" style="color:#2F54EB;cursor: pointer;"> <i class="el-icon-more" /> </span>
<el-dropdown-menu slot="dropdown" style="width:110px;">
<el-dropdown-item command="5" v-if="$getButtonLimit($buttonCode.couponPromote)" :limit-code="$buttonCode.couponPromote">
推广
......@@ -1043,11 +1043,11 @@ export default {
}
.dialogStyle .viewReason {
background-color: #fff !important;
color: #1890ff !important;
color: #2F54EB !important;
border: none !important;
padding-left: 0 !important;
text-decoration: underline !important;
text-decoration-color: #1890ff !important;
text-decoration-color: #2F54EB !important;
}
.dialogStyle .marginLeft {
margin-left: 15px;
......
src/views/goods/coupon/detail.vue
......@@ -1610,7 +1610,7 @@ export default {
left: -10px;
}
.set-ladder {
border-bottom: 1px solid #1890ff;
border-bottom: 1px solid #2F54EB;
margin-left: 15px;
display: inline-block;
position: absolute;
......
src/views/goods/coupon/info.vue
......@@ -534,7 +534,7 @@
<div slot="content" style="line-height:18px">
会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见
</div>
<i class="iconfont icon-xinxixianshi" style="color:#1890ff" />
<i class="iconfont icon-xinxixianshi" style="color:#2F54EB" />
</el-tooltip>
<vue-gic-store-linkage
style="margin-left:10px"
......@@ -559,7 +559,7 @@
<div slot="content" style="line-height:18px">
会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见
</div>
<i class="iconfont icon-xinxixianshi" style="color:#1890ff" />
<i class="iconfont icon-xinxixianshi" style="color:#2F54EB" />
</el-tooltip>
<vue-gic-store-card
style="margin-left:10px"
......@@ -1845,7 +1845,7 @@ export default {
left: -10px;
}
.set-ladder {
border-bottom: 1px solid #1890ff;
border-bottom: 1px solid #2F54EB;
margin-left: 15px;
display: inline-block;
position: absolute;
......
src/views/goods/gift/addSku.vue
......@@ -955,7 +955,7 @@ export default {
height: 30px;
}
.table-img:hover {
border: 1px dashed #409eff;
border: 1px dashed #2F54EB;
}
.img-modal {
width: 32px;
......@@ -994,7 +994,7 @@ export default {
}
.table-upload .avatar-uploader .el-upload:hover {
border-color: #409eff;
border-color: #2F54EB;
}
.table-upload .avatar-uploader-icon {
font-size: 24px;
......
src/views/goods/gift/detail.vue
......@@ -2557,8 +2557,8 @@ export default {
cursor: pointer;
}
.link-item-active {
border-left: 2px solid #1890ff;
color: #1890ff;
border-left: 2px solid #2F54EB;
color: #2F54EB;
}
/* 固定按钮 */
.confim-btn {
......@@ -2636,7 +2636,7 @@ export default {
left: -10px;
}
.set-ladder {
border-bottom: 1px solid #1890ff;
border-bottom: 1px solid #2F54EB;
margin-left: 15px;
display: inline-block;
position: absolute;
......
src/views/goods/gift/gift.vue
......@@ -392,7 +392,7 @@
@command="command => handleCommand(command, scope.row, scope.$index)"
placement="bottom-start"
>
<span class="el-dropdown-link" style="color:#1890ff;cursor: pointer;"> <i class="el-icon-more" /> </span>
<span class="el-dropdown-link" style="color:#2F54EB;cursor: pointer;"> <i class="el-icon-more" /> </span>
<el-dropdown-menu slot="dropdown" style="width:110px;">
<el-dropdown-item command="5" v-if="$getButtonLimit($buttonCode.giftPromote)" :limit-code="$buttonCode.giftPromote">
推广
......@@ -1199,7 +1199,7 @@ export default {
margin-bottom: 4px;
}
.page-info .el-icon-info {
color: #1890ff;
color: #2F54EB;
margin-right: 10px;
font-size: 14px;
}
......
src/views/goods/gift/importCoupon.vue
......@@ -207,7 +207,7 @@ export default {
color: #c0c4cc;
}
.upload-btn:hover {
border-color: #1890ff;
border-color: #2F54EB;
}
.line {
border-top: 1px solid #e4e7ed;
......
src/views/goods/gift/info.vue
......@@ -685,7 +685,7 @@
<div slot="content" style="line-height:18px">
会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见
</div>
<i class="iconfont icon-xinxixianshi" style="color:#1890ff" />
<i class="iconfont icon-xinxixianshi" style="color:#2F54EB" />
</el-tooltip>
<vue-gic-store-linkage
style="margin-left:10px"
......@@ -710,7 +710,7 @@
<div slot="content" style="line-height:18px">
会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见
</div>
<i class="iconfont icon-xinxixianshi" style="color:#1890ff" />
<i class="iconfont icon-xinxixianshi" style="color:#2F54EB" />
</el-tooltip>
<vue-gic-store-card
style="margin-left:10px"
......@@ -2894,8 +2894,8 @@ export default {
cursor: pointer;
}
.link-item-active {
border-left: 2px solid #1890ff;
color: #1890ff;
border-left: 2px solid #2F54EB;
color: #2F54EB;
}
/* 固定按钮 */
.confim-btn {
......@@ -2973,7 +2973,7 @@ export default {
left: -10px;
}
.set-ladder {
border-bottom: 1px solid #1890ff;
border-bottom: 1px solid #2F54EB;
margin-left: 15px;
display: inline-block;
position: absolute;
......
src/views/goods/ruleList/ruleList.vue
......@@ -160,7 +160,7 @@
placement="bottom-start"
@command="command => handleCommand(command, row)"
>
<span class="el-dropdown-link" style="color:#1890ff;cursor: pointer;"> <i class="el-icon-more" /> </span>
<span class="el-dropdown-link" style="color:#2F54EB;cursor: pointer;"> <i class="el-icon-more" /> </span>
<el-dropdown-menu slot="dropdown" style="width:110px;">
<el-dropdown-item
command="1"
......
src/views/order/giftExchange.vue
......@@ -1194,7 +1194,7 @@ export default {
}
.go-link {
color: #1890ff;
color: #2F54EB;
cursor: pointer;
}
.drop-list .icon-icon- {
......
src/views/order/importInfo.vue
......@@ -182,16 +182,16 @@ export default {
color: #c0c4cc;
}
/*.upload-btn:hover .el-button,.upload-btn .el-button:focus{
color: #1890ff;
color: #2F54EB;
}
.upload-btn .upload-ele:hove .el-button{
color: #1890ff;
color: #2F54EB;
}
.upload-btn:hover .el-icon-upload2{
color: #1890ff;
color: #2F54EB;
}*/
.upload-btn:hover {
border-color: #1890ff;
border-color: #2F54EB;
}
.line {
border-top: 1px solid #e4e7ed;
......
src/views/order/orderDetail.vue
......@@ -696,7 +696,7 @@ export default {
}
.operate-tip {
font-size: 13px;
color: #409eff;
color: #2F54EB;
}
.operate-btn {
margin-top: 40px;
......@@ -736,12 +736,12 @@ export default {
}
.el-icon-arrow-down {
font-size: 14px;
color: #409eff;
color: #2F54EB;
cursor: pointer;
}
.el-icon-arrow-up {
font-size: 14px;
color: #409eff;
color: #2F54EB;
cursor: pointer;
}
.order-goods-info img {
......
src/views/setting/convenSet.vue
......@@ -233,7 +233,7 @@ export default {
width: 3px;
height: 14px;
margin-right: 8px;
background-color: #1890ff;
background-color: #2F54EB;
}
.confim-btn {
height: 32px;
......
static/css/common.css
......@@ -127,12 +127,12 @@ table {
}
/* custom */
a {
color:#1890ff;
color:#2F54EB;
text-decoration: none;
-webkit-backface-visibility: hidden;
}
a:hover{
color:#46a6ff;
color:#597EF7;
}
li {
list-style: none;
......@@ -270,7 +270,7 @@ input:focus {
color:#808995!important;
}
.el-icon-edit:hover{
color:#1890ff!important;
color:#2F54EB!important;
}
/*tab选项卡*/
.el-tabs__header{
......@@ -397,7 +397,7 @@ input[type="number"] {
}
.infoTipsIcon {
width: 12px;
color:#1890FF;
color:#2F54EB;
font-size: 12px;
margin-right: 9px;
}
......
static/tinymce/skins/lightgray/skin.min.css
......@@ -1256,25 +1256,25 @@ html .mce-abs-layout-item,
/* background: white;
color: #595959;
border-color: #e2e4e7*/
color: #409EFF;
color: #2F54EB;
}
.mce-btn:hover button .mce-preview,
.mce-btn:active button .mce-preview {
color: #409EFF;
background: #409eff;
color: #2F54EB;
background: #2F54EB;
}
.mce-btn:focus button .mce-ico {
/*background: white;
color: #595959;
border-color: #e2e4e7*/
color: #409EFF;
color: #2F54EB;
}
.mce-btn:focus button .mce-preview {
color: #409EFF;
background: #409eff;
color: #2F54EB;
background: #2F54EB;
}
.mce-btn.mce-disabled button,
......@@ -1302,7 +1302,7 @@ html .mce-abs-layout-item,
-moz-box-shadow: none;
box-shadow: none;
background: #fff;
color: #409eff;
color: #2F54EB;
border-color: transparent
}
......@@ -1310,7 +1310,7 @@ html .mce-abs-layout-item,
.mce-btn.mce-active:hover button,
.mce-btn.mce-active i,
.mce-btn.mce-active:hover i {
color: #409eff
color: #2F54EB
}
.mce-btn:hover .mce-caret {
......@@ -1319,7 +1319,7 @@ html .mce-abs-layout-item,
.mce-btn.mce-active .mce-caret,
.mce-btn.mce-active:hover .mce-caret {
border-top-color: #409eff
border-top-color: #2F54EB
}
.mce-btn button {
......@@ -1351,7 +1351,7 @@ html .mce-abs-layout-item,
color: white;
border: 1px solid transparent;
border-color: transparent;
background-color: #409eff;
background-color: #2F54EB;
}
.mce-primary:hover,
......@@ -1375,7 +1375,7 @@ html .mce-abs-layout-item,
.mce-primary.mce-active,
.mce-primary.mce-active:hover,
.mce-primary:not(.mce-disabled):active {
background-color: #409eff;
background-color: #2F54EB;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment