Skip to content

Commit cff97ec

Browse files
bproffittbproffitt
authored
Merge pull request #333 from bennypowers/chore/r-node-sass
chore: migrate to dart sass
2 parents ba22d8c + b6fde5c commit cff97ec

File tree

20 files changed

+29311
-13360
lines changed

20 files changed

+29311
-13360
lines changed

Diff for: ‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Validate URLs
4545
# Only run this if these files were edited
4646
if: contains(steps.files.outputs.added_modified, 'app/data/*.json')
47-
uses: urlstechie/urlchecker-action@0.2.1
47+
uses: urlstechie/urlchecker-action@0.0.33
4848
with:
4949
# Only validate the files that were changed
5050
include_files: ${{ steps.files.outputs.added_modified }}

Diff for: ‎.github/workflows/deploy.yml

-27
This file was deleted.

Diff for: ‎.github/workflows/pages.yml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Deploy GH Pages
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- dev
8+
9+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
10+
permissions:
11+
contents: read
12+
pages: write
13+
id-token: write
14+
15+
# Allow one concurrent deployment
16+
concurrency:
17+
group: pages
18+
cancel-in-progress: true
19+
20+
jobs:
21+
build:
22+
runs-on: ubuntu-latest
23+
name: Build site and deploy to GHPages
24+
steps:
25+
- name: Install node 16
26+
uses: actions/setup-node@v3
27+
with:
28+
node-version: '16'
29+
cache: npm
30+
31+
- run: npm ci
32+
- run: npm install babel-cli
33+
- run: mkdir -p dist
34+
- run: npm run babel
35+
- run: npm run build
36+
# Be sure that all provided URLs are valid
37+
- run: set -e && for url in $(jq .[].projectWebsite app/data/projects.json | tr -d \"); do if [ "$url" != "null" ]; then echo "${url}"; curl "${url}" -o /dev/null --fail -L; fi; done
38+
- run: set -e && for url in $(jq .[].projectRepository app/data/projects.json | tr -d \"); do if [ "$url" != "null" ]; then echo "${url}"; curl "${url}" -o /dev/null --fail -L; fi; done
39+
40+
# Automatically uploads an artifact from the './_site' directory by default
41+
- name: Upload artifact
42+
uses: actions/upload-pages-artifact@v1
43+
with:
44+
path: dist
45+
46+
# Deployment job
47+
deploy:
48+
environment:
49+
name: github-pages
50+
url: ${{ steps.deployment.outputs.page_url }}
51+
runs-on: ubuntu-latest
52+
needs: build
53+
steps:
54+
- name: Deploy to GitHub Pages
55+
id: deployment
56+
uses: actions/deploy-pages@v1

Diff for: ‎.travis.yml

-28
This file was deleted.

Diff for: ‎app/components/bandheader/bandheader.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../public/styles/global";
1+
@use "../../public/styles/global";
22

33
.band-header {
44
&-title {

Diff for: ‎app/components/card/card.scss

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
@import "../../public/styles/global";
1+
@use "../../public/styles/global";
2+
@use "../../public/styles/variables/colors";
23

34
.card {
45
&--component {
@@ -47,10 +48,10 @@
4748
}
4849
}
4950
[data-layout="3-up"] &-content:last-child {
50-
border-left: 2px solid $iron;
51+
border-left: 2px solid colors.$iron;
5152
}
5253
[data-layout="3-up"] &-content:nth-child(2) {
53-
border-left: 2px solid $iron;
54+
border-left: 2px solid colors.$iron;
5455
}
5556
&-link {
5657
@extend %subtle-link;

Diff for: ‎app/components/dynamictable/dynamictable.scss

+20-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
@import '../../public/styles/global';
1+
@use '../../public/styles/global';
2+
@use "../../public/styles/mixins/global" as global2;
3+
@use "../../public/styles/variables/base";
4+
@use "../../public/styles/variables/breakpoints";
5+
@use "../../public/styles/variables/colors";
26

37
.table {
48
&--component {
@@ -11,7 +15,7 @@
1115
display: grid;
1216
grid-template-columns: 1fr;
1317
grid-gap: 10px;
14-
@media screen and (min-width: $breakpoint-sm-min) {
18+
@media screen and (min-width: breakpoints.$breakpoint-sm-min) {
1519
grid-auto-rows: 1fr;
1620
grid-gap: 30px;
1721
grid-template-columns: 8fr 4fr;
@@ -25,21 +29,21 @@
2529
grid-template-columns: 7fr 1fr;
2630

2731
&-input {
28-
@include make-input();
32+
@include global2.make-input();
2933
}
3034

3135
&-button {
32-
@include make-button($btn-color: $brand-primary);
36+
@include global2.make-button($btn-color: colors.$brand-primary);
3337

34-
@media all and (max-width: $breakpoint-sm-max) {
38+
@media all and (max-width: breakpoints.$breakpoint-sm-max) {
3539
padding-left: 20px;
3640
padding-right: 20px;
3741
}
3842
}
3943
}
4044

4145
&-dropdown {
42-
font-family: $base-font-family;
46+
font-family: base.$base-font-family;
4347
align-items: center;
4448
display: grid;
4549
grid-auto-rows: 1fr;
@@ -52,15 +56,15 @@
5256
}
5357

5458
&-select {
55-
background-color: $white;
56-
color: $stone;
59+
background-color: colors.$white;
60+
color: colors.$stone;
5761
height: 100%;
5862
-webkit-appearance: none;
5963
border-radius: 0;
6064
padding: 5px 30px 5px 10px;
6165

6266
+ i {
63-
color: $stone;
67+
color: colors.$stone;
6468
position: absolute;
6569
top: calc(50% - .55em);
6670
right: 10px;
@@ -77,18 +81,18 @@
7781
width: 100%;
7882
table-layout: fixed;
7983

80-
@media all and (max-width: $breakpoint-sm-max) {
84+
@media all and (max-width: breakpoints.$breakpoint-sm-max) {
8185
table-layout: fixed;
8286
}
8387

8488
thead {
85-
@media screen and (max-width: $breakpoint-xs-max) {
89+
@media screen and (max-width: breakpoints.$breakpoint-xs-max) {
8690
display: none;
8791
}
8892
}
8993

9094
thead tr {
91-
background-color: $iron;
95+
background-color: colors.$iron;
9296
}
9397

9498
th {
@@ -105,23 +109,23 @@
105109
}
106110

107111
tbody tr:nth-child(even) {
108-
background-color: $mercury;
112+
background-color: colors.$mercury;
109113
}
110114

111115
tbody tr:nth-child(odd) {
112-
background-color: $white;
116+
background-color: colors.$white;
113117
}
114118

115119
td {
116120
@extend %table-row;
117121
padding: 10px;
118122
overflow: hidden;
119123
text-overflow: ellipsis;
120-
@media screen and (max-width: $breakpoint-xs-max) {
124+
@media screen and (max-width: breakpoints.$breakpoint-xs-max) {
121125
display: block;
122126
}
123127
&:first-child {
124-
@media screen and (max-width: $breakpoint-xs-max) {
128+
@media screen and (max-width: breakpoints.$breakpoint-xs-max) {
125129
font-weight: 600;
126130
}
127131
}

Diff for: ‎app/components/group/group.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../public/styles/global";
1+
@use "../../public/styles/global";
22

33
.group {
44
&-container {

Diff for: ‎app/components/hero/hero.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
@import "../../public/styles/global";
1+
@use "../../public/styles/global";
2+
@use "../../public/styles/variables/colors";
23

34
.hero {
45
&--component {
56
@extend %default--band;
67
align-items: center;
7-
background-color: $gallery;
8+
background-color: colors.$gallery;
89
background-image: url("../../public/img/hero.png");
910
background-position: center center;
1011
background-repeat: no-repeat;

Diff for: ‎app/components/navigation/navigation.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
@import "../../public/styles/global";
1+
@use "../../public/styles/global";
2+
@use "../../public/styles/variables/breakpoints";
23

34
.navigation {
45
&--component {
@@ -45,7 +46,7 @@
4546
@extend %logo-link;
4647
max-height: 2em;
4748

48-
@media screen and (min-width: $breakpoint-lg-min) {
49+
@media screen and (min-width: breakpoints.$breakpoint-lg-min) {
4950
max-height: 3em;
5051
}
5152
}

Diff for: ‎app/components/universalfooter/universalfooter.scss

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
@import "../../public/styles/global";
1+
@use "../../public/styles/global";
2+
@use "../../public/styles/variables/breakpoints";
3+
@use "../../public/styles/variables/colors";
24

35
.footer {
46
&--component {
57
@extend %default--band;
6-
background-color: $rich-black;
8+
background-color: colors.$rich-black;
79
}
810
&-container {
911
@extend %default-container;
1012
display: grid;
1113
grid-template-columns: 3fr 2fr;
1214
grid-gap: 10px;
1315

14-
@media screen and (min-width: $breakpoint-sm-min) {
16+
@media screen and (min-width: breakpoints.$breakpoint-sm-min) {
1517
align-items: center;
1618
grid-auto-rows: 1fr;
1719
grid-gap: 30px;
@@ -22,13 +24,13 @@
2224
img {
2325
@extend %logo-link-dark;
2426
height: 34px;
25-
@media screen and (min-width: $breakpoint-sm-min) {
27+
@media screen and (min-width: breakpoints.$breakpoint-sm-min) {
2628
height: 44px;
2729
min-width: 138px;
2830
}
2931
}
3032
&:last-child {
31-
@media screen and (max-width: $breakpoint-xs-max) {
33+
@media screen and (max-width: breakpoints.$breakpoint-xs-max) {
3234
display: flex;
3335
justify-content: flex-end;
3436
}
@@ -44,7 +46,7 @@
4446
}
4547
&-links {
4648
> *:not(:last-child) {
47-
border-right: 1px solid $stone;
49+
border-right: 1px solid colors.$stone;
4850
}
4951
}
5052
&-link {

Diff for: ‎app/pages/main/main.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../public/styles/global";
1+
@use "../../public/styles/global";
22

33
.band {
44

0 commit comments

Comments
 (0)