mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2025-03-01 13:36:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove textcolor4 & 5 in themes

Browse Source
This commit is contained in:
07akioni 2021-04-02 01:02:45 +08:00
parent 0c1fc56f30
commit 67668d5120
7 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/_internal/selection/styles/dark.ts
View File

@ -14,7 +14,7 @@ const internalSelectionDark: InternalSelectionTheme = {
const { const {
borderRadius, borderRadius,
textColor2, textColor2,
textColor4, textColorDisabled,
inputColor, inputColor,
inputColorDisabled, inputColorDisabled,
primaryColor, primaryColor,
@ -36,7 +36,7 @@ const internalSelectionDark: InternalSelectionTheme = {
borderRadius: borderRadius, borderRadius: borderRadius,
// default // default
textColor: textColor2, textColor: textColor2,
textColorDisabled: textColor4, textColorDisabled,
placeholderColor, placeholderColor,
placeholderColorDisabled, placeholderColorDisabled,
color: inputColor, color: inputColor,

4
src/_internal/selection/styles/light.ts
View File

@ -9,7 +9,7 @@ const self = (vars: ThemeCommonVars) => {
const { const {
borderRadius, borderRadius,
textColor2, textColor2,
textColor4, textColorDisabled,
inputColor, inputColor,
inputColorDisabled, inputColorDisabled,
primaryColor, primaryColor,
@ -32,7 +32,7 @@ const self = (vars: ThemeCommonVars) => {
borderRadius: borderRadius, borderRadius: borderRadius,
// default // default
textColor: textColor2, textColor: textColor2,
textColorDisabled: textColor4, textColorDisabled,
placeholderColor, placeholderColor,
placeholderColorDisabled, placeholderColorDisabled,
color: inputColor, color: inputColor,

4
src/_styles/common/dark.ts
View File

@ -121,8 +121,8 @@ const derived: ThemeCommonVars = {
textColor1: overlay(base.alpha1), textColor1: overlay(base.alpha1),
textColor2: overlay(base.alpha2), textColor2: overlay(base.alpha2),
textColor3: overlay(base.alpha3), textColor3: overlay(base.alpha3),
textColor4: overlay(base.alpha4), // disabled, placeholder, icon // textColor4: overlay(base.alpha4), // disabled, placeholder, icon
textColor5: overlay(base.alpha5), // textColor5: overlay(base.alpha5),
textColorDisabled: overlay(base.alpha4), textColorDisabled: overlay(base.alpha4),
placeholderColor: overlay(base.alpha4), placeholderColor: overlay(base.alpha4),

4
src/_styles/common/light.ts
View File

@ -120,8 +120,8 @@ const derived = {
textColor1: neutral(base.alpha1), textColor1: neutral(base.alpha1),
textColor2: neutral(base.alpha2), textColor2: neutral(base.alpha2),
textColor3: neutral(base.alpha3), textColor3: neutral(base.alpha3),
textColor4: neutral(base.alpha4), // disabled, placeholder, icon // textColor4: neutral(base.alpha4), // disabled, placeholder, icon
textColor5: neutral(base.alpha5), // textColor5: neutral(base.alpha5),
textColorDisabled: neutral(base.alpha4), textColorDisabled: neutral(base.alpha4),
placeholderColor: neutral(base.alpha4), placeholderColor: neutral(base.alpha4),

9
src/input/styles/dark.ts
View File

@ -9,8 +9,7 @@ const inputDark: InputTheme = {
self (vars) { self (vars) {
const { const {
textColor2, textColor2,
textColor4, textColorDisabled,
textColor5,
primaryColor, primaryColor,
primaryColorHover, primaryColorHover,
inputColor, inputColor,
@ -51,7 +50,7 @@ const inputDark: InputTheme = {
iconSize: '16px', iconSize: '16px',
groupLabelColor: inputColor, groupLabelColor: inputColor,
textColor: textColor2, textColor: textColor2,
textColorDisabled: textColor4, textColorDisabled,
textDecorationColor: textColor2, textDecorationColor: textColor2,
groupLabelTextColor: textColor2, groupLabelTextColor: textColor2,
caretColor: primaryColor, caretColor: primaryColor,
@ -87,8 +86,8 @@ const inputDark: InputTheme = {
clearColor, clearColor,
clearColorHover, clearColorHover,
clearColorPressed, clearColorPressed,
iconColor: textColor4, iconColor: placeholderColor,
iconColorDisabled: textColor5, iconColorDisabled: placeholderColorDisabled,
suffixTextColor: textColor2 suffixTextColor: textColor2
} }
} }

9
src/input/styles/light.ts
View File

@ -7,8 +7,7 @@ import type { Theme } from '../../_mixins'
const self = (vars: ThemeCommonVars) => { const self = (vars: ThemeCommonVars) => {
const { const {
textColor2, textColor2,
textColor4, textColorDisabled,
textColor5,
primaryColor, primaryColor,
primaryColorHover, primaryColorHover,
inputColor, inputColor,
@ -52,7 +51,7 @@ const self = (vars: ThemeCommonVars) => {
groupLabelColor: actionColor, groupLabelColor: actionColor,
groupLabelTextColor: textColor2, groupLabelTextColor: textColor2,
textColor: textColor2, textColor: textColor2,
textColorDisabled: textColor4, textColorDisabled,
textDecorationColor: textColor2, textDecorationColor: textColor2,
caretColor: primaryColor, caretColor: primaryColor,
placeholderColor, placeholderColor,
@ -87,8 +86,8 @@ const self = (vars: ThemeCommonVars) => {
clearColor, clearColor,
clearColorHover, clearColorHover,
clearColorPressed, clearColorPressed,
iconColor: textColor4, iconColor: placeholderColor,
iconColorDisabled: textColor5, iconColorDisabled: placeholderColorDisabled,
suffixTextColor: textColor2 suffixTextColor: textColor2
} }
} }

4
themes/tusimple/src/theme-overrides-dark.ts
View File

@ -66,8 +66,8 @@ export const themeOverridesDark: GlobalThemeOverrides = {
inputColorDisabled: '#333333', inputColorDisabled: '#333333',
textColor3: '#ADADAD', textColor3: '#ADADAD',
textColor4: '#5B5B5B', // disabled, placeholder, icon placeholderColor: '#5B5B5B', // disabled, placeholder, icon
textColor5: '#848484', placeholderColorDisabled: '#848484',
tableHeaderColor: '#282828', tableHeaderColor: '#282828',
hoverColor: 'rgba(79, 178, 51, 0.15)', hoverColor: 'rgba(79, 178, 51, 0.15)',