Skip to content

Commit 0ba0f80

Browse files
hsbthsbt
authored
Merge pull request #221 from sunny/new-style
2025 Redesign
2 parents 160a652 + b2968f0 commit 0ba0f80

File tree

5 files changed

+74
-48
lines changed

5 files changed

+74
-48
lines changed

‎source/articles/index.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title: "TryRuby Articles"
55
<div class="row">
66
<div class="col-lg-8">
77
<% blog.articles.each do |article| %>
8-
<h2><%= link_to article.title, article.url %></h2>
8+
<h2 class="mt-4"><%= link_to article.title, article.url %></h2>
99
<p><%= article.data.the_summary %></p>
1010
<% end %>
1111
</div>

‎source/images/header-ruby-logo.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎source/layouts/_navbar.html.erb‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<nav class="tryruby-navbar navbar navbar-expand-lg navbar-light">
22
<div class="container justify-content-between">
33
<a class="tryruby-brand navbar-brand" href="/">
4+
<img src="/images/header-ruby-logo.svg" height="40" width="40" alt="" />
45
Try Ruby
56
</a>
67

@@ -36,6 +37,11 @@
3637
About
3738
</a>
3839
</li>
40+
</ul>
41+
</div>
42+
43+
<div class="tryruby-navbar-links collapse navbar-collapse">
44+
<ul class="navbar-nav">
3945
<li class="nav-item dropdown">
4046
<button
4147
class="nav-link btn dropdown-toggle language-menu-toggle"
@@ -67,84 +73,84 @@
6773
data-change-lang="en"
6874
aria-controls="tryruby-content"
6975
>
70-
English
76+
English (en)
7177
</button>
7278
<button
7379
class="dropdown-item"
7480
data-change-lang="nl"
7581
aria-controls="tryruby-content"
7682
>
77-
Nederlands
83+
Nederlands (nl)
7884
</button>
7985
<button
8086
class="dropdown-item"
8187
data-change-lang="es"
8288
aria-controls="tryruby-content"
8389
>
84-
Español
90+
Español (es)
8591
</button>
8692
<button
8793
class="dropdown-item"
8894
data-change-lang="pt-br"
8995
aria-controls="tryruby-content"
9096
>
91-
Português do Brasil
97+
Português do Brasil (pt)
9298
</button>
9399
<button
94100
class="dropdown-item"
95101
data-change-lang="ja"
96102
aria-controls="tryruby-content"
97103
>
98-
日本語
104+
日本語 (ja)
99105
</button>
100106
<button
101107
class="dropdown-item"
102108
data-change-lang="ru"
103109
aria-controls="tryruby-content"
104110
>
105-
Русский
111+
Русский (ru)
106112
</button>
107113
<button
108114
class="dropdown-item"
109115
data-change-lang="ua"
110116
aria-controls="tryruby-content"
111117
>
112-
Українська
118+
Українська (ua)
113119
</button>
114120
<button
115121
class="dropdown-item"
116122
data-change-lang="mk"
117123
aria-controls="tryruby-content"
118124
>
119-
Македонски
125+
Македонски (mk)
120126
</button>
121127
<button
122128
class="dropdown-item"
123129
data-change-lang="zh"
124130
aria-controls="tryruby-content"
125131
>
126-
中文
132+
中文 (zh)
127133
</button>
128134
<button
129135
class="dropdown-item"
130136
data-change-lang="de"
131137
aria-controls="tryruby-content"
132138
>
133-
Deutsch
139+
Deutsch (de)
134140
</button>
135141
<button
136142
class="dropdown-item"
137143
data-change-lang="tr"
138144
aria-controls="tryruby-content"
139145
>
140-
Türkçe
146+
Türkçe (tr)
141147
</button>
142148
<button
143149
class="dropdown-item"
144150
data-change-lang="fr"
145151
aria-controls="tryruby-content"
146152
>
147-
Français
153+
Français (fr)
148154
</button>
149155
</div>
150156
</li>

‎source/layouts/layout.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
1818
<link
1919
rel="stylesheet"
20-
href="https://fonts.googleapis.com/css2?family=Reenie+Beanie&family=Source+Code+Pro&display=swap"
20+
href="https://fonts.googleapis.com/css2?family=Reenie+Beanie&family=Source+Code+Pro&family=Noto+Sans+JP:[email protected]&family=Noto+Sans+SC:[email protected]&family=Plus+Jakarta+Sans:ital,wght@0,200..800;1,200..800&display=swap"
2121
/>
2222
<link
2323
rel="stylesheet"

‎source/stylesheets/application.css.scss‎

Lines changed: 53 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,42 @@
11
:root {
2-
--background-color: rgb(255, 255, 248);
3-
--text-color: #333;
4-
--light-color: rgb(84, 83, 83);
5-
--primary-color: #d45f61;
6-
--dark-primary-color: #a74243;
7-
--primary-outline-color: #d45f6133;
8-
--light-primary-color: rgb(213, 189, 189);
9-
--secondary-color: #b5b5a9;
2+
--text-color: #1c1917;
3+
--background-color: #f1eee4;
4+
--primary-color: #e62923;
5+
--secondary-color: #d8c28e;
106
--dark-secondary-color: #929288;
117
--success-color: #53884d;
8+
9+
--nav-background-color: #fff;
10+
--nav-border-color: #e7e5e4;
11+
--nav-link-color: #1c1917;
12+
13+
--button-primary-text-color: #fff;
14+
--button-primary-color: #e62923;
15+
--button-primary-hover-color: #e62923;
16+
1217
--code-light-background-color: rgba(255, 255, 255, .4);
18+
--code-editor-border-color: #e2d1aa;
19+
20+
--noto-sans-subset: "Noto Sans JP";
1321
}
1422

1523
// Body
1624

17-
.tryruby-page {
18-
min-height: 100vh;
19-
20-
// Grain on background
25+
body {
2126
background-color: var(--background-color);
22-
background-image: url("data:image/png;base64,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");
23-
24-
font: 1.2em Georgia, serif;
2527
color: var(--text-color);
28+
29+
font: 1.2em "Plus Jakarta Sans", var(--noto-sans-subset), ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, sans-serif;
2630
}
2731

32+
:root:lang(zh) body { --noto-sans-subset: "Noto Sans SC"; }
33+
:root:lang(ja) body { --noto-sans-subset: "Noto Sans JP"; }
34+
2835
// Navigation
2936

3037
.tryruby-navbar {
31-
background: var(--code-light-background-color);
38+
background: var(--nav-background-color);
39+
border-bottom: 1px solid var(--nav-border-color);
3240

3341
// Override bootstrap
3442
box-shadow: none;
@@ -49,10 +57,19 @@
4957

5058
.tryruby-navbar-links {
5159
flex-grow: 0;
60+
font-size: .75em;
61+
font-weight: bold;
62+
}
63+
64+
.navbar-light .navbar-nav .nav-link,
65+
.nav-link {
66+
color: var(--nav-link-color);
67+
padding-inline: 1rem;
5268
}
5369

5470
.language-menu-toggle {
5571
background: transparent;
72+
border: 1px solid var(--nav-border-color);
5673

5774
svg {
5875
margin-top: -5px;
@@ -64,9 +81,6 @@
6481

6582
a {
6683
color: var(--primary-color);
67-
&:hover {
68-
color: var(--dark-primary-color);
69-
}
7084
}
7185

7286
h1 {
@@ -98,32 +112,37 @@ h3 {
98112
font-size: 1.75rem;
99113
}
100114

115+
.btn {
116+
padding-top: .55em;
117+
}
118+
101119
.btn-primary {
120+
border-radius: 1rem;
102121
font-family: sans-serif;
103-
background-color: var(--primary-color);
104-
border-color: var(--primary-color);
122+
color: var(--button-primary-text-color);
123+
background-color: var(--button-primary-color);
124+
border-color: var(--button-primary-color);
105125

106126
&:focus,
107127
&:focus:not(:focus-visible),
108128
&:hover,
109129
&:active {
110-
background-color: var(--dark-primary-color) !important;
111-
border-color: var(--dark-primary-color) !important;
112-
box-shadow: 0 0 0 .25rem var(--primary-outline-color);
130+
background-color: var(--button-primary-hover-color) !important;
131+
border-color: var(--button-primary-hover-color) !important;
113132
}
114133
}
115134

116135
.btn-secondary {
117136
font-family: sans-serif;
118-
background-color: var(--secondary-color);
119-
border-color: var(--secondary-color);
137+
border-radius: 1rem;
120138

139+
&,
121140
&:focus,
122141
&:focus:not(:focus-visible),
123142
&:hover,
124143
&:active {
125-
background-color: var(--dark-secondary-color) !important;
126-
border-color: var(--dark-secondary-color) !important;
144+
background-color: var(--secondary-color) !important;
145+
border-color: var(--secondary-color) !important;
127146
}
128147
}
129148

@@ -136,15 +155,14 @@ h3 {
136155
&:hover,
137156
&:active {
138157
border-color: var(--primary-color);
139-
box-shadow: 0 0 0 .25rem var(--primary-outline-color);
140158
}
141159
}
142160

143161
// Text
144162

145163
blockquote {
146164
padding: .5rem .5rem .5rem .75rem;
147-
border-left: .5rem solid var(--light-color);
165+
border-left: .5rem solid var(--secondary-color);
148166
background: transparent;
149167

150168
& > :last-child {
@@ -231,14 +249,15 @@ pre {
231249
cursor: text;
232250

233251
.CodeMirror {
252+
background: white;
234253
padding: .25em;
235-
border-radius: 3px;
254+
border-radius: .5rem;
236255
}
237256
}
238257

239258
.tryruby-code--editor {
240259
.CodeMirror {
241-
border: 1px solid transparent;
260+
border: 1px solid var(--code-editor-border-color);
242261
transition: border-color .2s ease-in-out;
243262
}
244263
.CodeMirror-focused {
@@ -248,7 +267,7 @@ pre {
248267

249268
.tryruby-code--output {
250269
.CodeMirror {
251-
background-color:var(--code-light-background-color);
270+
background-color: var(--code-light-background-color);
252271
}
253272
}
254273

@@ -266,7 +285,7 @@ pre {
266285
background: var(--success-color);
267286
}
268287
.tryruby-output-red {
269-
background: var(--dark-primary-color)
288+
background: var(--primary-color)
270289
}
271290

272291
// Buttons

0 commit comments

Comments
 (0)