Skip to content

Commit 1dd2dd9

Browse files
dschodscho
committed
Merge branch 'migrate-main-page-to-hugo'
This migrates the landing page to allow Hugo to render it correctly. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents bc4b004 + 445b418 commit 1dd2dd9

File tree

16 files changed

+175
-142
lines changed

16 files changed

+175
-142
lines changed

‎Gemfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# frozen_string_literal: true
22

33
source "https://rubygems.org"
4+
5+
gem "octokit"

‎app/views/site/index.html.erb‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎assets/sass/application.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
// compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
1010
// files in this directory. Styles in this file should be added after the last require_* statement.
1111
// It is generally better to create a new file per style scope.
12-
//
13-
//= require normalize
1412

13+
$baseurl: "{{ .Site.BaseURL }}{{ if (and (ne .Site.BaseURL "/") (ne .Site.BaseURL "")) }}/{{ end }}";
14+
@import 'normalize';
1515
@import 'mixins';
1616
@import 'variables';
1717
@import 'layout';

‎assets/sass/book.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
}
4949

5050
#about-book {
51-
@include background-image-2x("/images/icons/info", 18px, 17px, 40px 1px);
51+
@include background-image-2x($baseurl + "images/icons/info", 18px, 17px, 40px 1px);
5252
display: none;
5353
padding-left: 22px;
5454
font-size: 12px;

‎assets/sass/errors.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body {
66
line-height: $base-line-height;
77
font-family: $base-font-family;
88
color: $font-color;
9-
background: #f0efe7 url(/images/bg/body.jpg);
9+
background: #f0efe7 url($baseurl + "images/bg/body.jpg");
1010
}
1111

1212
// windows chrome makes a mess of Adelle web font

‎assets/sass/forms.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ form#search {
3838
z-index: 1000;
3939
width: 262px;
4040
padding-left: 32px;
41-
@include background-image-2x("/images/icons/search", 17px, 17px, 10px 50%);
41+
@include background-image-2x($baseurl + "images/icons/search", 17px, 17px, 10px 50%);
4242
background-color: #fcfcfa !important;
4343
border: solid 1px #ceccc5;
4444
@include border-radius(20px);

‎assets/sass/front-page.scss‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ $monitor-height: 271px;
128128
}
129129

130130
.monitor {
131-
@include background-image-2x("/images/monitor-default", $monitor-width, $monitor-height);
131+
@include background-image-2x($baseurl + "images/monitor-default", $monitor-width, $monitor-height);
132132
width: $monitor-width - 40;
133133
height: $monitor-height - 45;
134134
padding-top: 45px;
@@ -184,19 +184,19 @@ $monitor-height: 271px;
184184
}
185185

186186
&.mac {
187-
@include background-image-2x("/images/monitor-mac", $monitor-width, $monitor-height);
187+
@include background-image-2x($baseurl + "images/monitor-mac", $monitor-width, $monitor-height);
188188
width: $monitor-width - 40;
189189
height: $monitor-height - 36;
190190
padding-top: 36px;
191191
padding-left: 40px;
192192
}
193193

194194
&.windows {
195-
@include background-image-2x("/images/monitor-windows", $monitor-width, $monitor-height);
195+
@include background-image-2x($baseurl + "images/monitor-windows", $monitor-width, $monitor-height);
196196
}
197197

198198
&.linux {
199-
@include background-image-2x("/images/monitor-linux", $monitor-width, $monitor-height);
199+
@include background-image-2x($baseurl + "images/monitor-linux", $monitor-width, $monitor-height);
200200
}
201201
}
202202

@@ -232,62 +232,62 @@ $monitor-height: 271px;
232232
}
233233

234234
&.google {
235-
@include background-image-2x("/images/company-project-logos/google", 108px, 65px);
235+
@include background-image-2x($baseurl + "images/company-project-logos/google", 108px, 65px);
236236
}
237237

238238
&.twitter {
239-
@include background-image-2x("/images/company-project-logos/twitter", 108px, 65px);
239+
@include background-image-2x($baseurl + "images/company-project-logos/twitter", 108px, 65px);
240240
}
241241

242242
&.microsoft {
243-
@include background-image-2x("/images/company-project-logos/microsoft", 108px, 65px);
243+
@include background-image-2x($baseurl + "images/company-project-logos/microsoft", 108px, 65px);
244244
}
245245

246246
&.netflix {
247-
@include background-image-2x("/images/company-project-logos/netflix", 108px, 65px);
247+
@include background-image-2x($baseurl + "images/company-project-logos/netflix", 108px, 65px);
248248
}
249249

250250
&.linked-in {
251-
@include background-image-2x("/images/company-project-logos/linked-in", 108px, 65px);
251+
@include background-image-2x($baseurl + "images/company-project-logos/linked-in", 108px, 65px);
252252
}
253253

254254
&.linux {
255-
@include background-image-2x("/images/company-project-logos/linux", 108px, 65px);
255+
@include background-image-2x($baseurl + "images/company-project-logos/linux", 108px, 65px);
256256
}
257257

258258
&.perl {
259-
@include background-image-2x("/images/company-project-logos/perl", 108px, 65px);
259+
@include background-image-2x($baseurl + "images/company-project-logos/perl", 108px, 65px);
260260
}
261261

262262
&.postgresql {
263-
@include background-image-2x("/images/company-project-logos/postgresql", 108px, 65px);
263+
@include background-image-2x($baseurl + "images/company-project-logos/postgresql", 108px, 65px);
264264
}
265265

266266
&.android {
267-
@include background-image-2x("/images/company-project-logos/android", 108px, 65px);
267+
@include background-image-2x($baseurl + "images/company-project-logos/android", 108px, 65px);
268268
}
269269
&.rails {
270-
@include background-image-2x("/images/company-project-logos/rails", 108px, 65px);
270+
@include background-image-2x($baseurl + "images/company-project-logos/rails", 108px, 65px);
271271
}
272272

273273
&.qt {
274-
@include background-image-2x("/images/company-project-logos/qt", 108px, 65px);
274+
@include background-image-2x($baseurl + "images/company-project-logos/qt", 108px, 65px);
275275
}
276276

277277
&.gnome {
278-
@include background-image-2x("/images/company-project-logos/gnome", 108px, 65px);
278+
@include background-image-2x($baseurl + "images/company-project-logos/gnome", 108px, 65px);
279279
}
280280

281281
&.eclipse {
282-
@include background-image-2x("/images/company-project-logos/eclipse", 108px, 65px);
282+
@include background-image-2x($baseurl + "images/company-project-logos/eclipse", 108px, 65px);
283283
}
284284

285285
&.kde {
286-
@include background-image-2x("/images/company-project-logos/kde", 108px, 65px);
286+
@include background-image-2x($baseurl + "images/company-project-logos/kde", 108px, 65px);
287287
}
288288

289289
&.x {
290-
@include background-image-2x("/images/company-project-logos/x", 108px, 65px);
290+
@include background-image-2x($baseurl + "images/company-project-logos/x", 108px, 65px);
291291
}
292292
}
293293
}
@@ -300,27 +300,27 @@ a.icon {
300300
line-height: 36px;
301301

302302
&.gui {
303-
@include background-image-2x("/images/icons/gui", 18px, 24px, 6px 3px);
303+
@include background-image-2x($baseurl + "images/icons/gui", 18px, 24px, 6px 3px);
304304
}
305305

306306
&.older-releases {
307-
@include background-image-2x("/images/icons/box", 22px, 20px, 0 6px);
307+
@include background-image-2x($baseurl + "images/icons/box", 22px, 20px, 0 6px);
308308
}
309309

310310
&.windows {
311-
@include background-image-2x("/images/icons/windows", 24px, 21px, 0 6px);
311+
@include background-image-2x($baseurl + "images/icons/windows", 24px, 21px, 0 6px);
312312
}
313313

314314
&.mac {
315-
@include background-image-2x("/images/icons/apple", 17px, 21px, 5px 4px);
315+
@include background-image-2x($baseurl + "images/icons/apple", 17px, 21px, 5px 4px);
316316
}
317317

318318
&.linux {
319-
@include background-image-2x("/images/icons/linux", 17px, 21px, 6px 6px);
319+
@include background-image-2x($baseurl + "images/icons/linux", 17px, 21px, 6px 6px);
320320
}
321321

322322
&.source {
323-
@include background-image-2x("/images/icons/source-code", 25px, 20px, 0 6px);
323+
@include background-image-2x($baseurl + "images/icons/source-code", 25px, 20px, 0 6px);
324324
}
325325
}
326326

‎assets/sass/layout.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body {
88
font-size: $base-font-size;
99
line-height: $base-line-height;
1010
color: $font-color;
11-
background: #f0efe7 url("/images/bg/body.jpg");
11+
background: #f0efe7 url($baseurl + "images/bg/body.jpg");
1212
}
1313

1414
// windows chrome makes a mess of Adelle web font
@@ -79,7 +79,7 @@ aside {
7979
height: 295px;
8080
margin-top: -20px;
8181
margin-bottom: 2em;
82-
@include background-image-2x("/images/bg/isometric-grid", 35px, 21px, top right, repeat);
82+
@include background-image-2x($baseurl + "images/bg/isometric-grid", 35px, 21px, top right, repeat);
8383

8484
.inner {
8585
padding-top: 20px;
@@ -222,7 +222,7 @@ p.center {
222222
}
223223

224224
.callout.downloading {
225-
background: $callout-color url(/images/icons/download.png) 24px 24px no-repeat;
225+
background: $callout-color url($baseurl + "images/icons/download.png") 24px 24px no-repeat;
226226
padding: 20px 30px 20px 100px !important;
227227

228228
h3 {
@@ -346,7 +346,7 @@ footer {
346346
.site-source {
347347
float: left;
348348
padding-left: 46px;
349-
@include background-image-2x("/images/icons/code", 38px, 23px, 0 2px);
349+
@include background-image-2x($baseurl + "images/icons/code", 38px, 23px, 0 2px);
350350
}
351351

352352
.sfc-member {

‎assets/sass/lists.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ ol#about-nav {
9999
text-align: center;
100100
color: $font-color;
101101
opacity: 0.9;
102-
@include background-image-2x("/images/icons/nav-circles", 90px, 180px);
102+
@include background-image-2x($baseurl + "images/icons/nav-circles", 90px, 180px);
103103

104104
&.current {
105-
@include background-image-2x("/images/icons/nav-circles", 90px, 180px, 0 -90px);
105+
@include background-image-2x($baseurl + "images/icons/nav-circles", 90px, 180px, 0 -90px);
106106
color: #fff;
107107
opacity: 1;
108108
}

0 commit comments

Comments
 (0)