mirror of https://github.com/ElemeFE/element
This reverts commit d6dedac2e2
.
pull/21297/merge
parent
f109628ad1
commit
cc9a7d5ce4
|
@ -102,7 +102,7 @@
|
|||
"gulp": "^4.0.0",
|
||||
"gulp-autoprefixer": "^6.0.0",
|
||||
"gulp-cssmin": "^0.2.0",
|
||||
"gulp-dart-sass": "^1.0.2",
|
||||
"gulp-sass": "^4.0.2",
|
||||
"highlight.js": "^9.3.0",
|
||||
"html-webpack-plugin": "^3.2.0",
|
||||
"json-loader": "^0.5.7",
|
||||
|
@ -121,12 +121,12 @@
|
|||
"markdown-it-container": "^2.0.0",
|
||||
"mini-css-extract-plugin": "^0.4.1",
|
||||
"mocha": "^6.0.2",
|
||||
"node-sass": "^4.11.0",
|
||||
"optimize-css-assets-webpack-plugin": "^5.0.1",
|
||||
"postcss": "^7.0.14",
|
||||
"progress-bar-webpack-plugin": "^1.11.0",
|
||||
"rimraf": "^2.5.4",
|
||||
"sass": "^1.34.0",
|
||||
"sass-loader": "^10.1.1",
|
||||
"sass-loader": "^7.1.0",
|
||||
"select-version-cli": "^0.0.2",
|
||||
"sinon": "^7.2.7",
|
||||
"sinon-chai": "^3.3.0",
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
const { series, src, dest } = require('gulp');
|
||||
const sass = require('gulp-dart-sass');
|
||||
const sass = require('gulp-sass');
|
||||
const autoprefixer = require('gulp-autoprefixer');
|
||||
const cssmin = require('gulp-cssmin');
|
||||
|
||||
function compile() {
|
||||
return src('./src/*.scss')
|
||||
.pipe(sass.sync().on('error', sass.logError))
|
||||
.pipe(sass.sync())
|
||||
.pipe(autoprefixer({
|
||||
overrideBrowserslist: ['ie > 9', 'last 2 versions'],
|
||||
browsers: ['ie > 9', 'last 2 versions'],
|
||||
cascade: false
|
||||
}))
|
||||
.pipe(cssmin())
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
"devDependencies": {
|
||||
"gulp": "^3.9.1",
|
||||
"gulp-cssmin": "^0.1.7",
|
||||
"gulp-dart-sass": "^1.0.2",
|
||||
"gulp-sass": "^3.1.0",
|
||||
"gulp-autoprefixer": "^4.0.0"
|
||||
},
|
||||
"dependencies": {}
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
@use "sass:math";
|
||||
@import "mixins/mixins";
|
||||
@import "common/var";
|
||||
|
||||
|
@ -23,7 +22,7 @@
|
|||
@include when(fixed) {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: #{1 + math.div($--badge-size, 2)};
|
||||
right: #{1 + $--badge-size / 2};
|
||||
transform: translateY(-50%) translateX(100%);
|
||||
|
||||
@include when(dot) {
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
@use "sass:math";
|
||||
@import "mixins/mixins";
|
||||
@import "common/var";
|
||||
|
||||
|
@ -123,7 +122,7 @@
|
|||
padding: $--carousel-indicator-padding-horizontal $--carousel-indicator-padding-vertical;
|
||||
.el-carousel__button {
|
||||
width: $--carousel-indicator-height;
|
||||
height: #{math.div($--carousel-indicator-width, 2)};
|
||||
height: #{$--carousel-indicator-width / 2};
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
@use "sass:math";
|
||||
@import "./common/var.scss";
|
||||
@import "./mixins/mixins.scss";
|
||||
|
||||
|
@ -13,21 +12,21 @@
|
|||
|
||||
@for $i from 0 through 24 {
|
||||
.el-col-#{$i} {
|
||||
width: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
width: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-offset-#{$i} {
|
||||
margin-left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
margin-left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-pull-#{$i} {
|
||||
position: relative;
|
||||
right: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
right: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-push-#{$i} {
|
||||
position: relative;
|
||||
left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -37,21 +36,21 @@
|
|||
}
|
||||
@for $i from 0 through 24 {
|
||||
.el-col-xs-#{$i} {
|
||||
width: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
width: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-xs-offset-#{$i} {
|
||||
margin-left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
margin-left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-xs-pull-#{$i} {
|
||||
position: relative;
|
||||
right: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
right: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-xs-push-#{$i} {
|
||||
position: relative;
|
||||
left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -62,21 +61,21 @@
|
|||
}
|
||||
@for $i from 0 through 24 {
|
||||
.el-col-sm-#{$i} {
|
||||
width: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
width: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-sm-offset-#{$i} {
|
||||
margin-left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
margin-left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-sm-pull-#{$i} {
|
||||
position: relative;
|
||||
right: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
right: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-sm-push-#{$i} {
|
||||
position: relative;
|
||||
left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -87,21 +86,21 @@
|
|||
}
|
||||
@for $i from 0 through 24 {
|
||||
.el-col-md-#{$i} {
|
||||
width: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
width: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-md-offset-#{$i} {
|
||||
margin-left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
margin-left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-md-pull-#{$i} {
|
||||
position: relative;
|
||||
right: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
right: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-md-push-#{$i} {
|
||||
position: relative;
|
||||
left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -112,21 +111,21 @@
|
|||
}
|
||||
@for $i from 0 through 24 {
|
||||
.el-col-lg-#{$i} {
|
||||
width: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
width: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-lg-offset-#{$i} {
|
||||
margin-left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
margin-left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-lg-pull-#{$i} {
|
||||
position: relative;
|
||||
right: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
right: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-lg-push-#{$i} {
|
||||
position: relative;
|
||||
left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -137,21 +136,21 @@
|
|||
}
|
||||
@for $i from 0 through 24 {
|
||||
.el-col-xl-#{$i} {
|
||||
width: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
width: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-xl-offset-#{$i} {
|
||||
margin-left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
margin-left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-xl-pull-#{$i} {
|
||||
position: relative;
|
||||
right: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
right: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
|
||||
.el-col-xl-push-#{$i} {
|
||||
position: relative;
|
||||
left: (math.div(1 , 24) * $i * 100) * 1%;
|
||||
left: (1 / 24 * $i * 100) * 1%;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,4 +1,3 @@
|
|||
@use "sass:math";
|
||||
/* Element Chalk Variables */
|
||||
|
||||
// Special comment for theme configurator
|
||||
|
@ -487,7 +486,7 @@ $--cascader-tag-background: #f0f2f5;
|
|||
|
||||
/* Group
|
||||
-------------------------- */
|
||||
$--group-option-flex: 0 0 math.div(1, 5) * 100% !default;
|
||||
$--group-option-flex: 0 0 (1/5) * 100% !default;
|
||||
$--group-option-offset-bottom: 12px !default;
|
||||
$--group-option-fill-hover: rgba($--color-black, 0.06) !default;
|
||||
$--group-title-color: $--color-black !default;
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
@use "sass:math";
|
||||
@import "mixins/mixins";
|
||||
@import "common/var";
|
||||
@import "input";
|
||||
|
@ -138,7 +137,7 @@
|
|||
|
||||
@include e((increase, decrease)) {
|
||||
height: auto;
|
||||
line-height: #{math.div($--input-height - 2, 2)};
|
||||
line-height: #{($--input-height - 2) / 2};
|
||||
|
||||
[class*=el-icon] {
|
||||
transform: scale(.8);
|
||||
|
@ -162,19 +161,19 @@
|
|||
|
||||
&[class*=medium] {
|
||||
[class*=increase], [class*=decrease] {
|
||||
line-height: #{math.div($--input-medium-height - 2, 2)};
|
||||
line-height: #{($--input-medium-height - 2) / 2};
|
||||
}
|
||||
}
|
||||
|
||||
&[class*=small] {
|
||||
[class*=increase], [class*=decrease] {
|
||||
line-height: #{math.div($--input-small-height - 2, 2)};
|
||||
line-height: #{($--input-small-height - 2) / 2};
|
||||
}
|
||||
}
|
||||
|
||||
&[class*=mini] {
|
||||
[class*=increase], [class*=decrease] {
|
||||
line-height: #{math.div($--input-mini-height - 2, 2)};
|
||||
line-height: #{($--input-mini-height - 2) / 2};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
@use "sass:math";
|
||||
@import "mixins/mixins";
|
||||
@import "common/var";
|
||||
|
||||
|
@ -27,7 +26,7 @@
|
|||
position: fixed;
|
||||
|
||||
.el-loading-spinner {
|
||||
margin-top: #{math.div(-$--loading-fullscreen-spinner-size, 2)};
|
||||
margin-top: #{- $--loading-fullscreen-spinner-size / 2};
|
||||
|
||||
.circular {
|
||||
height: $--loading-fullscreen-spinner-size;
|
||||
|
@ -39,7 +38,7 @@
|
|||
|
||||
@include b(loading-spinner) {
|
||||
top: 50%;
|
||||
margin-top: #{math.div(-$--loading-spinner-size, 2)};
|
||||
margin-top: #{- $--loading-spinner-size / 2};
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
|
|
|
@ -6,17 +6,8 @@
|
|||
@mixin res($key, $map: $--breakpoints) {
|
||||
// 循环断点Map,如果存在则返回
|
||||
@if map-has-key($map, $key) {
|
||||
@if $key=='sm-only'or $key=='md-only'or $key=='lg-only' {
|
||||
// 判定特定定义处理字符串参数值问题
|
||||
@media only screen and #{unquote(map-get($map, $key))} {
|
||||
@content;
|
||||
}
|
||||
}
|
||||
|
||||
@else {
|
||||
@media only screen and #{inspect(map-get($map, $key))} {
|
||||
@content;
|
||||
}
|
||||
@media only screen and #{inspect(map-get($map, $key))} {
|
||||
@content;
|
||||
}
|
||||
} @else {
|
||||
@warn "Undefeined points: `#{$map}`";
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
@use "sass:math";
|
||||
@import "mixins/mixins";
|
||||
@import "common/var";
|
||||
|
||||
|
@ -30,7 +29,7 @@
|
|||
&[x-placement^="top"] .popper__arrow {
|
||||
bottom: -$--popover-arrow-size;
|
||||
left: 50%;
|
||||
margin-right: math.div($--tooltip-arrow-size, 2);
|
||||
margin-right: #{$--tooltip-arrow-size / 2};
|
||||
border-top-color: $--popover-border-color;
|
||||
border-bottom-width: 0;
|
||||
|
||||
|
@ -49,7 +48,7 @@
|
|||
&[x-placement^="bottom"] .popper__arrow {
|
||||
top: -$--popover-arrow-size;
|
||||
left: 50%;
|
||||
margin-right: math.div($--tooltip-arrow-size, 2);
|
||||
margin-right: #{$--tooltip-arrow-size / 2};
|
||||
border-top-width: 0;
|
||||
border-bottom-color: $--popover-border-color;
|
||||
|
||||
|
@ -68,7 +67,7 @@
|
|||
&[x-placement^="right"] .popper__arrow {
|
||||
top: 50%;
|
||||
left: -$--popover-arrow-size;
|
||||
margin-bottom: #{math.div($--tooltip-arrow-size , 2)};
|
||||
margin-bottom: #{$--tooltip-arrow-size / 2};
|
||||
border-right-color: $--popover-border-color;
|
||||
border-left-width: 0;
|
||||
|
||||
|
@ -87,7 +86,7 @@
|
|||
&[x-placement^="left"] .popper__arrow {
|
||||
top: 50%;
|
||||
right: -$--popover-arrow-size;
|
||||
margin-bottom: #{math.div($--tooltip-arrow-size , 2)};
|
||||
margin-bottom: #{$--tooltip-arrow-size / 2};
|
||||
border-right-width: 0;
|
||||
border-left-color: $--popover-border-color;
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
@use "sass:math";
|
||||
@import "mixins/mixins";
|
||||
@import "mixins/utils";
|
||||
@import "common/var";
|
||||
|
@ -139,7 +138,7 @@
|
|||
font-size: 12px;
|
||||
display: inline-block;
|
||||
box-sizing: border-box;
|
||||
border-radius: #{math.div($--transfer-filter-height, 2)};
|
||||
border-radius: #{$--transfer-filter-height / 2};
|
||||
padding-right: 10px;
|
||||
padding-left: 30px;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue