Skip to content

Commit d923d80

Browse files
authored
Merge pull request #785 from andirotter/master
Fix post-skeleton styling debts in /install
2 parents d2af8e2 + 49342b3 commit d923d80

File tree

2 files changed

+60
-18
lines changed

2 files changed

+60
-18
lines changed

src/styles/app.scss

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ $red: #C14566;
88
$green: #398277;
99
$purple: #403D58;
1010
$yellow: #FFD45E;
11+
$border-radius: 4px;
1112

1213
html {
1314
font-size: 62.5%
@@ -43,6 +44,30 @@ code {
4344
overflow: auto;
4445
}
4546

47+
@mixin code-space-full-width {
48+
padding: 1rem 1.5rem;
49+
margin: 0 .2rem;
50+
}
51+
52+
@mixin code-space-inline {
53+
padding: .2rem .5rem;
54+
margin: 0 .2rem;
55+
}
56+
57+
@mixin code-highlight-white {
58+
color: white;
59+
background-color: rgba(white, 0.15);
60+
border: 1px solid #E1E1E1;
61+
border-radius: $border-radius;
62+
}
63+
64+
@mixin code-highlight-black {
65+
color: black;
66+
background-color: rgba(69, 76, 82, 0.05);
67+
border: 1px solid rgba(69, 76, 82, 0.25);
68+
border-radius: $border-radius;
69+
}
70+
4671
.button,
4772
button {
4873
display: block;
@@ -94,7 +119,23 @@ header h1 {
94119
font-size: 8rem;
95120
margin-bottom: 0;
96121
margin-top: 0;
97-
line-height: 1.2
122+
line-height: 1.2;
123+
font-weight: 300;
124+
}
125+
126+
header h2 {
127+
font-size: 4.2rem;
128+
line-height: 1.25;
129+
font-weight: 300;
130+
}
131+
132+
section h3 {
133+
margin-top: 0;
134+
line-height: 1.3;
135+
}
136+
137+
section p, code {
138+
line-height: 1.6;
98139
}
99140

100141
header .button.button-download {
@@ -135,6 +176,11 @@ section {
135176
line-height: 1.25;
136177
}
137178
}
179+
180+
p {
181+
margin-top: 0;
182+
margin-bottom: 30px;
183+
}
138184
}
139185

140186
ul {
@@ -216,9 +262,8 @@ a.brand {
216262
}
217263
}
218264
code {
219-
color: white;
220-
background-color: rgba(white, 0.15);
221-
border: 1px solid rgba(white, 0.65);
265+
@include code-highlight-white();
266+
@include code-space-inline();
222267
}
223268
}
224269

@@ -240,11 +285,10 @@ a.brand {
240285
&:hover, &:focus {
241286
border-color: white;
242287
}
243-
}
288+
}
244289
code {
245-
color: white;
246-
background-color: rgba(white, 0.15);
247-
border: 1px solid rgba(white, 0.65);
290+
@include code-highlight-white();
291+
@include code-space-full-width();
248292
}
249293
}
250294

@@ -267,9 +311,8 @@ a.brand {
267311
}
268312
}
269313
code {
270-
color: black;
271-
background-color: rgba($gray, 0.05);
272-
border: 1px solid rgba($gray, 0.25);
314+
@include code-highlight-black();
315+
@include code-space-inline();
273316
}
274317
}
275318

@@ -293,9 +336,8 @@ a.brand {
293336
}
294337
}
295338
code {
296-
color: white;
297-
background-color: rgba(white, 0.15);
298-
border: 1px solid rgba(white, 0.65);
339+
@include code-highlight-white();
340+
@include code-space-inline();
299341
}
300342
}
301343

templates/components/tools/rustup.hbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div class="row">
22
<div id="platform-instructions-unix" class="instructions" style="display: block;">
33
<p>It looks like you’re running macOS, Linux, or another Unix-like OS. To download Rustup and install Rust, run the following in your terminal, then follow the on-screen instructions.</p>
4-
<pre><code>curl https://sh.rustup.rs -sSf | sh</code></pre>
4+
<pre><code class="db w-100">curl https://sh.rustup.rs -sSf | sh</code></pre>
55
</div>
66
<div id="platform-instructions-win" class="instructions" style="display: none;">
77
<p>It looks like you’re running Windows. To install Rust, download and run</p>
88
<a href="https://win.rustup.rs" class="button button-secondary">rustup‑init.exe</a>
99
<p>...then follow the onscreen instructions.</p>
1010
<p><b>Windows Subsystem for Linux</b></p>
1111
<p>If you’re a Windows Subsystem for Linux user run the following in your terminal, then follow the on-screen instructions to install Rust.</p>
12-
<pre><code>curl https://sh.rustup.rs -sSf | sh</code></pre>
12+
<pre><code class="db w-100">curl https://sh.rustup.rs -sSf | sh</code></pre>
1313
</div>
1414
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
1515
<!-- unrecognized platform: ask for help -->
@@ -34,7 +34,7 @@
3434
To install Rust, if you are running Unix,<br>run the following
3535
in your terminal, then follow the on-screen instructions.
3636
</p>
37-
<code>curl https://sh.rustup.rs -sSf | sh</code>
37+
<code class="db w-100">curl https://sh.rustup.rs -sSf | sh</code>
3838
</div>
3939
<hr>
4040
<div>
@@ -52,7 +52,7 @@
5252
run the following
5353
in your terminal, then follow the on-screen instructions.
5454
</p>
55-
<pre><code>curl https://sh.rustup.rs -sSf | sh</code></pre>
55+
<pre><code class="db w-100">curl https://sh.rustup.rs -sSf | sh</code></pre>
5656
</div>
5757
<hr>
5858
<div>

0 commit comments

Comments
 (0)