Skip to content

Commit a8e0181

Browse files
authored
Replace computer monitor on homepage (#2105)
This replaces the computer monitor on the homepage (and the links below it) with a single box. I've removed the links below the monitor. Here's the new way to access the removed links: * Tarballs: Install -> Build from source * Windows Build: Install -> Windows * Mac GUIs: Tools -> GUIs
2 parents 3e0cfb4 + a9cdd38 commit a8e0181

File tree

15 files changed

+110
-215
lines changed

15 files changed

+110
-215
lines changed

assets/js/application.js

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,15 @@ var DownloadBox = {
6060
$('#gui-os-filter').addClass('visible');
6161
var os = window.session.browser.os; // Mac, Win, Linux
6262
if(os == "Mac") {
63-
$(".monitor").addClass("mac");
64-
$("#download-link").text("Download for Mac").attr("href", `${baseURLPrefix}install/mac`);
65-
$("#gui-link").removeClass('mac').addClass('gui');
66-
$("#gui-link").text("Mac GUIs").attr("href", `${baseURLPrefix}downloads/guis?os=mac`);
63+
$("#download-link").text("Install for Mac").attr("href", `${baseURLPrefix}install/mac`);
6764
$("#gui-os-filter").attr('data-os', 'mac');
6865
$("#gui-os-filter").text("Only show GUIs for my OS (Mac)")
6966
} else if (os == "Windows") {
70-
$(".monitor").addClass("windows");
71-
$("#download-link").text("Download for Windows").attr("href", `${baseURLPrefix}install/windows`);
72-
$("#gui-link").removeClass('mac').addClass('gui');
73-
$("#gui-link").text("Windows GUIs").attr("href", `${baseURLPrefix}downloads/guis?os=windows`);
74-
$("#alt-link").removeClass("windows").addClass("mac");
75-
$("#alt-link").text("Mac Build").attr("href", `${baseURLPrefix}install/mac`);
67+
$("#download-link").text("Install for Windows").attr("href", `${baseURLPrefix}install/windows`);
7668
$("#gui-os-filter").attr('data-os', 'windows');
7769
$("#gui-os-filter").text("Only show GUIs for my OS (Windows)")
7870
} else if (os == "Linux") {
79-
$(".monitor").addClass("linux");
80-
$("#download-link").text("Download for Linux").attr("href", `${baseURLPrefix}install/linux`);
81-
$("#gui-link").removeClass('mac').addClass('gui');
82-
$("#gui-link").text("Linux GUIs").attr("href", `${baseURLPrefix}downloads/guis?os=linux`);
83-
$("#alt-link").removeClass("windows").addClass("mac");
84-
$("#alt-link").text("Mac Build").attr("href", `${baseURLPrefix}install/mac`);
71+
$("#download-link").text("Install for Linux").attr("href", `${baseURLPrefix}install/linux`);
8572
$("#gui-os-filter").attr('data-os', 'linux');
8673
$("#gui-os-filter").text("Only show GUIs for my OS (Linux)")
8774
} else {

assets/sass/dark-mode.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@
108108
@include box-shadow(none);
109109
}
110110

111-
div.monitor {
112-
filter: brightness(.85);
113-
}
114-
115-
.monitor a {
116-
color: #dbd7d7;
117-
}
118-
119111
hr.sidebar {
120112
filter: brightness(0.5);
121113
}

assets/sass/front-page.scss

Lines changed: 85 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
ul {
2020
@extend .unstyled !optional;
21-
padding-top: 24px;
21+
padding-top: 6px;
2222
display: flex;
2323
flex-direction: row;
2424
flex-wrap: wrap;
@@ -99,106 +99,87 @@
9999
}
100100
}
101101

102-
$monitor-width: 313px;
103-
$monitor-height: 271px;
104-
105102
#front-downloads {
106103
float: right;
107-
width: 313px;
104+
width: 295px;
108105
position: relative;
109106

110-
.monitor {
111-
position: absolute;
112-
top: 0;
113-
right: -12px;
114-
}
115-
116-
table {
117-
position: absolute;
118-
top: $monitor-height;
119-
left: 24px;
107+
.downloads-box {
108+
padding: 20px;
109+
background: var(--versions-footer-bg-color);
110+
outline: 1px solid #f0c8bb;
120111

121-
td {
122-
padding: 8px 20px 6px 0;
123-
min-width: 145px;
112+
:root[data-theme="dark"] & {
113+
outline-color: var(--orange);
124114
}
125-
126-
a {
127-
font-weight: bold;
115+
border-radius: 4px;
116+
position: relative;
117+
118+
&::before {
119+
content: '';
120+
position: absolute;
121+
top: 15px;
122+
left: 15px;
123+
width: 80px;
124+
height: 80px;
125+
background: url('#{$baseurl}images/logos/downloads/Git-Icon-1788C.png') no-repeat;
126+
background-size: contain;
127+
opacity: 0.55;
128128
}
129129
}
130-
}
131130

132-
.monitor {
133-
@include background-image-2x($baseurl + "images/monitor-default", $monitor-width, $monitor-height);
134-
width: $monitor-width - 40;
135-
height: $monitor-height - 45;
136-
padding-top: 45px;
137-
padding-left: 40px;
138-
color: var(--main-bg);
139-
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
131+
.release-info {
132+
margin-bottom: 18px;
133+
padding: 0 0 18px 100px;
134+
border-bottom: 1px solid var(--base-border-color);
140135

141-
h4 {
142-
font-weight: normal;
143-
color: var(--main-bg);
144-
font-size: 16px;
145-
}
136+
h4 {
137+
font-weight: normal;
138+
font-size: 16px;
139+
}
146140

147-
span.version {
148-
display: block;
149-
margin-bottom: 6px;
150-
font-size: 28px;
151-
font-weight: bold;
152-
}
141+
.version {
142+
display: block;
143+
margin-bottom: 6px;
144+
font-size: 28px;
145+
font-weight: bold;
146+
}
153147

154-
a {
155-
color: #eee;
156-
font-size: 12px;
157-
text-decoration: underline;
158-
}
148+
a {
149+
font-size: 12px;
150+
text-decoration: underline;
151+
}
159152

160-
span.release-date {
161-
font-size: 12px;
153+
time {
154+
font-size: 12px;
155+
}
162156
}
163157

164158
a.button {
165-
@include border-radius(2px);
166-
@include box-shadow(0 1px 0 #148a92);
167-
display: block;
168-
width: 224px;
169-
padding: 5px 0;
170-
margin-top: 10px;
171-
font-size: 16px;
172-
color: var(--main-bg);
173-
text-align: center;
174-
background-image: linear-gradient(#1c868c, #186368);
175-
border-top: solid 1px #085e64;
176-
border-right: solid 1px #1f6367;
177-
border-bottom: solid 1px #134143;
178-
border-left: solid 1px #1f6367;
179-
transition-duration: 0.3s;
180-
transition-property: background-image;
159+
display: flex;
160+
align-items: center;
161+
justify-content: center;
162+
gap: 8px;
163+
padding: 12px 16px;
181164
text-decoration: none;
182-
183-
&:hover {
184-
background-image: linear-gradient(#1a7e84, #165b60);
185-
}
186-
}
187-
188-
&.mac {
189-
@include background-image-2x($baseurl + "images/monitor-mac", $monitor-width, $monitor-height);
190-
width: $monitor-width - 40;
191-
height: $monitor-height - 36;
192-
padding-top: 36px;
193-
padding-left: 40px;
165+
border-radius: 6px;
166+
font-weight: bold;
167+
transition: all 0.2s;
194168
}
195169

196-
&.windows {
197-
@include background-image-2x($baseurl + "images/monitor-windows", $monitor-width, $monitor-height);
170+
#download-link {
171+
background: var(--orange);
172+
margin-bottom: 10px;
173+
color: white;
198174
}
199175

200-
&.linux {
201-
@include background-image-2x($baseurl + "images/monitor-linux", $monitor-width, $monitor-height);
176+
.github-link {
177+
background: transparent;
178+
color: var(--font-color);
179+
border: 1px solid var(--base-border-color);
180+
font-weight: normal;
181+
font-size: 13px;
182+
padding: 10px 16px;
202183
}
203184
}
204185

@@ -258,80 +239,41 @@ $monitor-height: 271px;
258239
}
259240
}
260241

261-
a.icon {
262-
display: inline-block;
263-
height: 30px;
264-
padding-left: 30px;
265-
line-height: 36px;
266-
267-
&.gui {
268-
@include background-image-2x($baseurl + "images/icons/gui", 18px, 24px, 6px 3px);
269-
}
270-
271-
&.older-releases {
272-
@include background-image-2x($baseurl + "images/icons/box", 22px, 20px, 0 6px);
273-
}
274-
275-
&.windows {
276-
@include background-image-2x($baseurl + "images/icons/windows", 24px, 21px, 0 6px);
277-
}
278-
279-
&.mac {
280-
@include background-image-2x($baseurl + "images/icons/apple", 17px, 21px, 5px 4px);
281-
}
282-
283-
&.linux {
284-
@include background-image-2x($baseurl + "images/icons/linux", 17px, 21px, 6px 6px);
285-
}
286-
287-
&.source {
288-
@include background-image-2x($baseurl + "images/icons/source-code", 25px, 20px, 0 6px);
289-
}
290-
}
291-
292-
293-
294242
// Breakpoint ----------------
295243
@media (max-width: $default) {
296244
#front-content {
297245
display: flex;
246+
298247
#front-navigation {
299248
width: 50%;
249+
300250
#front-nav {
301251
ul {
302252
padding: 0 1rem 0 0;
253+
303254
li {
304255
margin-bottom: 1rem !important;
305256
margin-right: 0 !important;
306257
}
307258
}
308259
}
260+
309261
#front-book {
310262
width: unset;
311263
}
312264
}
265+
313266
#front-downloads {
314-
width: 50%;
315-
.monitor {
316-
@include center-transformX;
317-
}
318-
table{
319-
@include center-transformX;
320-
tbody, tr {
321-
display: flex;
322-
flex-direction: column;
323-
}
324-
td {
325-
margin-bottom: 1rem;
326-
a { padding-left: 2.3rem; }
327-
}
328-
}
267+
width: calc(50% - 20px);
268+
padding-left: 20px;
329269
}
330270
}
271+
331272
#companies-projects {
332273
ul {
333274
// TODO
334275
}
276+
335277
li {
336278
// TODO
337279
}
@@ -340,30 +282,41 @@ a.icon {
340282

341283
// Mobile
342284
@media (max-width: $mobile-m) {
343-
#front-content{
285+
#front-content {
344286
flex-direction: column-reverse;
345-
#front-navigation, #front-downloads {
287+
288+
#front-navigation,
289+
#front-downloads {
346290
width: 100%;
347291
border-right: none;
348292
}
293+
294+
#front-downloads {
295+
padding-left: 0;
296+
}
297+
349298
#front-navigation {
350-
#front-nav {
299+
#front-nav {
351300
ul {
352301
padding: 0 1rem;
353302
}
354303
}
304+
355305
#front-book {
356306
@include flex-center;
357307
align-items: center;
358308
}
359309
}
310+
360311
#front-downloads {
361312
border-bottom: 1px solid var(--base-border-color);
362313
margin-bottom: 2rem;
363314
padding-bottom: 1rem;
364-
.monitor, table {
315+
316+
table {
365317
position: relative;
366318
}
319+
367320
table {
368321
top: 0;
369322
}

layouts/partials/monitor.html

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

0 commit comments

Comments
 (0)