Skip to content

Commit 872f325

Browse files
authored
fix: Button ghost background var (#310)
1 parent fa6b31d commit 872f325

12 files changed

+14
-7
lines changed
Loading
Loading
Loading
Loading
Loading
Loading

packages/fuselage/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"build": "run-s clean build:prod build:dev",
2828
"eslint": "eslint src",
2929
"stylelint": "stylelint 'src/**/*.scss'",
30+
"fix": "stylelint --fix 'src/**/*.scss'",
3031
"lint": "run-s eslint stylelint",
3132
"lint-staged": "lint-staged",
3233
"test": "jest",

packages/fuselage/src/components/Button/styles.scss

+2-6
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,12 @@
132132
}
133133

134134
&--ghost {
135-
border-color: transparent;
136-
background-color: transparent;
135+
border-color: $button-colors-ghost-background-color;
136+
background-color: $button-colors-ghost-border-color;
137137
}
138138

139139
&--ghost-danger {
140140
color: colors.danger(500);
141-
border-color: transparent;
142-
background-color: transparent;
143141

144142
&.disabled,
145143
&:disabled {
@@ -149,8 +147,6 @@
149147

150148
&--ghost-success {
151149
color: colors.success(500);
152-
border-color: transparent;
153-
background-color: transparent;
154150

155151
&.disabled,
156152
&:disabled {

packages/fuselage/src/components/Sidebar/TopBar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ TopBar.Avatar = Avatar;
2626
TopBar.Actions = Actions;
2727
TopBar.Action = (props) => <ActionButton small ghost {...props}/>;
2828
TopBar.Divider = () => <Divider mbs='neg-x2' mbe={0} />;
29-
TopBar.Title = (props) => <Box rcx-sidebar-top-bar__title fontScale='p2' color='neutral-900' withTruncatedText {...props} />;
29+
TopBar.Title = (props) => <Box rcx-sidebar-top-bar__title withTruncatedText {...props} />;
3030

3131
export default TopBar;

packages/fuselage/src/components/Sidebar/styles.scss

+7
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ $sidebar-item-color-selected: theme('sidebar-item-color-selected', colors.foregr
4949
padding-block: lengths.padding(16);
5050
padding-inline: lengths.padding(16);
5151
}
52+
53+
&__title {
54+
@include typography.use-font-scale(p2);
55+
56+
color: colors.neutral(900);
57+
}
5258
}
5359

5460
&-item {
@@ -184,6 +190,7 @@ $sidebar-item-color-selected: theme('sidebar-item-color-selected', colors.foregr
184190

185191
&-title {
186192
@include typography.use-font-scale(c2);
193+
@include typography.use-with-truncated-text();
187194
padding-block: lengths.padding(12);
188195
padding-inline: lengths.padding(16);
189196

packages/fuselage/src/styles/variables/button-colors.scss

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
@use '../colors.scss';
22

3+
$button-colors-ghost-background-color: theme('button-colors-ghost-background-color', transparent);
4+
$button-colors-ghost-border-color: theme('button-colors-ghost-border-color', transparent);
5+
36
$button-colors-primary-background-color: theme('button-colors-primary-background-color', colors.primary(500));
47
$button-colors-primary-border-color: theme('button-colors-primary-border-color', colors.primary(500));
58
$button-colors-primary-color: theme('button-colors-primary-color', colors.foreground(alternative));

0 commit comments

Comments
 (0)