Skip to content

Commit ec827b1

Browse files
Merge release/1.28.0 into main branch (#563)
* updates Dropdown documentation, adds Figma addon for illustrations (#554) * add transparent Button variant & update DropdownIconToggle (#560) Adding the transparent and outline transparent variant to the Button component. Uses transparent button variant in ModalFooter actions for closing. Updates DropdownToggle to support icon-only dropdown. Removes DropdownIconToggle in favor of using DropdownToggle to better support flexible styling. * Prepare release 1.28.0 Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent dbb32e8 commit ec827b1

18 files changed

+585
-103
lines changed

cypress/integration/button_spec.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ const buttons = [
1717
class: '.Button',
1818
match: 'Edit',
1919
},
20+
{
21+
name: 'Transparent',
22+
path: 'components-button--transparent',
23+
class: '.Button',
24+
match: 'Skip',
25+
},
2026
];
2127

2228
describe('Button', () => {

cypress/integration/dropdown_spec.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@ const dropdowns = [
1010
class: '.Dropdown',
1111
},
1212
{
13-
name: 'Icon',
14-
path: 'components-dropdown--icon',
13+
name: 'Icon Default',
14+
path: 'components-dropdown--icon-default',
15+
class: '.Dropdown',
16+
},
17+
{
18+
name: 'Icon Swap',
19+
path: 'components-dropdown--icon-swap',
1520
class: '.Dropdown',
1621
},
1722
];

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@user-interviews/ui-design-system",
3-
"version": "1.27.0",
3+
"version": "1.28.0",
44
"dependencies": {
55
"react-bootstrap": "^2.0.2",
66
"react-router-dom": "^5.2.0",
@@ -117,6 +117,7 @@
117117
"react-test-renderer": "^16.12.0",
118118
"react-tracking": "8.1.0",
119119
"sass-loader": "^8.0.2",
120+
"storybook-addon-designs": "^6.2.1",
120121
"style-loader": "^1.1.3",
121122
"styled-components": "^5.3.3"
122123
},

scss/buttons.scss

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,65 @@ $warning: $ux-yellow-400;
192192
border-color: $btn-outline-warning-active-border-color;
193193
}
194194
}
195+
196+
@mixin btn-transparent {
197+
$btn-transparent-background: transparent;
198+
$btn-transparent-border: transparent;
199+
$btn-transparent-color: $ux-gray-700;
200+
201+
$btn-transparent-hover-background: $ux-gray-300;
202+
$btn-transparent-hover-border: transparent;
203+
$btn-transparent-hover-color: $ux-gray-900;
204+
205+
$btn-transparent-active-background: transparent;
206+
$btn-transparent-active-border: $ux-gray-400;
207+
$btn-transparent-active-color: $ux-gray-900;
208+
209+
@include button-variant(
210+
$btn-transparent-background,
211+
$btn-transparent-border,
212+
$btn-transparent-color,
213+
214+
$btn-transparent-hover-background,
215+
$btn-transparent-hover-border,
216+
$btn-transparent-hover-color,
217+
218+
$btn-transparent-active-background,
219+
$btn-transparent-active-border,
220+
$btn-transparent-active-color,
221+
);
222+
223+
&:disabled {
224+
color: $ux-gray-500;
225+
}
226+
}
227+
228+
@mixin btn-outline-transparent {
229+
$btn-outline-transparent-color: $ux-gray-900;
230+
$btn-outline-transparent-color-hover: $ux-gray-900;
231+
232+
$btn-outline-transparent-hover-background: $ux-gray-300;
233+
$btn-outline-transparent-hover-border: $ux-gray-300;
234+
$btn-outline-transparent-hover-color: $ux-gray-900;
235+
236+
$btn-outline-transparent-border: $ux-gray-400;
237+
238+
$btn-outline-transparent-active-background: $ux-gray-400;
239+
$btn-outline-transparent-active-border-color: $ux-gray-400;
240+
241+
@include button-outline-variant(
242+
$btn-outline-transparent-color,
243+
$btn-outline-transparent-color-hover,
244+
245+
$btn-outline-transparent-hover-background,
246+
$btn-outline-transparent-hover-border,
247+
$btn-outline-transparent-hover-color,
248+
);
249+
border-color: $btn-outline-transparent-border;
250+
251+
&:active {
252+
background-color: $btn-outline-transparent-active-background;
253+
border-color: $btn-outline-transparent-active-border-color;
254+
}
255+
}
256+

0 commit comments

Comments
 (0)