From 2c9897d0cc74fa3f611643bb0b80b5b7c99239a0 Mon Sep 17 00:00:00 2001 From: lichenhui Date: Mon, 8 Jul 2024 16:40:04 +0800 Subject: [PATCH 01/35] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ossa-demo/src/assets/style/_variable.scss | 3 +++ .../ossa-demo/src/components/color/demo/index.tsx | 5 +++++ packages/ossa-doc/docs/color.md | 3 +++ packages/ossa/src/style/_variable.scss | 15 +++++++++------ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/packages/ossa-demo/src/assets/style/_variable.scss b/packages/ossa-demo/src/assets/style/_variable.scss index 4bfea084..7f406693 100644 --- a/packages/ossa-demo/src/assets/style/_variable.scss +++ b/packages/ossa-demo/src/assets/style/_variable.scss @@ -6,6 +6,9 @@ $--font-color:#666; $--font-size:14px; +/* Theme Color */ +$--color-primay:#AF7357 !default; // 主题色 + /* Color */ $--color-red:#DD1A21 !default; // 品牌红 // $--color-logo:#FF142F !default; // 桌面图标亮红色 diff --git a/packages/ossa-demo/src/components/color/demo/index.tsx b/packages/ossa-demo/src/components/color/demo/index.tsx index 76cffe0f..6f0fea8e 100644 --- a/packages/ossa-demo/src/components/color/demo/index.tsx +++ b/packages/ossa-demo/src/components/color/demo/index.tsx @@ -40,6 +40,11 @@ function getClassObject() { } const initialColorList: ColorListItem[] = [ + { + color: "#AF7357", + title: "YXColorPrimary", + desc: "主题色", + }, { color: "#DD1A21", title: "YXColorRed", diff --git a/packages/ossa-doc/docs/color.md b/packages/ossa-doc/docs/color.md index 216e9772..790ea486 100644 --- a/packages/ossa-doc/docs/color.md +++ b/packages/ossa-doc/docs/color.md @@ -7,6 +7,9 @@ demo_url: 'https://neteaseyanxuan.github.io/OSSA/#/components/color/demo/index' ### scss变量 ```scss +/* Theme Color */ +$--color-primay: #AF7357 !default; // 主题色 + /* Color */ $--color-red:#DD1A21 !default; // 品牌红 $--color-yellow:#F48F18 !default; // 营销色 diff --git a/packages/ossa/src/style/_variable.scss b/packages/ossa/src/style/_variable.scss index 4bfea084..19586c15 100644 --- a/packages/ossa/src/style/_variable.scss +++ b/packages/ossa/src/style/_variable.scss @@ -6,6 +6,9 @@ $--font-color:#666; $--font-size:14px; +/* Theme Color */ +$--color-primay:#AF7357 !default; // 主题色 + /* Color */ $--color-red:#DD1A21 !default; // 品牌红 // $--color-logo:#FF142F !default; // 桌面图标亮红色 @@ -139,9 +142,9 @@ $--fill-color-button-default: transparent !default; $--fill-color-button-default-active: $--fill-body !default; $--fill-color-button-default-disabled: $--text-color-disabled !default; -$--fill-color-button-primary: $--color-red !default; +$--fill-color-button-primary: $--color-primay !default; $--fill-color-button-primary-active: #C6171D !default; -$--fill-color-button-primary-disabled: $--color-red !default; +$--fill-color-button-primary-disabled: $--color-primay !default; $--fill-color-button-special1: transparent !default; @@ -155,15 +158,15 @@ $--border-color-default: $--text-color-secondary !default; $--border-color-default-active: $--text-color-secondary !default; $--border-color-default-disabled: transparent !default; -$--border-color-primary: $--color-red !default; +$--border-color-primary: $--color-primay !default; $--border-color-primary-active: #A22929 !default; -$--border-color-primary-disabled: $--color-red !default; +$--border-color-primary-disabled: $--color-primay !default; $--border-color-special1: $--color-border-base-1 !default; -$--border-color-special1-active: $--color-red !default; +$--border-color-special1-active: $--color-primay !default; $--border-color-special2: $--text-color-disabled !default; -$--border-color-special2-active: $--color-red !default; +$--border-color-special2-active: $--color-primay !default; $--border-color-icon: #979797 !default; $--border-color-icon-active: #979797 !default; From 253ee16e57c7819163f3ef64a17256fe2c7f1c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=B9=BF=E9=BE=99?= <527385335@qq.com> Date: Mon, 8 Jul 2024 16:47:10 +0800 Subject: [PATCH 02/35] =?UTF-8?q?style:=20=E6=A0=B9=E6=8D=AE=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E8=A7=84=E8=8C=83=E8=B0=83=E6=95=B4=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ossa-demo/src/components/icon/demo/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ossa-demo/src/components/icon/demo/index.tsx b/packages/ossa-demo/src/components/icon/demo/index.tsx index 5551824c..2942007a 100644 --- a/packages/ossa-demo/src/components/icon/demo/index.tsx +++ b/packages/ossa-demo/src/components/icon/demo/index.tsx @@ -629,4 +629,4 @@ export default function Index(props: Props) { ); } -interface Props {} +interface Props { } From 072e6f3a61a9cdf19e275d79352f3d6dfef81c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=B9=BF=E9=BE=99?= <527385335@qq.com> Date: Mon, 8 Jul 2024 16:47:43 +0800 Subject: [PATCH 03/35] =?UTF-8?q?style:=20=E6=A0=B9=E6=8D=AE=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E8=A7=84=E8=8C=83=E8=B0=83=E6=95=B4=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ossa/src/components/modal/index.tsx | 23 +- packages/ossa/src/style/components/modal.scss | 28 +- pnpm-lock.yaml | 30128 +++++++++------- 3 files changed, 16488 insertions(+), 13691 deletions(-) diff --git a/packages/ossa/src/components/modal/index.tsx b/packages/ossa/src/components/modal/index.tsx index 97bdeff9..521759b1 100644 --- a/packages/ossa/src/components/modal/index.tsx +++ b/packages/ossa/src/components/modal/index.tsx @@ -1,9 +1,10 @@ import React from "react"; -import { View, Image, Text, Button } from "@tarojs/components"; +import { View, Image, Text } from "@tarojs/components"; import classNames from "classnames"; import { OsModalProps } from "../../../types/index"; import getOpenTypeRelatedProps from "../../utils/getOpenTypeRelatedProps"; import { deprecatedProp } from "../../utils"; +import Button from "../button"; const closeIconImg = "https://yanxuan-static.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/modalClose-9d2d6d39f7.png?imageView"; @@ -107,9 +108,12 @@ export default function Index(props: OsModalProps) {