From 3a55eaf231a51942a0bff47be89d909b27bbe1c7 Mon Sep 17 00:00:00 2001 From: "Rico Sta. Cruz" Date: Tue, 19 Sep 2017 14:44:25 +0800 Subject: [PATCH] Update ad appearance --- _data/carbon.yml | 2 +- _data/codesponsor.yml | 2 +- _data/content.yml | 2 +- _includes/2017/code-sponsor.html | 6 ++++++ _layouts/2017/home.html | 7 +++++++ _layouts/2017/sheet.html | 5 ++--- _sass/2017/components/code-sponsor.scss | 7 +++---- _sass/2017/components/main-heading.scss | 2 +- _sass/2017/components/site-header.scss | 6 +++++- _sass/2017/components/top-nav.scss | 23 ----------------------- 10 files changed, 27 insertions(+), 35 deletions(-) create mode 100644 _includes/2017/code-sponsor.html diff --git a/_data/carbon.yml b/_data/carbon.yml index 5f23b69e2..6a5668beb 100644 --- a/_data/carbon.yml +++ b/_data/carbon.yml @@ -1,2 +1,2 @@ -enabled: true +enabled: false src: //cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=ricostacruzcom diff --git a/_data/codesponsor.yml b/_data/codesponsor.yml index 1eb138eae..199b422dd 100644 --- a/_data/codesponsor.yml +++ b/_data/codesponsor.yml @@ -1,2 +1,2 @@ -enabled: false +enabled: true id: R1EbPvY5DOvuC69kWMtpkA diff --git a/_data/content.yml b/_data/content.yml index 8bd3e8341..e37bbcea3 100644 --- a/_data/content.yml +++ b/_data/content.yml @@ -3,7 +3,7 @@ home: tagline: "Hey! I'm @rstacruz and this is a modest collection of cheatsheets I've written." top_nav: - title: "Rico's cheatsheets" + title: Devhints edit: Edit edit_on_github: Edit this page on GitHub diff --git a/_includes/2017/code-sponsor.html b/_includes/2017/code-sponsor.html new file mode 100644 index 000000000..03001db27 --- /dev/null +++ b/_includes/2017/code-sponsor.html @@ -0,0 +1,6 @@ +
+ {% unless include.noprelude %} + We recommend: + {% endunless %} +
+
diff --git a/_layouts/2017/home.html b/_layouts/2017/home.html index d1301e706..3f78dc9b9 100644 --- a/_layouts/2017/home.html +++ b/_layouts/2017/home.html @@ -22,7 +22,14 @@

{{ site.data.content.home.tagline }}

+ {% include 2017/search-form.html live=true %} + + {% if site.data.codesponsor.enabled %} +
+ {% include 2017/code-sponsor.html noprelude=true %} +
+ {% endif %}
diff --git a/_layouts/2017/sheet.html b/_layouts/2017/sheet.html index ebb1993a6..ace548809 100644 --- a/_layouts/2017/sheet.html +++ b/_layouts/2017/sheet.html @@ -8,9 +8,8 @@
{% if site.data.codesponsor.enabled %} -
- Also recommended: -
+
+ {% include 2017/code-sponsor.html %}
{% endif %} diff --git a/_sass/2017/components/code-sponsor.scss b/_sass/2017/components/code-sponsor.scss index be9fb44f6..2f7b71d03 100644 --- a/_sass/2017/components/code-sponsor.scss +++ b/_sass/2017/components/code-sponsor.scss @@ -3,15 +3,14 @@ text-align: center; } - & > span { + /* Prelude */ + & > .prelude { display: block; @include font-size(-1); color: lighten($gray-text, 20%); text-align: center; margin-bottom: -8px; - text-transform: uppercase; - letter-spacing: 0.05em; - font-weight: bold; + font-weight: normal; user-select: none; } diff --git a/_sass/2017/components/main-heading.scss b/_sass/2017/components/main-heading.scss index 9a458f535..d0db88e43 100644 --- a/_sass/2017/components/main-heading.scss +++ b/_sass/2017/components/main-heading.scss @@ -6,7 +6,7 @@ @include heading-style; & { - margin-top: 32px; + margin-top: 0; } & > h1 { diff --git a/_sass/2017/components/site-header.scss b/_sass/2017/components/site-header.scss index 2ac0bc1a1..728f2475d 100644 --- a/_sass/2017/components/site-header.scss +++ b/_sass/2017/components/site-header.scss @@ -13,7 +13,7 @@ } & > h1 { - @include font-size(5); + @include font-size(7); margin: 0; padding: 0; color: $base-head; @@ -28,4 +28,8 @@ & > .action { margin-top: 32px; } + + & > .adbox { + margin-top: 16px; + } } diff --git a/_sass/2017/components/top-nav.scss b/_sass/2017/components/top-nav.scss index 82771f7f9..7c0ab0319 100644 --- a/_sass/2017/components/top-nav.scss +++ b/_sass/2017/components/top-nav.scss @@ -23,29 +23,6 @@ } } - // Horiz line - @media (min-width: 481px) { - &::after { - content: ''; - display: block; - position: absolute; - left: 40%; - right: 40%; - bottom: 0; - height: 1px; - background: linear-gradient(to right, - transparent, - $dark-line-color 20%, - $dark-line-color 80%, - transparent); - - @media (max-width: 480px) { - left: 0; - right: 0; - } - } - } - & > .container { @include gutter(padding-left); @include gutter(padding-right);