Skip to content

Commit 35bde05

Browse files
github-actions[bot]rroppolocareful-axejasonbasuilbrianCollinsUI
authored
Merge release/1.26.0 into main branch (#513)
* HOTFIX update tooltip primary variant to ux-emerald (#415) * Feature RS-8352 Tabs (#477) Add Tabs and Tabs with react-bootstrap and styled-components * feature/UIDS-442 add Button to DS (#450) Adds react-bootstrap and Button component to the Design System * Bug/UIDS-484 Set node version on nightly visual tests (#485) * chore/UIDS-476 documentation updates (#486) * Chore/ Add Percy snapshots for buttons (#488) * Chore/ Delete old sample file for cypress tests (#482) * Merge hotfix/1.24.1 into develop branch (#493) * allows Tooltip to open on hover (#487) * Merge release/1.25.0 into develop branch (#495) * allows Tooltip to open on hover (#487) * Prepare hotfix 1.24.1 (#492) * Prepare release 1.25.0 Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Merge hotfix/1.25.1 into develop branch (#499) * allows Tooltip to open on hover (#487) * Prepare hotfix 1.24.1 (#492) * Merge release/1.25.0 into main branch (#494) * HOTFIX update tooltip primary variant to ux-emerald (#415) * Feature RS-8352 Tabs (#477) Add Tabs and Tabs with react-bootstrap and styled-components * feature/UIDS-442 add Button to DS (#450) Adds react-bootstrap and Button component to the Design System * Bug/UIDS-484 Set node version on nightly visual tests (#485) * chore/UIDS-476 documentation updates (#486) * Chore/ Add Percy snapshots for buttons (#488) * Chore/ Delete old sample file for cypress tests (#482) * Merge hotfix/1.24.1 into develop branch (#493) * allows Tooltip to open on hover (#487) * Prepare release 1.25.0 Co-authored-by: Rachel Roppolo <[email protected]> Co-authored-by: Jane Sebastian <[email protected]> Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: brianCollinsUI <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * update relative bootstrap imports (#497) * Prepare hotfix 1.25.1 Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Rachel Roppolo <[email protected]> Co-authored-by: Jane Sebastian <[email protected]> Co-authored-by: brianCollinsUI <[email protected]> * Chore/wait a bit longer for things to render on some percy snapshots (#503) * UIDS-438 Add AsyncCreatableSelect (#500) * UIDS-506 Update Form to handle GET method (#507) Previously passing a GET method would have worked for Rails, but it wouldn't put the params in the URL which is the expected behavior. This makes it so we properly pass GET directly to the form method parameter. One other thing this does is remove the CSRF params if GET is passed. These are ignored in GET and thus aren't necessary and would add extra params to the URL. One potential upgrade that was left on the cutting room floor was passing any extra props directly to the form component. * CHORE Fix node version in deploy action (#510) * CHORE Fix yaml spacing on deploy action (#512) * feature/UIDS-312 add Dropdown to DS (#502) * adds Dropdown and subcomponents * adds DropdownIconToggle * creates shared button mixins * remove children proptype, consolidate shared proptypes * add Percy snapshots for Dropdowns * Prepare release 1.26.0 Co-authored-by: Rachel Roppolo <[email protected]> Co-authored-by: Jane Sebastian <[email protected]> Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: brianCollinsUI <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Bob Saris <[email protected]>
1 parent 0b1f60d commit 35bde05

26 files changed

+1351
-179
lines changed

‎.github/workflows/gh-pages-deploy.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
steps:
1313
- name: Checkout branch
1414
uses: actions/checkout@v2
15+
- name: Setup node
16+
uses: actions/setup-node@v1
17+
with:
18+
node-version: '14.17.4'
1519

1620
- name: Configure npm
1721
run: npm config set "@fortawesome:registry" https://npm.fontawesome.com/ &&

‎cypress/integration/dropdown_spec.js‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
const dropdowns = [
2+
{
3+
name: 'Default',
4+
path: 'design-system-dropdown--default',
5+
class: '.Dropdown',
6+
},
7+
{
8+
name: 'Sizes',
9+
path: 'design-system-dropdown--sizes',
10+
class: '.Dropdown',
11+
},
12+
{
13+
name: 'Icon',
14+
path: 'design-system-dropdown--icon',
15+
class: '.Dropdown',
16+
},
17+
];
18+
19+
describe('Dropdown', () => {
20+
dropdowns.forEach((test) => {
21+
it(test.name, () => {
22+
cy.visit(test.path);
23+
cy.get('#storybook-preview-iframe').iframe().find(test.class).should('exist');
24+
cy.wait(1000);
25+
cy.percySnapshot(test.path);
26+
});
27+
});
28+
});

‎cypress/integration/table_spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ describe('Table', () => {
7171
it(test.name, () => {
7272
cy.visit(test.path);
7373
cy.get('#storybook-preview-iframe').iframe().find(test.class).should('exist');
74-
cy.wait(1000);
74+
cy.wait(2000);
7575
cy.percySnapshot(test.path);
7676
});
7777
});

‎cypress/integration/tooltip_spec.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ describe('Tooltip', () => {
3434
it(test.name, () => {
3535
cy.visit(test.path);
3636
cy.get('#storybook-preview-iframe').iframe().find('.Tooltip__icon').click();
37+
cy.wait(2000);
3738
cy.percySnapshot(test.path);
3839
});
3940
});

‎package.json‎

Lines changed: 1 addition & 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.25.1",
3+
"version": "1.26.0",
44
"dependencies": {
55
"react-bootstrap": "^2.0.2",
66
"react-router-dom": "^5.2.0",

‎scss/buttons.scss‎

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,178 @@
1717
color: $ux-white;
1818
}
1919
}
20+
21+
$primary: $ux-emerald-600;
22+
$danger: $ux-red;
23+
$warning: $ux-yellow-400;
24+
25+
@mixin btn-primary {
26+
$btn-primary-background: $primary;
27+
$btn-primary-border: $primary;
28+
$btn-primary-color: $ux-white;
29+
30+
$btn-primary-hover-background: $ux-emerald-700;
31+
$btn-primary-hover-border: $ux-emerald-700;
32+
$btn-primary-hover-color: $ux-white;
33+
34+
$btn-primary-active-background: $ux-emerald-800;
35+
$btn-primary-active-border: $ux-emerald-800;
36+
$btn-primary-active-color: $ux-white;
37+
38+
@include button-variant(
39+
$btn-primary-background,
40+
$btn-primary-border,
41+
$btn-primary-color,
42+
43+
$btn-primary-hover-background,
44+
$btn-primary-hover-border,
45+
$btn-primary-hover-color,
46+
47+
$btn-primary-active-background,
48+
$btn-primary-active-border,
49+
$btn-primary-active-color,
50+
);
51+
}
52+
53+
@mixin btn-outline-primary {
54+
$btn-outline-primary-color: $primary;
55+
$btn-outline-primary-color-hover: $ux-white;
56+
57+
$btn-outline-primary-hover-background: $ux-emerald-700;
58+
$btn-outline-primary-hover-border: $ux-emerald-700;
59+
$btn-outline-primary-hover-color: $ux-white;
60+
61+
$btn-outline-primary-border: $primary;
62+
63+
$btn-outline-primary-active-background: $ux-emerald-800;
64+
$btn-outline-primary-active-border-color: $ux-emerald-800;
65+
66+
@include button-outline-variant(
67+
$btn-outline-primary-color,
68+
$btn-outline-primary-color-hover,
69+
70+
$btn-outline-primary-hover-background,
71+
$btn-outline-primary-hover-border,
72+
$btn-outline-primary-hover-color,
73+
);
74+
border-color: $btn-outline-primary-border;
75+
76+
&:active {
77+
background-color: $btn-outline-primary-active-background;
78+
border-color: $btn-outline-primary-active-border-color;
79+
}
80+
}
81+
82+
@mixin btn-danger {
83+
$btn-danger-background: $danger;
84+
$btn-danger-border: $danger;
85+
$btn-danger-color: $ux-white;
86+
87+
$btn-danger-hover-background: $ux-red-600;
88+
$btn-danger-hover-border: $ux-red-600;
89+
$btn-danger-hover-color: $ux-white;
90+
91+
$btn-danger-active-background: $ux-red-700;
92+
$btn-danger-active-border: $ux-red-700;
93+
$btn-danger-active-color: $ux-white;
94+
95+
@include button-variant(
96+
$btn-danger-background,
97+
$btn-danger-border,
98+
$btn-danger-color,
99+
100+
$btn-danger-hover-background,
101+
$btn-danger-hover-border,
102+
$btn-danger-hover-color,
103+
104+
$btn-danger-active-background,
105+
$btn-danger-active-border,
106+
$btn-danger-active-color,
107+
);
108+
}
109+
110+
@mixin btn-outline-danger {
111+
$btn-outline-danger-color: $danger;
112+
$btn-outline-danger-color-hover: $ux-white;
113+
114+
$btn-outline-danger-hover-background: $ux-red-600;
115+
$btn-outline-danger-hover-border: $ux-red-600;
116+
$btn-outline-danger-hover-color: $ux-white;
117+
118+
$btn-outline-danger-border: $danger;
119+
120+
$btn-outline-danger-active-background: $ux-red-700;
121+
$btn-outline-danger-active-border-color: $ux-red-700;
122+
123+
@include button-outline-variant(
124+
$btn-outline-danger-color,
125+
$btn-outline-danger-color-hover,
126+
127+
$btn-outline-danger-hover-background,
128+
$btn-outline-danger-hover-border,
129+
$btn-outline-danger-hover-color,
130+
);
131+
border-color: $btn-outline-danger-border;
132+
133+
&:active {
134+
background-color: $btn-outline-danger-active-background;
135+
border-color: $btn-outline-danger-active-border-color;
136+
}
137+
}
138+
139+
@mixin btn-warning {
140+
$btn-warning-background: $warning;
141+
$btn-warning-border: $warning;
142+
$btn-warning-color: $ux-yellow-900;
143+
144+
$btn-warning-hover-background: $ux-yellow-500;
145+
$btn-warning-hover-border: $ux-yellow-500;
146+
$btn-warning-hover-color: $ux-yellow-900;
147+
148+
$btn-warning-active-background: $ux-yellow-600;
149+
$btn-warning-active-border: $ux-yellow-600;
150+
$btn-warning-active-color: $ux-yellow-900;
151+
152+
@include button-variant(
153+
$btn-warning-background,
154+
$btn-warning-border,
155+
$btn-warning-color,
156+
157+
$btn-warning-hover-background,
158+
$btn-warning-hover-border,
159+
$btn-warning-hover-color,
160+
161+
$btn-warning-active-background,
162+
$btn-warning-active-border,
163+
$btn-warning-active-color,
164+
);
165+
}
166+
167+
@mixin btn-outline-warning {
168+
$btn-outline-warning-color: $ux-yellow-900;
169+
$btn-outline-warning-color-hover: $ux-yellow-900;
170+
171+
$btn-outline-warning-hover-background: $warning;
172+
$btn-outline-warning-hover-border: $warning;
173+
$btn-outline-warning-hover-color: $ux-yellow-900;
174+
175+
$btn-outline-warning-border: $ux-yellow-500;
176+
177+
$btn-outline-warning-active-background: $ux-yellow-500;
178+
$btn-outline-warning-active-border-color: $ux-yellow-500;
179+
180+
@include button-outline-variant(
181+
$btn-outline-warning-color,
182+
$btn-outline-warning-color-hover,
183+
184+
$btn-outline-warning-hover-background,
185+
$btn-outline-warning-hover-border,
186+
$btn-outline-warning-hover-color,
187+
);
188+
border-color: $btn-outline-warning-border;
189+
190+
&:active {
191+
background-color: $btn-outline-warning-active-background;
192+
border-color: $btn-outline-warning-active-border-color;
193+
}
194+
}

0 commit comments

Comments
 (0)