From 496eccd1922c89fbc7e69e3a7e6e573ec85536ac Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 16 May 2017 00:24:39 +0200 Subject: Styling and layout of all-versions, download, and changelog fixed/updated. --- website/resources/css/custom.css | 133 +++++++++++++++++---------------- website/resources/js/main.js | 3 +- website/templates/all-versions.html | 143 ++++-------------------------------- website/templates/changelog.html | 7 +- website/templates/download.html | 89 +++------------------- 5 files changed, 99 insertions(+), 276 deletions(-) diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index 0b2c70c9..d3022e28 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -1,149 +1,152 @@ -ul.dropdown-menu .header { - padding-left: 10px; +html { + position: relative; + min-height: 100%; } -div.snippet code { - padding: 0; +body { + margin-bottom: 60px; } -html { - position: relative; - min-height: 100%; +ul.dropdown-menu .header { + padding-left: 10px; } -body { - margin-bottom: 60px; +div.snippet code { + padding: 0; } .fork-me { - position: fixed; - width: 150px; - height: 150px; - top: 0; - right: 0; - z-index: 2000; + position: fixed; + width: 150px; + height: 150px; + top: 0; + right: 0; + z-index: 2000; +} + +@media (max-width: 768px) { + .fork-me { + display: none; + } } .video { - padding-top: 4%; + padding-top: 4%; } .name { - font-weight: bold; + font-weight: bold; } .bs-callout { - padding: 10px; - margin: 20px 0; - border: 1px solid #eee; - border-left-width: 5px; - border-radius: 3px + padding: 10px; + margin: 20px 0; + border: 1px solid #eee; + border-left-width: 5px; + border-radius: 3px; } .bs-callout h4 { - margin-top: 0; - margin-bottom: 5px + margin-top: 0; + margin-bottom: 5px; } .bs-callout p:last-child { - margin-bottom: 0 + margin-bottom: 0; } .bs-callout code { - border-radius: 3px + border-radius: 3px; } .bs-callout + .bs-callout { - margin-top: -5px + margin-top: -5px; } .bs-callout-danger { - border-left-color: #ce4844 + border-left-color: #ce4844; } .bs-callout-danger h4 { - color: #ce4844 + color: #ce4844; } .bs-callout-warning { - border-left-color: #aa6708 + border-left-color: #aa6708; } .bs-callout-warning h4 { - color: #aa6708 + color: #aa6708; } .bs-callout-info { - border-left-color: #1b809e + border-left-color: #1b809e; } .bs-callout-info h4 { - color: #1b809e + color: #1b809e; } .color-swatches { - margin: 0 -5px; - overflow: hidden + margin: 0 -5px; + overflow: hidden; } .footer { - position: absolute; - bottom: 0; - height: 60px; - border-top: 1px solid #eee; - padding-top: 15px; -} - -@media (max-width: 768px) { - .fork-me { - display: none; - } + position: absolute; + bottom: 0; + height: 60px; + border-top: 1px solid #eee; + padding-top: 15px; } h1, h2, h3 { - padding: 40px; - text-align: center; + padding: 40px; + text-align: center; } .page-center { - padding-top: 10%; - padding-bottom: 19%; + padding-top: 10%; + padding-bottom: 19%; } .page-header { - border-bottom: 0; + border-bottom: 0; } .header-group > h1, h2, h3 { - padding: 5px; + padding: 5px; } .snippet { - overflow: auto; - padding: 4px; - border: 1px dotted #888; - text-align: left; - width: 760px; + overflow: auto; + padding: 4px; + border: 1px dotted #888; + text-align: left; } .snippet font { - white-space: pre; + white-space: pre; } .snippet code { - font-size: 14px; - background-color: transparent; + font-size: 14px; + background-color: transparent; } .snippet.example { - margin: 8px 16px 8px 16px; + margin: 8px 16px 8px 16px; } a { - cursor: pointer; + cursor: pointer; } .main-section { - padding-left: 100px; - padding-right: 100px; -} \ No newline at end of file + padding-left: 100px; + padding-right: 100px; +} + +.changelog li { + text-align: left; +} diff --git a/website/resources/js/main.js b/website/resources/js/main.js index 4ac490d3..146dd554 100644 --- a/website/resources/js/main.js +++ b/website/resources/js/main.js @@ -37,6 +37,7 @@ var u = hs.data.urlPath; if (u === "/" || u === "") u = "/main.html"; if (u.substring(u.length - 5) !== ".html") u += ".html"; + if (u.substring(u.length - 8) === "all.html") u = u.substring(0, u.length - 8) + "index.html"; var key = toKey(u); var sc = $("#" + key); if (sc.length > 0) { @@ -61,4 +62,4 @@ } $(ajaxFeaturePages); -})($); \ No newline at end of file +})($); diff --git a/website/templates/all-versions.html b/website/templates/all-versions.html index d3acd648..97592160 100644 --- a/website/templates/all-versions.html +++ b/website/templates/all-versions.html @@ -2,26 +2,22 @@ <@main.scaffold>
-
-
-

-
- - - Download ${version} - -
- <#list linksToVersions as lnk> - ${lnk[1]} - -
- - changelog - -
-

-
+
+

+
+ + + ${version} [Current Version] + +
+

+ <#list linksToVersions as lnk> +
+ + ${lnk[1]} +
+

@@ -31,114 +27,5 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/website/templates/changelog.html b/website/templates/changelog.html index 80697e70..c02deba7 100644 --- a/website/templates/changelog.html +++ b/website/templates/changelog.html @@ -1,11 +1,8 @@ <#import "/_scaffold.html" as main> <@main.scaffold>
-
-

Changelog

-
-
-

@CHANGELOG@

+
+ ${changelog?no_esc}
diff --git a/website/templates/download.html b/website/templates/download.html index af992c39..587ea1ab 100644 --- a/website/templates/download.html +++ b/website/templates/download.html @@ -7,96 +7,31 @@

- + Download ${version}
-
- - changelog - -

+
+ + changelog + +
+
+ + older versions + +

- Feeling adventurous? Download the latest snapshot + Feeling adventurous? Download the latest snapshot release.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit