Skip to content

S
style_tool
Commit 3f432020 authored by 刘安琪's avatar 刘安琪
Browse files
Options

Merge branch 'htcloud' of http://114.115.168.181/yuguangyang/style_tool into htcloud

parents b2822969 ba18d88d
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 49 deletions
node_module/element-theme-chalk/src/progress.scss
View file @ 3f432020
......@@ -8,7 +8,7 @@
@include e(text) {
font-size:14px;
color: $--color-text-regular;
color: $--color-text-primary;
display: inline-block;
vertical-align: middle;
margin-left: 10px;
......@@ -99,7 +99,7 @@
box-sizing: border-box;
@include e(outer) {
height: 6px;
height: 8px !important;
border-radius: 100px;
background-color: $--border-color-lighter;
overflow: hidden;
......
node_module/element-theme-chalk/src/table.scss
View file @ 3f432020
......@@ -109,7 +109,7 @@
thead {
color: $--table-header-font-color;
th{
font-weight: 600;
font-weight: 500;
}
&.is-group {
th {
......
theme/date-picker.css
View file @ 3f432020
......@@ -1979,7 +1979,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 28px;
font-size: 14px;
color: #666666;
padding-left: 12px;
padding-left: 8px;
text-align: left;
outline: none;
cursor: pointer; }
......@@ -2027,7 +2027,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-right: 1px solid #e4e4e4;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding-top: 6px;
padding-top: 4px;
background-color: #FFFFFF;
overflow: auto; }
......@@ -2251,12 +2251,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
margin: 0;
padding: 16px; }
padding: 16px 16px 4px 16px; }
.el-date-range-picker__content.is-left {
border-right: 1px solid #e4e4e4; }
.el-date-range-picker__content .el-date-range-picker__header div {
margin-left: 50px;
margin-right: 50px; }
margin-right: 50px;
color: #333; }
.el-date-range-picker__editors-wrap {
-webkit-box-sizing: border-box;
box-sizing: border-box;
......
theme/index.css
View file @ 3f432020
......@@ -18455,7 +18455,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-table thead {
color: #333333; }
.el-table thead th {
font-weight: 600; }
font-weight: 500; }
.el-table thead.is-group th {
background: #F6F6F6; }
.el-table th, .el-table td {
......@@ -22180,7 +22180,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 28px;
font-size: 14px;
color: #666666;
padding-left: 12px;
padding-left: 8px;
text-align: left;
outline: none;
cursor: pointer; }
......@@ -22228,7 +22228,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-right: 1px solid #e4e4e4;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding-top: 6px;
padding-top: 4px;
background-color: #FFFFFF;
overflow: auto; }
......@@ -22452,12 +22452,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
margin: 0;
padding: 16px; }
padding: 16px 16px 4px 16px; }
.el-date-range-picker__content.is-left {
border-right: 1px solid #e4e4e4; }
.el-date-range-picker__content .el-date-range-picker__header div {
margin-left: 50px;
margin-right: 50px; }
margin-right: 50px;
color: #333; }
.el-date-range-picker__editors-wrap {
-webkit-box-sizing: border-box;
box-sizing: border-box;
......@@ -25234,7 +25235,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 28px;
font-size: 14px;
color: #666666;
padding-left: 12px;
padding-left: 8px;
text-align: left;
outline: none;
cursor: pointer; }
......@@ -25282,7 +25283,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-right: 1px solid #e4e4e4;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding-top: 6px;
padding-top: 4px;
background-color: #FFFFFF;
overflow: auto; }
......@@ -26829,7 +26830,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 28px;
font-size: 14px;
color: #666666;
padding-left: 12px;
padding-left: 8px;
text-align: left;
outline: none;
cursor: pointer; }
......@@ -26877,7 +26878,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-right: 1px solid #e4e4e4;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding-top: 6px;
padding-top: 4px;
background-color: #FFFFFF;
overflow: auto; }
......@@ -40358,7 +40359,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 1; }
.el-progress__text {
font-size: 14px;
color: #666666;
color: #333333;
display: inline-block;
vertical-align: middle;
margin-left: 10px;
......@@ -40411,7 +40412,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box;
box-sizing: border-box; }
.el-progress-bar__outer {
height: 6px;
height: 8px !important;
border-radius: 100px;
background-color: #EBEBEB;
overflow: hidden;
......@@ -41294,7 +41295,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 1; }
.el-progress__text {
font-size: 14px;
color: #666666;
color: #333333;
display: inline-block;
vertical-align: middle;
margin-left: 10px;
......@@ -41347,7 +41348,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box;
box-sizing: border-box; }
.el-progress-bar__outer {
height: 6px;
height: 8px !important;
border-radius: 100px;
background-color: #EBEBEB;
overflow: hidden;
......@@ -53707,9 +53708,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--primary {
color: #0994DC; }
.el-link.el-link--primary:hover {
color: #3aa9e3; }
color: #0885C6; }
.el-link.el-link--primary:after {
border-color: #0994DC; }
border-color: #0885C6; }
.el-link.el-link--primary.is-disabled {
color: #84caee; }
.el-link.el-link--primary.is-underline:hover:after {
......@@ -53717,9 +53718,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--danger {
color: #FF3D33; }
.el-link.el-link--danger:hover {
color: #ff645c; }
color: #0885C6; }
.el-link.el-link--danger:after {
border-color: #FF3D33; }
border-color: #0885C6; }
.el-link.el-link--danger.is-disabled {
color: #ff9e99; }
.el-link.el-link--danger.is-underline:hover:after {
......@@ -53727,9 +53728,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--success {
color: #4EC87C; }
.el-link.el-link--success:hover {
color: #71d396; }
color: #0885C6; }
.el-link.el-link--success:after {
border-color: #4EC87C; }
border-color: #0885C6; }
.el-link.el-link--success.is-disabled {
color: #a7e4be; }
.el-link.el-link--success.is-underline:hover:after {
......@@ -53737,9 +53738,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--warning {
color: #FFA533; }
.el-link.el-link--warning:hover {
color: #ffb75c; }
color: #0885C6; }
.el-link.el-link--warning:after {
border-color: #FFA533; }
border-color: #0885C6; }
.el-link.el-link--warning.is-disabled {
color: #ffd299; }
.el-link.el-link--warning.is-underline:hover:after {
......@@ -53747,9 +53748,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--info {
color: #00BBF2; }
.el-link.el-link--info:hover {
color: #33c9f5; }
color: #0885C6; }
.el-link.el-link--info:after {
border-color: #00BBF2; }
border-color: #0885C6; }
.el-link.el-link--info.is-disabled {
color: #80ddf9; }
.el-link.el-link--info.is-underline:hover:after {
theme/link.css
View file @ 3f432020
......@@ -307,9 +307,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--primary {
color: #0994DC; }
.el-link.el-link--primary:hover {
color: #3aa9e3; }
color: #0885C6; }
.el-link.el-link--primary:after {
border-color: #0994DC; }
border-color: #0885C6; }
.el-link.el-link--primary.is-disabled {
color: #84caee; }
.el-link.el-link--primary.is-underline:hover:after {
......@@ -317,9 +317,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--danger {
color: #FF3D33; }
.el-link.el-link--danger:hover {
color: #ff645c; }
color: #0885C6; }
.el-link.el-link--danger:after {
border-color: #FF3D33; }
border-color: #0885C6; }
.el-link.el-link--danger.is-disabled {
color: #ff9e99; }
.el-link.el-link--danger.is-underline:hover:after {
......@@ -327,9 +327,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--success {
color: #4EC87C; }
.el-link.el-link--success:hover {
color: #71d396; }
color: #0885C6; }
.el-link.el-link--success:after {
border-color: #4EC87C; }
border-color: #0885C6; }
.el-link.el-link--success.is-disabled {
color: #a7e4be; }
.el-link.el-link--success.is-underline:hover:after {
......@@ -337,9 +337,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--warning {
color: #FFA533; }
.el-link.el-link--warning:hover {
color: #ffb75c; }
color: #0885C6; }
.el-link.el-link--warning:after {
border-color: #FFA533; }
border-color: #0885C6; }
.el-link.el-link--warning.is-disabled {
color: #ffd299; }
.el-link.el-link--warning.is-underline:hover:after {
......@@ -347,9 +347,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--info {
color: #00BBF2; }
.el-link.el-link--info:hover {
color: #33c9f5; }
color: #0885C6; }
.el-link.el-link--info:after {
border-color: #00BBF2; }
border-color: #0885C6; }
.el-link.el-link--info.is-disabled {
color: #80ddf9; }
.el-link.el-link--info.is-underline:hover:after {
......
theme/progress.css
View file @ 3f432020
......@@ -267,7 +267,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 1; }
.el-progress__text {
font-size: 14px;
color: #666666;
color: #333333;
display: inline-block;
vertical-align: middle;
margin-left: 10px;
......@@ -320,7 +320,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box;
box-sizing: border-box; }
.el-progress-bar__outer {
height: 6px;
height: 8px !important;
border-radius: 100px;
background-color: #EBEBEB;
overflow: hidden;
......
theme/table.css
View file @ 3f432020
......@@ -1829,7 +1829,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-table thead {
color: #333333; }
.el-table thead th {
font-weight: 600; }
font-weight: 500; }
.el-table thead.is-group th {
background: #F6F6F6; }
.el-table th, .el-table td {
......
theme/time-picker.css
View file @ 3f432020
......@@ -807,7 +807,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 28px;
font-size: 14px;
color: #666666;
padding-left: 12px;
padding-left: 8px;
text-align: left;
outline: none;
cursor: pointer; }
......@@ -855,7 +855,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-right: 1px solid #e4e4e4;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding-top: 6px;
padding-top: 4px;
background-color: #FFFFFF;
overflow: auto; }
......
theme/time-select.css
View file @ 3f432020
......@@ -1198,7 +1198,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 28px;
font-size: 14px;
color: #666666;
padding-left: 12px;
padding-left: 8px;
text-align: left;
outline: none;
cursor: pointer; }
......@@ -1246,7 +1246,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-right: 1px solid #e4e4e4;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding-top: 6px;
padding-top: 4px;
background-color: #FFFFFF;
overflow: auto; }
......
theme/upload.css
View file @ 3f432020
......@@ -405,7 +405,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 1; }
.el-progress__text {
font-size: 14px;
color: #666666;
color: #333333;
display: inline-block;
vertical-align: middle;
margin-left: 10px;
......@@ -458,7 +458,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box;
box-sizing: border-box; }
.el-progress-bar__outer {
height: 6px;
height: 8px !important;
border-radius: 100px;
background-color: #EBEBEB;
overflow: hidden;
......
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