Skip to content

Commit 49a327f

Browse files
committed
fix:added color
1 parent f10dc35 commit 49a327f

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ __build-es
99
**/index.js
1010

1111
CHANGELOG.md
12+
13+
themePrepare_bck.js

__application/component/Button/Button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ const StyledButton = styled(
7474
width: ${(props) => props.fluid ? "100%" : ""};
7575
border-width: 1px;
7676
border-style: solid;
77-
border-color: ${(props) => props.theme.Button[props.variant].borderColor};
77+
border-color: ${(props) => props.theme.Universal.Color[props.variant]};
7878
border-radius: ${(props) => props.theme.Button.borderRadius};
7979
pointer-events: ${styles.pointerEvents};
8080
opacity: ${styles.opacity};

__appset/configColor.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@ const Color = {
22
"default": {
33
"bgColor": "#ffffff",
44
"color": "#000000",
5+
56
"primary": "#00364e",
67
"secondary": "#03567b"
78
},
89
"dark": {
9-
"bgColor": "#0a0a0a",
10+
"bgColor": "#111111",
1011
"color": "#ffffff",
11-
"primary": "#0a0a0a",
12-
"secondary": "#1f1f1f"
12+
13+
"primary": "#111111",
14+
"secondary": "#4d4d4d"
1315
}
1416
}
1517

@@ -20,3 +22,8 @@ export default window && Color[localStorage.getItem("themeType")] ? Color[localS
2022
// "warning": "#ffa000",
2123
// "danger": "#d32f2f",
2224
// "orange": "#fc6027"
25+
26+
// #111
27+
// #1e1e1e
28+
// #3c3c3c
29+
// #4d4d4d

0 commit comments

Comments
 (0)