Skip to content

Commit 320ca50

Browse files
committed
fix: config文件更新&其他主体变量同步
1 parent b685923 commit 320ca50

File tree

3 files changed

+289
-159
lines changed

3 files changed

+289
-159
lines changed

src/config.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,6 @@
811811
"taro": true,
812812
"jdtaro": 2,
813813
"v15": 1,
814-
815814
"author": "VickyYe",
816815
"dd": true
817816
},
@@ -1269,18 +1268,20 @@
12691268
"dd": true
12701269
},
12711270
{
1272-
"version": "2.0.0",
1271+
"version": "3.0.0",
12731272
"name": "Step",
12741273
"sort": 17,
12751274
"cName": "步骤条子组件",
12761275
"type": "component",
12771276
"show": false,
12781277
"exportEmpty": true,
12791278
"desc": "步骤条子组件",
1280-
"author": "swag~jun"
1279+
"v15": 2,
1280+
"author": "songsong",
1281+
"dd": true
12811282
},
12821283
{
1283-
"version": "2.0.0",
1284+
"version": "3.0.0",
12841285
"name": "Steps",
12851286
"type": "component",
12861287
"cName": "步骤条",
@@ -1289,8 +1290,8 @@
12891290
"show": true,
12901291
"taro": true,
12911292
"v15": 2,
1292-
"author": "swag~jun",
1293-
"dd": false
1293+
"author": "songsong",
1294+
"dd": true
12941295
},
12951296
{
12961297
"version": "3.0.0",

src/styles/variables-jmapp.scss

Lines changed: 139 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,138 +1299,200 @@ $address-tab-line-background: linear-gradient(
12991299
) !default;
13001300

13011301
//steps(✅)
1302+
$steps-background-color: var(--nutui-steps-background-color, $white) !default;
1303+
$steps-base-head-height: var(--nutui-steps-base-head-height, 14px) !default;
1304+
$steps-base-head-background-color: var(
1305+
--nutui-steps-base-head-background-color,
1306+
$color-background
1307+
) !default;
1308+
$steps-base-head-border: var(--nutui-steps-base-head-border, none) !default;
1309+
$steps-base-head-text-size: var(
1310+
--nutui-steps-base-head-text-size,
1311+
12px
1312+
) !default;
13021313
$steps-base-head-size: var(
13031314
--nutui-steps-base-icon-size,
1304-
$font-size-xs
1315+
$font-size-xxs
13051316
) !default;
1306-
1307-
$steps-base-icon-width: var(--nutui-steps-base-icon-width, 25px) !default;
1308-
$steps-base-icon-height: var(--nutui-steps-base-icon-height, 25px) !default;
1309-
$steps-base-icon-line-height: var(
1310-
--nutui-steps-base-icon-line-height,
1311-
25px
1317+
$steps-base-head-color: var(
1318+
--nutui-steps-base-head-color,
1319+
$color-text
13121320
) !default;
1313-
$steps-base-icon-margin-bottom: var(
1314-
--nutui-steps-base-icon-margin-bottom,
1315-
12px
1321+
$steps-base-head-dot-size: var(--nutui-steps-base-head-dot-size, 6px) !default;
1322+
$steps-base-head-dot-background-color: var(
1323+
--nutui-steps-base-head-dot-background-color,
1324+
$color-text-disabled
13161325
) !default;
1317-
$steps-base-icon-font-size: var(
1318-
--nutui-steps-base-icon-font-size,
1319-
$font-size-s
1326+
$steps-base-head-icon-size: var(
1327+
--nutui-steps-base-head-icon-size,
1328+
16px
1329+
) !default;
1330+
$steps-double-head-icon-size: var(
1331+
--nutui-steps-base-head-icon-size-right,
1332+
20px
1333+
) !default;
1334+
$steps-vertical-head-icon-size: var(
1335+
--nutui-steps-vertical-item-icon-size,
1336+
20px
13201337
) !default;
1321-
$steps-base-line-width: var(--nutui-steps-base-line-width, 70%) !default;
13221338
$steps-base-line-height: var(--nutui-steps-base-line-height, 1px) !default;
13231339
$steps-base-line-background: var(
13241340
--nutui-steps-base-line-background,
13251341
$color-border
13261342
) !default;
13271343
$steps-base-title-font-size: var(
13281344
--nutui-steps-base-title-font-size,
1329-
$font-size-base
1345+
$font-size-s
13301346
) !default;
13311347
$steps-base-title-color: var(
13321348
--nutui-steps-base-title-color,
13331349
$color-title
13341350
) !default;
1335-
$steps-base-title-margin-bottom: var(
1351+
$steps-base-description-margin-top: var(
13361352
--nutui-steps-base-title-margin-bottom,
1337-
0
1353+
2px
13381354
) !default;
13391355
$steps-base-description-font-size: var(
13401356
--nutui-steps-base-description-font-size,
1341-
$font-size-s
1357+
$font-size-xxs
13421358
) !default;
13431359
$steps-base-description-color: var(
13441360
--nutui-steps-base-description-color,
1345-
$color-text
1361+
$color-text-help
13461362
) !default;
1347-
$steps-wait-icon-bg-color: var(
1348-
--nutui-steps-wait-icon-bg-color,
1349-
$color-default
1363+
$steps-base-head-border-color: var(
1364+
--nutui-steps-base-head-border-color,
1365+
$color-border
1366+
) !default;
1367+
$steps-process-head-border-color: var(
1368+
--nutui-steps-base-head-border-color,
1369+
$color-border
1370+
) !default;
1371+
$steps-process-head-border-color: var(
1372+
--nutui-steps-base-head-border-color,
1373+
$color-border
1374+
) !default;
1375+
$steps-process-head-background-color: var(
1376+
--nutui-steps-process-head-background-color,
1377+
$color-primary
1378+
) !default;
1379+
$steps-process-color: var(--nutui-steps-process-color, $white) !default;
1380+
$steps-process-title-color: var(
1381+
--nutui-steps-process-title-color,
1382+
$color-primary
1383+
) !default;
1384+
$steps-process-description-color: var(
1385+
--nutui-steps-process-description-color,
1386+
$color-primary
13501387
) !default;
13511388
$steps-wait-icon-color: var(
13521389
--nutui-steps-wait-icon-color,
13531390
$color-text-help
13541391
) !default;
13551392
$steps-wait-title-color: var(
13561393
--nutui-steps-wait-title-color,
1357-
$color-text-help
1394+
$color-title
13581395
) !default;
13591396
$steps-wait-description-color: var(
13601397
--nutui-steps-wait-description-color,
1361-
$color-text-help
1398+
$color-text
13621399
) !default;
1363-
$steps-process-icon-bg-color: var(
1364-
--nutui-steps-process-icon-bg-color,
1365-
$color-primary
1400+
$steps-finish-icon-color: var(
1401+
--nutui-steps-finish-icon-color,
1402+
$color-text-help
13661403
) !default;
1367-
$steps-process-icon-before-bg-color: var(
1368-
--nutui-steps-process-icon-before-bg-color,
1369-
none
1404+
$steps-business-title-color: var(
1405+
--nutui-steps-business-title-color,
1406+
#994d00
13701407
) !default;
1371-
$steps-process-icon-color: var(
1372-
--nutui-steps-process-icon-color,
1373-
$white
1408+
$steps-business-description-color: var(
1409+
--nutui-steps-business-description-color,
1410+
#994d00
13741411
) !default;
1375-
$steps-process-title-color: var(
1376-
--nutui-steps-process-title-color,
1377-
$color-primary
1412+
$steps-business-head-text-color: var(
1413+
--nutui-steps-business-head-text-color,
1414+
#994d00
13781415
) !default;
1379-
$steps-process-title-font-size: var(
1380-
--nutui-steps-process-title-font-size,
1381-
$font-size-base
1416+
$steps-business-head-dot-background-color: var(
1417+
--nutui-steps-business-head-dot-background-color,
1418+
#994d00
13821419
) !default;
1383-
$steps-process-title-font-weight: var(
1384-
--nutui-steps-process-title-font-weight,
1385-
$font-weight-bold
1420+
$steps-business-head-icon-color: var(
1421+
--nutui-steps-business-head-icon-color,
1422+
#994d00
13861423
) !default;
1387-
$steps-process-description-color: var(
1388-
--nutui-steps-process-description-color,
1389-
$color-text
1424+
$steps-business-head-background-color: var(
1425+
--nutui-steps-business-head-background-color,
1426+
#fff4e8
13901427
) !default;
1391-
$steps-finish-icon-bg-color: var(
1392-
--nutui-steps-finish-icon-bg-color,
1428+
$steps-enhanced-finish-head-background-color: var(
1429+
--nutui-steps-enhanced-finish-head-background-color,
13931430
$color-primary-light-pressed
13941431
) !default;
1395-
$steps-finish-icon-color: var(
1396-
--nutui-steps-finish-icon-color,
1397-
$color-primary
1432+
$steps-enhanced-finish-head-dot-background-color: var(
1433+
--nutui-steps-enhanced-finish-head-dot-background-color,
1434+
#ffadbe
13981435
) !default;
1399-
$steps-finish-icon-border-color: var(
1400-
--nutui-steps-finish-icon-border-color,
1401-
transparent
1436+
$steps-enhanced-finish-head-icon-color: var(
1437+
--nutui-steps-enhanced-finish-head-icon-color,
1438+
$color-primary-stop-1
14021439
) !default;
1403-
$steps-finish-title-color: var(
1404-
--nutui-steps-finish-title-color,
1405-
$color-title
1440+
$steps-enhanced-finish-head-text-color: var(
1441+
--nutui-steps-enhanced-finish-head-text-color,
1442+
$color-primary-stop-1
14061443
) !default;
1407-
$steps-finish-description-color: var(
1408-
--nutui-steps-finish-description-color,
1409-
$color-text
1444+
$steps-horizontal-item-padding-right: var(
1445+
--nutui-steps-horizontal-item-padding-right,
1446+
28px
14101447
) !default;
1411-
$steps-finish-line-background: var(
1412-
--nutui-steps-finish-line-background,
1413-
$color-primary
1448+
$steps-horizontal-item-line-padding: var(
1449+
--nutui-steps-horizontal-item-line-padding,
1450+
0 8px
14141451
) !default;
1415-
$steps-dot-finish-icon-bg-color: var(
1416-
--nutui-steps-finish-icon-bg-color,
1417-
$white
1452+
$steps-horizontal-item-special-padding-right: var(
1453+
--nutui-steps-horizontal-item-special-padding-right,
1454+
22px
14181455
) !default;
1419-
$steps-dot-finish-icon-border-color: var(
1420-
--nutui-steps-finish-icon-color,
1421-
$color-primary
1456+
$steps-horizontal-item-special-3-padding-right: var(
1457+
--nutui-steps-horizontal-item-special-3-padding-right,
1458+
9px
14221459
) !default;
1423-
$steps-dot-wait-icon-bg-color: var(
1424-
--nutui-steps-dot-wait-icon-bg-color,
1425-
$white
1460+
$steps-vertical-item-padding-bottom: var(
1461+
--nutui-steps-vertical-item-padding-bottom,
1462+
13px
1463+
) !default;
1464+
$steps-vertical-title-font-size: var(
1465+
--nutui-steps-vertical-title-font-size,
1466+
$font-size-l
1467+
) !default;
1468+
$steps-vertical-title-margin-bottom: var(
1469+
--nutui-steps-vertical-title-margin-bottom,
1470+
4px
1471+
) !default;
1472+
$steps-vertical-line-height: var(
1473+
--nutui-steps-vertical-line-height,
1474+
18px
1475+
) !default;
1476+
$steps-vertical-description-font-size: var(
1477+
--nutui-steps-vertical-description-font-size,
1478+
$font-size-base
1479+
) !default;
1480+
$steps-vertical-description-margin: var(
1481+
--nutui-steps-vertical-description-margin,
1482+
0 0 1px
1483+
) !default;
1484+
$steps-vertical-description-time-font-size: var(
1485+
--nutui-steps-vertical-description-time-font-size,
1486+
$font-size-s
1487+
) !default;
1488+
$steps-vertical-description-time-margin-top: var(
1489+
--nutui-steps-vertical-description-time-margin-top,
1490+
2px
14261491
) !default;
1427-
$steps-dot-icon-width: var(--nutui-steps-dot-icon-width, 6px) !default;
1428-
$steps-dot-icon-height: var(--nutui-steps-dot-icon-height, 6px) !default;
1429-
$steps-dot-icon-border: var(
1430-
--nutui-steps-dot-icon-border,
1431-
2px solid $color-border-shade
1492+
$steps-vertical-description-time-color: var(
1493+
--nutui-steps-vertical-description-time-color,
1494+
#808080
14321495
) !default;
1433-
$steps-dot-head-margin: var(--nutui-steps-dot-head-margin, 10px 0) !default;
14341496

14351497
// dialog(✅)
14361498
$dialog-min-width: var(--nutui-dialog-min-width, 240px) !default;

0 commit comments

Comments
 (0)