Skip to content

Commit a972dfa

Browse files
github-actions[bot]github-actions[bot]
authored
Merge release/1.23.0 into main branch (#448)
* CHORE Update github release actions * chore/UIDS-424 update font types to regular, medium, and bold (400, 500, 700) (#428) * update font-types to regular, medium, bold * updates Alert__message to font-type-30--regular * updates Pill to font-type-20--regular * adds --medium to font-type-xx * adds uppercase specific font-type-10 * remove --regular modifier and general organization * Prepare release 1.23.0
1 parent c4b290c commit a972dfa

File tree

22 files changed

+428
-233
lines changed

22 files changed

+428
-233
lines changed

‎.github/workflows/create-new-release.yml‎

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -11,57 +11,21 @@ jobs:
1111
create-new-release:
1212
name: Create new release
1313
runs-on: ubuntu-latest
14+
env:
15+
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
1416
steps:
1517
- uses: actions/checkout@v2
16-
with:
17-
fetch-depth: 0
18-
19-
- name: Create release branch
20-
run: git checkout -b release/${{ github.event.inputs.version }}
18+
- uses: actions/setup-node@v1
19+
- run: npm config set "@fortawesome:registry" https://npm.fontawesome.com/ &&
20+
npm config set "//npm.fontawesome.com/:_authToken" $FONTAWESOME_NPM_AUTH_TOKEN
21+
- run: yarn install
2122

2223
- name: Initialize mandatory git config
2324
uses: fregante/setup-git-user@v1
2425

25-
- name: Bump version in package.json
26-
run: yarn version --new-version ${{ github.event.inputs.version }} --no-git-tag-version
27-
28-
- name: Commit manifest files
29-
id: make-commit
30-
run: |
31-
git add package.json
32-
git commit --message "Prepare release ${{ github.event.inputs.version }}"
33-
34-
echo "::set-output name=commit::$(git rev-parse HEAD)"
35-
36-
- name: Publish release branch
37-
run: git push origin release/${{ github.event.inputs.version }}
38-
39-
- run: git fetch
40-
41-
- name: Checkout main
42-
run: git checkout main
43-
44-
- name: Merge release branch to main
45-
run: git merge --no-ff release/${{ github.event.inputs.version }}
46-
47-
- name: Push main branch
48-
run: git push origin main
49-
50-
- name: Create tag
51-
run: git tag -a ${{ github.event.inputs.version }} -m v${{ github.event.inputs.version }}
52-
53-
- name: Checkout develop
54-
run: git checkout develop
55-
56-
- name: Merge release branch to develop
57-
run: git merge --no-ff release/${{ github.event.inputs.version }}
58-
59-
- name: Push develop branch
60-
run: git push origin develop
61-
62-
- name: Delete release branch
63-
run: git branch -d release/${{ github.event.inputs.version }}
64-
26+
# Build assets
27+
- run: yarn build
28+
- run: npm pack
6529
- name: Extract Package Version
6630
id: extract_version
6731
uses: Saionaro/[email protected]

‎.github/workflows/prepare-release.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: "Prepare new release"
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: 'The version you want to release.'
8+
required: true
9+
10+
jobs:
11+
create-new-release:
12+
name: Create new release
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
with:
17+
fetch-depth: 0
18+
- uses: actions/setup-node@v1
19+
20+
- name: Create release branch
21+
run: git checkout -b release/${{ github.event.inputs.version }}
22+
23+
- name: Initialize mandatory git config
24+
uses: fregante/setup-git-user@v1
25+
26+
- name: Bump version in package.json
27+
run: yarn version --new-version ${{ github.event.inputs.version }} --no-git-tag-version
28+
29+
- name: Commit manifest files
30+
id: make-commit
31+
run: |
32+
git add package.json
33+
git commit --message "Prepare release ${{ github.event.inputs.version }}"
34+
35+
echo "::set-output name=commit::$(git rev-parse HEAD)"
36+
37+
- name: Publish release branch
38+
run: git push origin release/${{ github.event.inputs.version }}
39+
40+
- name: Merge release into main branch
41+
uses: thomaseizinger/[email protected]
42+
env:
43+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
with:
45+
head: release/${{ github.event.inputs.version }}
46+
base: main
47+
title: Merge release/${{ github.event.inputs.version }} into main branch
48+
49+
- name: Merge release into develop branch
50+
uses: thomaseizinger/[email protected]
51+
env:
52+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53+
with:
54+
head: release/${{ github.event.inputs.version }}
55+
base: develop
56+
title: Merge release/${{ github.event.inputs.version }} into develop branch
57+

‎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.22.1",
3+
"version": "1.23.0",
44
"dependencies": {
55
"react-router-dom": "^5.2.0",
66
"react-select": "^3.0.8",

‎scss/forms/form_control_label.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
@import '../typography';
44

55
.FormControlLabel {
6-
@include font-type-30--light;
6+
@include font-type-30;
77
align-items: center;
88
color: $ux-gray-900;
99
display: flex;
1010
margin-bottom: 0.5rem;
1111

1212
&--with-children {
13-
@include font-type-30;
13+
@include font-type-30--medium;
1414

1515
align-items: flex-start;
1616
flex-direction: column;
@@ -24,7 +24,7 @@
2424
}
2525

2626
&__helper-text {
27-
@include font-type-30;
27+
@include font-type-30--medium;
2828
font-weight: 100;
2929
}
3030

@@ -34,7 +34,7 @@
3434
}
3535

3636
&__children {
37-
@include font-type-30;
37+
@include font-type-30--medium;
3838

3939
font-weight: 100;
4040
margin-top: 0.5rem;

‎scss/forms/form_group.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
margin-bottom: 0.5rem;
2020

2121
&__helper-text {
22-
@include font-type-30--light;
22+
@include font-type-30;
2323
font-weight: 100;
2424
color: $ux-gray-900;
2525
}
@@ -57,7 +57,7 @@
5757
}
5858

5959
&__helper-text {
60-
@include font-type-20;
60+
@include font-type-20--medium;
6161
font-weight: 100;
6262
color: $ux-gray-900;
6363
padding: .375rem 0;
@@ -69,7 +69,7 @@
6969
}
7070

7171
&__invalid-feedback {
72-
@include font-type-20;
72+
@include font-type-20--medium;
7373
color: $ux-red;
7474
padding: .375rem 0;
7575
margin: 0;

‎scss/forms/input_label.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
margin-bottom: 0.375rem;
99

1010
&__helper-text {
11-
@include font-type-30;
11+
@include font-type-30--medium;
1212
font-weight: 100;
1313
color: $ux-gray-900;
1414
}

‎scss/typography.scss‎

Lines changed: 59 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,135 @@
11
$font-family: DM Sans, sans-serif;
2-
$font-weight-light: 300;
3-
$font-weight-normal: 400;
2+
$font-weight-regular: 400;
3+
$font-weight-medium: 500;
44
$font-weight-bold: 700;
55
$font-size-base: 0.875rem;
66

77
@mixin font-type-10() {
88
font-size: .625rem;
9-
font-weight: $font-weight-normal;
9+
font-weight: $font-weight-regular;
1010
letter-spacing: 0.0625rem;
1111
line-height: 0.875rem;
12-
text-transform: uppercase;
1312
}
1413

1514
@mixin font-type-20() {
1615
font-size: .75rem;
17-
font-weight: $font-weight-normal;
16+
font-weight: $font-weight-regular;
1817
line-height: 1rem;
1918
}
2019

2120
@mixin font-type-30() {
22-
font-size: 0.875rem;
23-
font-weight: $font-weight-normal;
21+
font-size: $font-size-base;
22+
font-weight: $font-weight-regular;
2423
line-height: 1.25rem;
2524
}
2625

2726
@mixin font-type-40() {
28-
// font-size: $font-size-base; -- should base be changed to 1 rem?
2927
font-size: 1rem;
30-
font-weight: $font-weight-normal;
28+
font-weight: $font-weight-regular;
3129
line-height: 1.375rem;
3230
}
3331

3432
@mixin font-type-50() {
3533
font-size: 1.125rem;
36-
font-weight: $font-weight-normal;
34+
font-weight: $font-weight-regular;
3735
line-height: 1.5rem;
3836
}
3937

4038
@mixin font-type-60() {
4139
font-size: 1.25rem;
42-
font-weight: $font-weight-normal;
40+
font-weight: $font-weight-regular;
4341
line-height: 1.625rem;
4442
}
4543

4644
@mixin font-type-70() {
4745
font-size: 1.5rem;
48-
font-weight: $font-weight-normal;
46+
font-weight: $font-weight-regular;
4947
line-height: 2rem;
5048
}
5149

52-
@mixin font-type-10--bold() {
50+
@mixin font-type-10--medium() {
5351
@include font-type-10;
54-
font-weight: $font-weight-bold;
52+
font-weight: $font-weight-medium;
5553
}
5654

57-
@mixin font-type-10--light() {
58-
@include font-type-10;
59-
font-weight: $font-weight-light;
55+
@mixin font-type-20--medium() {
56+
@include font-type-20;
57+
font-weight: $font-weight-medium;
6058
}
6159

62-
@mixin font-type-20--bold() {
63-
@include font-type-20;
60+
@mixin font-type-30--medium() {
61+
@include font-type-30;
62+
font-weight: $font-weight-medium;
63+
}
64+
65+
@mixin font-type-40--medium() {
66+
@include font-type-40();
67+
font-weight: $font-weight-medium;
68+
}
69+
70+
@mixin font-type-50--medium() {
71+
@include font-type-50;
72+
font-weight: $font-weight-medium;
73+
}
74+
75+
@mixin font-type-60--medium() {
76+
@include font-type-60();
77+
font-weight: $font-weight-medium;
78+
}
79+
80+
@mixin font-type-70--medium() {
81+
@include font-type-70;
82+
font-weight: $font-weight-medium;
83+
}
84+
85+
@mixin font-type-10--bold() {
86+
@include font-type-10;
6487
font-weight: $font-weight-bold;
6588
}
6689

67-
@mixin font-type-20--light() {
90+
@mixin font-type-20--bold() {
6891
@include font-type-20;
69-
font-weight: $font-weight-light;
92+
font-weight: $font-weight-bold;
7093
}
7194

7295
@mixin font-type-30--bold() {
7396
@include font-type-30;
7497
font-weight: $font-weight-bold;
7598
}
7699

77-
@mixin font-type-30--light() {
78-
@include font-type-30;
79-
font-weight: $font-weight-light;
80-
}
81-
82100
@mixin font-type-40--bold() {
83101
@include font-type-40;
84102
font-weight: $font-weight-bold;
85103
}
86104

87-
@mixin font-type-40--light() {
88-
@include font-type-40;
89-
font-weight: $font-weight-light;
90-
}
91-
92105
@mixin font-type-50--bold() {
93106
@include font-type-50;
94107
font-weight: $font-weight-bold;
95108
}
96109

97-
@mixin font-type-50--light() {
98-
@include font-type-50;
99-
font-weight: $font-weight-light;
100-
}
101-
102110
@mixin font-type-60--bold() {
103111
@include font-type-60;
104112
font-weight: $font-weight-bold;
105113
}
106114

107-
@mixin font-type-60--light() {
108-
@include font-type-60;
109-
font-weight: $font-weight-light;
110-
}
111-
112115
@mixin font-type-70--bold() {
113116
@include font-type-70;
114117
font-weight: $font-weight-bold;
115118
}
116119

117-
@mixin font-type-70--light() {
118-
@include font-type-70;
119-
font-weight: $font-weight-light;
120+
// Uppercase fonts
121+
122+
@mixin font-type-10--uppercase() {
123+
@include font-type-10;
124+
text-transform: uppercase;
125+
}
126+
127+
@mixin font-type-10--bold-uppercase() {
128+
@include font-type-10--uppercase;
129+
font-weight: $font-weight-bold;
130+
}
131+
132+
@mixin font-type-10--medium-uppercase() {
133+
@include font-type-10--uppercase;
134+
font-weight: $font-weight-medium
120135
}

0 commit comments

Comments
 (0)