From 2cde4f02ddab1294bd2cb964a3dc01c8f3200a5e Mon Sep 17 00:00:00 2001 From: 0xfff <0xfff@protonmail.com> Date: Fri, 9 Sep 2016 22:19:43 +0200 Subject: [PATCH] (Update) Layout: Spacing Home (#10) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * (Update) Logo-collection: Adjust spacing / add maxheight / use BEM * (Update) Home: Adjust spacing between h1 + slogan / Adjust space between image at the bottom * (Fix) Home: Replace secure icon with correctly retraced one * [Chore] Layout: Whitespace / unused inline javascript * (Update) Home: More Spacing * (Fix) Currency: execute js onload * (Update) Layout: Add class for latest news section --- _layouts/default.html | 74 ++++----------- _sass/_header.scss | 1 + _sass/_home.scss | 16 +++- assets/img/home/secure.svg | 2 +- currency/index.html | 179 +++++++++++++++++++------------------ index.html | 18 ++-- 6 files changed, 134 insertions(+), 156 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index f3b9a1f..4cf17f6 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -5,33 +5,31 @@ {% if page.title %}{% t page.title %} — {% endif %}Dash - - - + + + - - - + - - - + + + {{ content }} - +
{% include nav-mobile.html %}
- + @@ -39,51 +37,17 @@ - -function windowPopup(url, width, height) { - // Calculate the position of the popup so - // it’s centered on the screen. - var left = (screen.width / 2) - (width / 2), - top = (screen.height / 2) - (height / 2); - - window.open( - url, - "", - "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=" + width + ",height=" + height + ",top=" + top + ",left=" + left - ); -} - -//jQuery -$(".js-social-share").on("click", function(e) { - e.preventDefault(); - - windowPopup($(this).attr("href"), 500, 300); -}); - -// Vanilla JavaScript -var jsSocialShares = document.querySelectorAll(".js-social-share"); -if (jsSocialShares) { - [].forEach.call(jsSocialShares, function(anchor) { - anchor.addEventListener("click", function(e) { - e.preventDefault(); - - windowPopup(this.href, 500, 300); - }); - }); -} - - - - diff --git a/_sass/_header.scss b/_sass/_header.scss index 9a12151..7a42d91 100644 --- a/_sass/_header.scss +++ b/_sass/_header.scss @@ -14,6 +14,7 @@ } > h1 { margin-top: 2.5em; + margin-bottom: 8px; /*optical*/ font-size: 56px; line-height: 1.2; } diff --git a/_sass/_home.scss b/_sass/_home.scss index 74d520b..bdb46e9 100644 --- a/_sass/_home.scss +++ b/_sass/_home.scss @@ -22,7 +22,7 @@ $homeSectionPaddingTop: 40px; } p { - max-width: 60em; + max-width: 50em; margin: 20px auto; } @@ -137,6 +137,7 @@ $homeSectionPaddingTop: 40px; } img { + margin-top: 30px; vertical-align: text-top; } @@ -144,6 +145,12 @@ $homeSectionPaddingTop: 40px; color: $blue; } } + + .home-latest-news { + .btn-blue { + margin-top: 20px; + } + } } .logo-collection { @@ -152,10 +159,15 @@ $homeSectionPaddingTop: 40px; justify-content: space-between; flex-wrap: wrap; - > .logo { + margin-bottom: 20px; + + &__logo { flex: 1 1 auto; margin: 20px 10px; } + &__image { + max-height: 100%; + } } .news-post { diff --git a/assets/img/home/secure.svg b/assets/img/home/secure.svg index 0de715e..f340401 100644 --- a/assets/img/home/secure.svg +++ b/assets/img/home/secure.svg @@ -1 +1 @@ -private \ No newline at end of file +secure \ No newline at end of file diff --git a/currency/index.html b/currency/index.html index f780c03..d19b27b 100644 --- a/currency/index.html +++ b/currency/index.html @@ -7,7 +7,7 @@ description: pages.currency.description {% tf currency/hero.html %}
- +

{% t pages.currency.markets-heading %}

@@ -20,7 +20,7 @@ description: pages.currency.description - +
@@ -38,7 +38,7 @@ description: pages.currency.description - + @@ -60,100 +60,101 @@ description: pages.currency.description - +
\ No newline at end of file diff --git a/index.html b/index.html index 4b74473..4a6f8f5 100644 --- a/index.html +++ b/index.html @@ -61,17 +61,17 @@ description: pages.home.description
-