From 6342f6d65a54d281582497c908fa51b359849ba8 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Wed, 4 Dec 2024 20:51:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20remove=20=E6=97=A0=E6=84=8F=E4=B9=89?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/col/col.scss | 1 - src/packages/layout/demos/h5/demo1.tsx | 10 +++++----- src/packages/layout/demos/h5/demo2.tsx | 16 +++++----------- src/packages/layout/demos/h5/demo3.tsx | 16 +++++----------- src/packages/layout/demos/taro/demo1.tsx | 2 +- src/packages/layout/demos/taro/demo2.tsx | 2 +- src/packages/layout/demos/taro/demo3.tsx | 2 +- src/packages/layout/layout.scss | 0 src/styles/variables.scss | 17 +---------------- 9 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 src/packages/layout/layout.scss diff --git a/src/packages/col/col.scss b/src/packages/col/col.scss index abe350416b..063d903e70 100644 --- a/src/packages/col/col.scss +++ b/src/packages/col/col.scss @@ -1,5 +1,4 @@ .nut-col { - //float: left; box-sizing: border-box; word-break: break-all; margin-bottom: $col-default-margin-bottom; diff --git a/src/packages/layout/demos/h5/demo1.tsx b/src/packages/layout/demos/h5/demo1.tsx index e736fc2acb..aaa2da5048 100644 --- a/src/packages/layout/demos/h5/demo1.tsx +++ b/src/packages/layout/demos/h5/demo1.tsx @@ -4,16 +4,16 @@ import { Row, Col } from '@nutui/nutui-react' const Demo1 = () => { const style = ` .layout-flex-content { - line-height: var(--nutui-row-content-line-height, 40px); - color: var(--nutui-row-content-color, #fff); + line-height: 40px; + color: #fff; text-align: center; - border-radius: var(--nutui-row-content-border-radius, 6px); - background: var(--nutui-row-content-background-color,var(--row-content-bg-color, #ff8881)); + border-radius: 2px; + background: #ff8881; font-size: 14px; } .layout-flex-content-light { - background: var(--row-content-light-bg-color,#ffc7c4); + background: #ffc7c4; } ` return ( diff --git a/src/packages/layout/demos/h5/demo2.tsx b/src/packages/layout/demos/h5/demo2.tsx index 62cd02dda3..784667f59b 100644 --- a/src/packages/layout/demos/h5/demo2.tsx +++ b/src/packages/layout/demos/h5/demo2.tsx @@ -4,22 +4,16 @@ import { Row, Col } from '@nutui/nutui-react' const Demo2 = () => { const style = ` .layout-flex-content { - line-height: var(--nutui-row-content-line-height, 40px); - color: var(--nutui-row-content-color, #fff); + line-height: 40px; + color: #fff; text-align: center; - border-radius: var(--nutui-row-content-border-radius, 6px); - background: var( - --nutui-row-content-background-color, - var(--row-content-bg-color, #ff8881) - ); + border-radius: 2px; + background: #ff8881; font-size: 14px; } .layout-flex-content-light { - background: var( - --row-content-light-bg-color, - #ffc7c4 -); + background: #ffc7c4; } ` return ( diff --git a/src/packages/layout/demos/h5/demo3.tsx b/src/packages/layout/demos/h5/demo3.tsx index 476032367c..6530804007 100644 --- a/src/packages/layout/demos/h5/demo3.tsx +++ b/src/packages/layout/demos/h5/demo3.tsx @@ -4,22 +4,16 @@ import { Row, Col } from '@nutui/nutui-react' const Demo3 = () => { const style = ` .layout-flex-content { - line-height: var(--nutui-row-content-line-height, 40px); - color: var(--nutui-row-content-color, #fff); + line-height: 40px; + color: #fff; text-align: center; - border-radius: var(--nutui-row-content-border-radius, 6px); - background: var( - --nutui-row-content-background-color, - var(--row-content-bg-color, #ff8881) - ); + border-radius: 2px; + background: #ff8881; font-size: 14px; } .layout-flex-content-light { - background: var( - --row-content-light-bg-color, - #ffc7c4 - ); + background: #ffc7c4; } ` return ( diff --git a/src/packages/layout/demos/taro/demo1.tsx b/src/packages/layout/demos/taro/demo1.tsx index 4dacee78e6..e1dca4df38 100644 --- a/src/packages/layout/demos/taro/demo1.tsx +++ b/src/packages/layout/demos/taro/demo1.tsx @@ -13,7 +13,7 @@ const Demo1 = () => { justifyContent: 'center', color: '#fff', textAlign: 'center', - borderRadius: pxTransform(6), + borderRadius: pxTransform(2), backgroundColor: '#ff8881', fontSize: pxTransform(14), } diff --git a/src/packages/layout/demos/taro/demo2.tsx b/src/packages/layout/demos/taro/demo2.tsx index 1728081f2e..c0c0443df9 100644 --- a/src/packages/layout/demos/taro/demo2.tsx +++ b/src/packages/layout/demos/taro/demo2.tsx @@ -12,7 +12,7 @@ const Demo2 = () => { justifyContent: 'center', color: '#fff', textAlign: 'center', - borderRadius: pxTransform(6), + borderRadius: pxTransform(2), backgroundColor: '#ff8881', fontSize: pxTransform(14), } diff --git a/src/packages/layout/demos/taro/demo3.tsx b/src/packages/layout/demos/taro/demo3.tsx index 972dc9358e..6d5e0faf78 100644 --- a/src/packages/layout/demos/taro/demo3.tsx +++ b/src/packages/layout/demos/taro/demo3.tsx @@ -12,7 +12,7 @@ const Demo3 = () => { justifyContent: 'center', color: '#fff', textAlign: 'center', - borderRadius: pxTransform(6), + borderRadius: pxTransform(2), backgroundColor: '#ff8881', fontSize: pxTransform(14), } diff --git a/src/packages/layout/layout.scss b/src/packages/layout/layout.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/styles/variables.scss b/src/styles/variables.scss index b445e4a88c..8c08dc1187 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -2396,24 +2396,9 @@ $countup-bg-color: var(--nutui-countup-bg-color, inherit) !default; $countup-color: var(--nutui-countup-color, $color-title) !default; // layout（✅） -$row-content-color: var(--nutui-row-content-color, #fff) !default; -$row-content-background-color: var( - --nutui-row-content-background-color, - var(--row-content-bg-color, #ff8881) -) !default; -$row-content-light-background-color: var( - --row-content-light-bg-color, - #ffc7c4 -) !default; -$row-content-border-radius: var( - --nutui-row-content-border-radius, - 6px -) !default; -$row-content-height: var(--nutui-row-content-height, 50px) !default; -$row-content-line-height: var(--nutui-row-content-line-height, 40px) !default; $col-default-margin-bottom: var( --nutui-col-default-margin-bottom, - 15px + 10px ) !default; // TrendArrow