Skip to content

Commit 35fec55

Browse files
committed
Merge branch 'develop' into feat-sign-up-poc
2 parents 407acbb + 13b9721 commit 35fec55

24 files changed

+956
-122
lines changed

.fleek.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"build": {
3+
"image": "node:16.19",
4+
"command": "npm ci && npm run generate",
5+
"publicDir": ".output/public",
6+
"environment": {
7+
"SERVER_ENV": "production"
8+
}
9+
}
10+
}

.gitattributes

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Enforce unix newlines
2+
* text eol=lf
3+
4+
*.png binary
5+
*.jpg binary
6+
*.jpeg binary
7+
*.webp binary

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88

99
## Ticket link
10-
<!-- Add link ticket here -->
10+
<!-- Add link ticket here, if none are available, delete this heading -->

.github/workflows/storybook.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88

99
jobs:
1010
build-and-deploy:
11+
if: false
1112
runs-on: ubuntu-latest
1213
steps:
1314
- name: Checkout 🛎️

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,12 @@ typings/
7272

7373
# nuxt.js build output
7474
.nuxt
75+
.output
7576

7677
# Nuxt generate
7778
dist
7879

80+
7981
# vuepress build output
8082
.vuepress/dist
8183

assets/scss/core/layout-grid.scss

+2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
.layout {
1313
position: relative;
1414
z-index: 100;
15+
overflow-x: hidden;
1516
}
1617

1718
[class~="grid"], [class*="grid-"], [class*="grid_"] {
1819
width: $gridWidth;
1920
margin: 0 auto;
2021
@include gridMaxMQ {
22+
width: 100%;
2123
padding: 0 4.1665%;
2224
}
2325
&[class*="-noGutter"] {

assets/scss/theme/typography.scss

+22-10
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,24 @@ $fontAssetPath: 'assets/fonts';
8080
line-height: leading(65, 48);
8181
font-weight: 500;
8282
letter-spacing: 0.03em;
83-
@include small {
84-
font-size: toRem(30);
85-
line-height: leading(43, 30);
83+
@include medium {
84+
font-size: toRem(36);
85+
line-height: leading(48, 36);
8686
font-weight: 500;
8787
letter-spacing: 0.03em;
8888
}
89+
@include mini {
90+
font-size: toRem(30);
91+
line-height: leading(43, 30);
92+
}
8993
}
9094

9195
@mixin h2 { // Roadmap headings
9296
font-size: toRem(26);
9397
line-height: leading(34, 26);
9498
font-weight: 500;
9599
letter-spacing: 0.03em;
96-
@include small {
100+
@include medium {
97101
font-size: toRem(20);
98102
line-height: leading(30, 20);
99103
font-weight: 500;
@@ -106,20 +110,24 @@ $fontAssetPath: 'assets/fonts';
106110
line-height: leading(30, 24);
107111
font-weight: 500;
108112
letter-spacing: 0.03em;
109-
@include small {
110-
font-size: toRem(16);
111-
line-height: leading(27, 16);
113+
@include medium {
114+
font-size: toRem(18);
115+
line-height: leading(27, 18);
112116
font-weight: 500;
113117
letter-spacing: 0.03em;
114118
}
119+
@include mini {
120+
font-size: toRem(16);
121+
line-height: leading(27, 16);
122+
}
115123
}
116124

117125
@mixin h4 { // Roadmap milestone headings, captions for stats in hero section
118126
font-size: toRem(16);
119127
line-height: leading(30, 16);
120128
font-weight: 500;
121129
letter-spacing: 0.03em;
122-
@include small {
130+
@include medium {
123131
font-size: toRem(14);
124132
line-height: leading(16, 14);
125133
font-weight: 500;
@@ -132,7 +140,7 @@ $fontAssetPath: 'assets/fonts';
132140
line-height: leading(19, 16);
133141
font-weight: 500;
134142
letter-spacing: 0.11em;
135-
@include small {
143+
@include medium {
136144
font-size: toRem(14);
137145
line-height: leading(16, 14);
138146
font-weight: 500;
@@ -199,7 +207,7 @@ $fontAssetPath: 'assets/fonts';
199207
line-height: leading(27, 16);
200208
font-weight: 500;
201209
letter-spacing: 0.03em;
202-
@include small {
210+
@include medium {
203211
font-size: toRem(14);
204212
line-height: leading(21, 14);
205213
font-weight: 600;
@@ -237,6 +245,10 @@ $fontAssetPath: 'assets/fonts';
237245
line-height: leading(27, 14);
238246
font-weight: 500;
239247
letter-spacing: 0.01em;
248+
@include tiny {
249+
font-size: toRem(12);
250+
line-height: leading(27, 12);
251+
}
240252
}
241253

242254
@mixin formFieldPlaceholder {

components/blocks/accordion-block.vue

+26
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,31 @@ const getIconComponent = (icon) => {
9797
align-items: center;
9898
padding: toRem(16) 0;
9999
cursor: pointer;
100+
@include tiny {
101+
padding: toRem(10) 0;
102+
padding-right: toRem(38);
103+
}
100104
.icon {
101105
width: toRem(30);
102106
height: toRem(30);
103107
margin-right: toRem(22);
108+
@include tiny {
109+
width: toRem(22);
110+
height: toRem(22);
111+
min-width: toRem(22);
112+
}
104113
}
105114
:deep(.plus-minus-icon) {
106115
position: absolute;
107116
right: 0;
108117
top: calc(50% - toRem(15));
109118
width: toRem(30);
110119
height: toRem(30);
120+
@include tiny {
121+
width: toRem(22);
122+
height: toRem(22);
123+
top: calc(50% - toRem(11));
124+
}
111125
circle {
112126
@include transitionDefault;
113127
fill: rgba($codGray, 0);
@@ -121,6 +135,12 @@ const getIconComponent = (icon) => {
121135
max-height: 0;
122136
overflow: hidden;
123137
transition: max-height 300ms cubic-bezier(0.33, 0.2, 0.41, 0.99);
138+
@include mini {
139+
padding: 0 toRem(48);
140+
}
141+
@include tiny {
142+
padding: 0 toRem(41);
143+
}
124144
.text {
125145
@include p2;
126146
margin-bottom: toRem(16);
@@ -161,6 +181,12 @@ const getIconComponent = (icon) => {
161181
&.open {
162182
.accordion-content {
163183
max-height: toRem(200);
184+
@include large {
185+
max-height: toRem(228);
186+
}
187+
@include medium {
188+
max-height: toRem(300);
189+
}
164190
}
165191
}
166192
&.open,

components/blocks/card-list-block.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<template>
22
<div class="card-list-block">
3-
<div :class="grid">
3+
<div :class="[grid, 'no-padding']">
44
<div
55
v-for="(card, i) in cards"
66
:key="`card-col-${i}`"
7-
:class="columns">
7+
:class="[columns, 'card-wrapper']">
88

99
<Card :card="card" />
1010

components/blocks/code-block.vue

+48
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ const lines = computed(() => {
4444
padding: toRem(24);
4545
background-color: $codeBlack;
4646
border-radius: toRem(6);
47+
@include mini {
48+
padding: toRem(7) toRem(13);
49+
}
4750
}
4851
4952
.code-line {
@@ -52,26 +55,71 @@ const lines = computed(() => {
5255
@include inlineCode;
5356
margin-bottom: 0.125rem;
5457
color: $sageGreen;
58+
@include medium {
59+
margin-bottom: 0;
60+
}
61+
@include mini {
62+
overflow: hidden;
63+
}
5564
&.heading {
5665
color: $eastSide;
5766
}
5867
}
5968
6069
.code {
6170
display: inline-block;
71+
white-space: nowrap;
6272
@include inlineCode;
73+
@include tiny {
74+
font-size: 0.75rem;
75+
}
6376
&.id,
6477
&.type {
6578
width: 12%;
79+
@include medium {
80+
width: 20%;
81+
}
82+
@include tiny {
83+
width: 13%;
84+
}
85+
}
86+
&.id {
87+
@include small {
88+
display: none;
89+
}
90+
@include mini {
91+
display: inline-block;
92+
}
93+
@include tiny {
94+
width: 10%;
95+
}
6696
}
6797
&.path {
6898
width: 40%;
99+
@include medium {
100+
width: 60%;
101+
}
102+
@include small {
103+
width: 80%;
104+
}
105+
@include mini {
106+
width: 60%;
107+
}
108+
@include tiny {
109+
width: 62%;
110+
}
69111
}
70112
&.scan-state {
71113
width: 21%;
114+
@include medium {
115+
display: none;
116+
}
72117
}
73118
&.dag-state {
74119
width: 16%;
120+
@include gridMaxMQ {
121+
display: none;
122+
}
75123
}
76124
}
77125
</style>

components/blocks/text-block.vue

+7
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,13 @@ export default {
122122
width: toRem(90);
123123
height: toRem(90);
124124
margin-right: toRem(35);
125+
@include medium {
126+
width: toRem(60);
127+
height: toRem(60);
128+
}
129+
@include tiny {
130+
margin-right: toRem(17);
131+
}
125132
}
126133
}
127134
span {

components/button/cta.vue

+4
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ const props = defineProps({
122122
}
123123
124124
.button-content {
125+
white-space: nowrap;
125126
@include transitionDefault;
126127
&.hide {
127128
opacity: 0;
@@ -218,6 +219,9 @@ const props = defineProps({
218219
border: 2px solid $sageGreen;
219220
background-color: rgba($sageGreen, 0);
220221
@include transitionDefault;
222+
@include mini {
223+
padding: toRem(6);
224+
}
221225
.button-content {
222226
display: flex;
223227
}

0 commit comments

Comments
 (0)