Skip to content

Commit ae7f565

Browse files
authored
Merge pull request #39 from marko-js/design-updates
chore: minor margin fixes
2 parents aea87b2 + 013ea80 commit ae7f565

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

src/routes/_home/tags/home-granular/home-granular.style.module.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
display: flex;
4141
flex-direction: column;
4242
order: 0;
43-
margin-left: var(--root-bleed);
43+
max-width: 35rem;
4444

4545
@media (min-width: 90rem) {
4646
margin-left: 0;
@@ -125,10 +125,10 @@
125125
}
126126
@media (min-width: 64rem) {
127127
margin-bottom: 0;
128-
padding: 5rem;
128+
padding: 4rem;
129129
padding-top: 6rem;
130130
padding-bottom: 5rem;
131-
margin-left: 3rem;
131+
margin-left: 3.75rem;
132132
margin-right: var(--root-bleed);
133133
@media (prefers-color-scheme: light) {
134134
&::before {
@@ -140,7 +140,6 @@
140140
clip-path: polygon(0 0, 100% 0, 100% calc(100% - 4rem), calc(100% - 4rem) 100%, 0 100%, 0 0);
141141
}
142142
}
143-
144143
@media (prefers-color-scheme: dark) {
145144
border: 3px solid transparent;
146145
background-origin: border-box;
@@ -157,6 +156,10 @@
157156
);
158157
}
159158
}
159+
@media (min-width: 90rem) {
160+
padding-left: 5rem;
161+
padding-right: 5rem;
162+
}
160163

161164
> :first-child {
162165
filter: brightness(95%) grayscale(60%);

src/routes/_home/tags/home-streaming/home-streaming.style.module.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
.content {
4040
display: flex;
4141
flex-direction: column;
42-
margin-right: var(--root-bleed);
42+
max-width: 35rem;
4343
@media (min-width: 64rem) {
4444
order: 1;
4545
}
@@ -126,8 +126,8 @@
126126
}
127127
@media (min-width: 64rem) {
128128
margin-bottom: 0;
129-
margin-right: 3rem;
130-
padding: 5rem;
129+
margin-right: 3.75rem;
130+
padding: 4rem;
131131
padding-top: 6rem;
132132
padding-bottom: 5rem;
133133
margin-left: var(--root-bleed);
@@ -141,7 +141,6 @@
141141
clip-path: polygon(0 0, 4rem 0, 0 4rem, 0 100%, 100% 100%, 100% 0);
142142
}
143143
}
144-
145144
@media (prefers-color-scheme: dark) {
146145
border: 3px solid transparent;
147146
background-origin: border-box;
@@ -158,6 +157,10 @@
158157
);
159158
}
160159
}
160+
@media (min-width: 90rem) {
161+
padding-left: 5rem;
162+
padding-right: 5rem;
163+
}
161164

162165
> :first-child {
163166
filter: brightness(95%) grayscale(60%);

src/routes/docs/+layout.style.module.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ main {
201201
border: none;
202202
font-size: max(0.8rem, min(4dvw, 1.5rem));
203203
background-color: var(--section-color-dim);
204-
border-radius: 1rem;
204+
border-radius: 0.5rem;
205205
padding: 1.5rem;
206206
width: 100%;
207207
max-width: 100% !important;
@@ -211,7 +211,6 @@ main {
211211
position: relative;
212212
margin: 2rem 0;
213213
border: 1px solid var(--section-color);
214-
background-color: color-mix(in srgb, var(--section-color-dim) 20%, var(--color-background));
215214
background-image: linear-gradient(to bottom left, color-mix(in srgb, var(--section-color-dim) 24%, var(--color-background)), color-mix(in srgb, var(--section-color-dim) 8%, var(--color-background)));
216215
padding: 1rem;
217216
padding-bottom: 0;

0 commit comments

Comments
 (0)