test/amis
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-30 02:48:55 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

chore: 升级 sass 版本并修复导致的报错；调整几个 cxd 下的背景色 (#2553)

Browse Source
This commit is contained in:
吴多益 2021-09-14 15:15:39 +08:00 committed by GitHub
parent 63878a0f48
commit 696c9e2bc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -62,7 +62,7 @@
"mobx-state-tree": "^3.17.3",
"moment": "^2.19.3",
"monaco-editor": "0.27.0",
"mpegts.js": "^1.6.7",
"mpegts.js": "^1.6.8",
"papaparse": "^5.3.0",
"prop-types": "^15.6.1",
"punycode": "^2.1.1",
@ -125,7 +125,7 @@
"css": "3.0.0",
"faker": "^5.5.3",
"fis-optimizer-terser": "^1.0.1",
"fis-parser-sass": "^1.0.1",
"fis-parser-sass": "^1.1.0",
"fis-parser-svgr": "^1.0.0",
"fis3": "^3.4.41",
"fis3-deploy-skip-packed": "0.0.5",
@ -161,7 +161,7 @@
"ts-jest": "^27.0.5",
"ts-json-schema-generator": "^0.95.0",
"ts-node": "^10.2.1",
"typescript": "~4.4.2"
"typescript": "~4.4.3"
},
"jest": {
"testEnvironment": "jsdom",

4
scss/_functions.scss
View File

@ -1,3 +1,5 @@
@use 'sass:math';
//下一个断点
@function breakpoint-next(
$name,
@ -38,7 +40,7 @@
$context: $context * 1px;
}
@return $pixels / $context * 1rem;
@return math.div($pixels, $context) * 1rem;
}
@function tint($color, $intensity) {

6
scss/components/_images.scss
View File

@ -1,3 +1,5 @@
@use 'sass:math';
.#{$ns}Images {
display: flex;
flex-wrap: wrap;
@ -59,11 +61,11 @@
}
&-thumb--4-3 {
height: px2rem(110px * 3 / 4);
height: px2rem(math.div(110px * 3, 4));
}
&-thumb--16-9 {
height: px2rem(110px * 9 / 16);
height: px2rem(math.div(110px * 9, 16));
}
&-thumb--fixed-size {

5
scss/components/form/_form.scss
View File

@ -1,3 +1,4 @@
@use 'sass:math';
@mixin setControlWidth() {
width: var(--Form-control-widthBase);
@ -288,8 +289,8 @@
@for $i from (1) through $Form--horizontal-columns {
.#{$ns}Form-itemColumn--#{$i} {
flex: 0 0 percentage($i / $Form--horizontal-columns);
max-width: percentage($i / $Form--horizontal-columns);
flex: 0 0 percentage(math.div($i, $Form--horizontal-columns));
max-width: percentage(math.div($i, $Form--horizontal-columns));
min-height: 1px;
}
}

6
scss/components/form/_group.scss
View File

@ -1,3 +1,5 @@
@use 'sass:math';
.#{$ns}Form-groupColumn {
margin-bottom: var(--gap-sm);
}
@ -95,8 +97,8 @@
@for $i from (1) through $Form--horizontal-columns {
.#{$ns}Form-groupColumn--#{$i} {
flex: 0 0 percentage($i / $Form--horizontal-columns);
max-width: percentage($i / $Form--horizontal-columns);
flex: 0 0 percentage(math.div($i, $Form--horizontal-columns));
max-width: percentage(math.div($i, $Form--horizontal-columns));
min-height: 1px;
}
}

22
scss/layout/_grid.scss
View File

@ -1,11 +1,13 @@
@use 'sass:math';
@mixin make-grid($class) {
@for $i from 1 through $Grid-columns {
.#{$ns}Grid-col--#{$class}#{$i} {
flex: 0 0 percentage($i / $Grid-columns);
max-width: percentage($i / $Grid-columns);
flex: 0 0 percentage(math.div($i, $Grid-columns));
max-width: percentage(math.div($i, $Grid-columns));
min-height: 1px;
padding-left: ($Grid-gutterWidth / 2);
padding-right: ($Grid-gutterWidth / 2);
padding-left: (math.div($Grid-gutterWidth, 2));
padding-right: (math.div($Grid-gutterWidth, 2));
}
}
@ -15,23 +17,23 @@
min-height: 1px;
max-width: 100%;
width: 100%;
padding-left: ($Grid-gutterWidth / 2);
padding-right: ($Grid-gutterWidth / 2);
padding-left: math.div($Grid-gutterWidth, 2);
padding-right: math.div($Grid-gutterWidth, 2);
}
.#{$ns}Grid-col--#{$class}Auto {
flex: 0 0 auto;
width: auto;
max-width: 100%;
padding-left: ($Grid-gutterWidth / 2);
padding-right: ($Grid-gutterWidth / 2);
padding-left: math.div($Grid-gutterWidth, 2);
padding-right: math.div($Grid-gutterWidth, 2);
}
}
// Generate Grid row
@mixin make-row($gutter: $Grid-gutterWidth) {
margin-left: ($gutter / -2);
margin-right: ($gutter / -2);
margin-left: math.div($gutter, -2);
margin-right: math.div($gutter, -2);
display: flex;
flex-wrap: wrap;
}

10
scss/themes/_cxd-variables.scss
View File

@ -245,13 +245,13 @@ $Wizard-steps-liAfterBorder: none !important;
--Table-thead-borderColor: #fff;
--Table-thead-iconColor: #999;
--Table-strip-bg: transparent;
--Table-onHover-bg: #f5fbff;
--Table-onHover-bg: #f5f5f5;
--Table-onHover-bg-rgb: 245, 251, 255;
--Table-onHover-borderColor: #eceff8;
--Table-onChecked-bg: transparent;
--Table-onChecked-borderColor: #eceff8;
--Table-onChecked-color: #333;
--Table-onChecked-onHover-bg: #f5fbff;
--Table-onChecked-onHover-bg: #f5f5f5;
--Table-onChecked-onHover-borderColor: #eceff8;
--Table-onChecked-onHover-color: #666;
--TableCell-paddingX: #{px2rem(10px)};
@ -364,6 +364,7 @@ $Wizard-steps-liAfterBorder: none !important;
// Panel
--Panel-borderRadius: 0;
--Panel-fixedBottom-boxShadow: 0 -2px 10px 0 rgba(0, 0, 0, 0.05);
--Panel--default-bg: #f5f5f5;
// Nav
--Nav-item-fontSize: #{px2rem(16px)};
@ -464,6 +465,11 @@ $Wizard-steps-liAfterBorder: none !important;
--ListMenu-item-color: #333;
--ListMenu-item--onHover-color: #000;
--ListMenu-item--onHover-bg: #eaf6fe;
--ListItem--strip-bg: #f6f6f6;
--ListItem-onChecked-color: #0052cc;
--ListItem-onChecked-bg: #f0f6ff;
--ListItem-onChecked-borderColor: #0052cc;
--ListItem-onChecked-fieldLabel-color: #0052cc;
--Transfer-title-bg: var(--Table-thead-bg);