From 39e5eb944169ba84f1fadad6902f19c78b3412ab Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 19 Dec 2015 09:29:15 -0800 Subject: [PATCH] Tweak sidebar and twitter link --- _config.yml | 6 +---- sass/custom/_paulus.scss | 14 ++++++++++++ source/_includes/asides/about.html | 5 +++-- source/_includes/asides/categories.html | 2 +- source/_includes/asides/github.html | 19 ---------------- source/_includes/asides/search.html | 1 + source/_includes/asides/social.html | 19 ---------------- source/_includes/asides/twitter.html | 17 --------------- source/_includes/custom/footer.html | 12 +++++++--- source/_includes/custom/welcome.html | 2 +- source/_includes/post/sharing.html | 29 ++++++++++--------------- source/_includes/site/head.html | 9 ++++---- source/_includes/site/sidebar.html | 7 +++--- 13 files changed, 51 insertions(+), 91 deletions(-) delete mode 100644 source/_includes/asides/github.html delete mode 100644 source/_includes/asides/social.html delete mode 100644 source/_includes/asides/twitter.html diff --git a/_config.yml b/_config.yml index b93c45e7e8a..068251ebebe 100644 --- a/_config.yml +++ b/_config.yml @@ -67,10 +67,6 @@ excerpt_separator: "" titlecase: true # Converts page and post titles to titlecase -# list each of the sidebar modules you want to include, in the order you want them to appear. -# To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html' -default_asides: [post/sharing.html, asides/recent_posts.html] - # Each layout uses the default asides, but they can have their own asides instead. Simply uncomment the lines below # and add an array with the asides you want to use. # blog_index_asides: @@ -130,4 +126,4 @@ social: app_id: 338291289691179 twitter: - account: balloob + account: home_assistant diff --git a/sass/custom/_paulus.scss b/sass/custom/_paulus.scss index 9a1a73a3c58..fb81b3c8739 100644 --- a/sass/custom/_paulus.scss +++ b/sass/custom/_paulus.scss @@ -186,6 +186,20 @@ p.note { } +.copyright { + text-align: center; + + i { + font-size: 2.2em; + margin-right: 8px; + } + .credit { + text-align: left; + display: inline-block; + font-size: .8em; + } +} + #site-search .search { width: calc(100% - 36px); } diff --git a/source/_includes/asides/about.html b/source/_includes/asides/about.html index fe95f143c5a..c8129671e7f 100644 --- a/source/_includes/asides/about.html +++ b/source/_includes/asides/about.html @@ -5,7 +5,8 @@ Home Assistant is an open-source home automation platform running on Python 3. Track and control all devices at home and automate control.
  • Get started with Home Assistant
    • -
  • Open the online demo
    • -
  • Browse code on GitHub
    • +
  • Try the online demo
    • +
    • + diff --git a/source/_includes/asides/categories.html b/source/_includes/asides/categories.html index 0e4518742d3..8d600335bfb 100644 --- a/source/_includes/asides/categories.html +++ b/source/_includes/asides/categories.html @@ -3,7 +3,7 @@ diff --git a/source/_includes/asides/github.html b/source/_includes/asides/github.html deleted file mode 100644 index c5041b25e05..00000000000 --- a/source/_includes/asides/github.html +++ /dev/null @@ -1,19 +0,0 @@ -{% if site.social.github.user %} -
    -

    - GitHub Repos - {% if site.social.github.show_profile_link or site.github_show_profile_link %} - - - - - - {% endif %} -

    - -
    -{% endif %} diff --git a/source/_includes/asides/search.html b/source/_includes/asides/search.html index 705879c1cd2..545bf9728a4 100644 --- a/source/_includes/asides/search.html +++ b/source/_includes/asides/search.html @@ -1,4 +1,5 @@
    +

    Search

    diff --git a/source/_includes/asides/social.html b/source/_includes/asides/social.html deleted file mode 100644 index b2834a7af81..00000000000 --- a/source/_includes/asides/social.html +++ /dev/null @@ -1,19 +0,0 @@ -{% unless site.social.visible == false %} - -{% endunless %} diff --git a/source/_includes/asides/twitter.html b/source/_includes/asides/twitter.html deleted file mode 100644 index c4f34ae8c4f..00000000000 --- a/source/_includes/asides/twitter.html +++ /dev/null @@ -1,17 +0,0 @@ -{% if site.social.twitter.user and site.social.twitter.widget.is_shown %} -
    -

    - Latest Tweets - {% if site.social.twitter.widget.show_profile_link %} - - - - - - {% endif %} -

    - - - -
    -{% endif %} diff --git a/source/_includes/custom/footer.html b/source/_includes/custom/footer.html index 9c22951a2ff..efc3c3c40a6 100644 --- a/source/_includes/custom/footer.html +++ b/source/_includes/custom/footer.html @@ -1,3 +1,9 @@ -

    - Powered by Jekyll and the Oscalite theme. Hosted by GitHub and served by CloudFlare. -

    \ No newline at end of file +
    + + + +
    + Website powered by Jekyll and the Oscalite theme.
    + Hosted by GitHub and served by CloudFlare. +
    +
    \ No newline at end of file diff --git a/source/_includes/custom/welcome.html b/source/_includes/custom/welcome.html index a601d474d31..ec2b64cb07c 100644 --- a/source/_includes/custom/welcome.html +++ b/source/_includes/custom/welcome.html @@ -9,5 +9,5 @@ Home Assistant is an open-source home automation platform running on Python 3. T

    Get started View demo - Browse code on GitHub + Browse code on GitHub

    diff --git a/source/_includes/post/sharing.html b/source/_includes/post/sharing.html index ac35a31b67e..44af6bf53ad 100644 --- a/source/_includes/post/sharing.html +++ b/source/_includes/post/sharing.html @@ -3,37 +3,32 @@ {% if site.twitter_tweet_button %} + data-via="{{ site.social.twitter.account }}" + data-related="{{ site.social.twitter.account }}" + data-url="{{ page.url | canonical_url }}" + data-counturl="{{ page.url | canonical_url }}" >Tweet + {% endif %} + {% if site.facebook_like %} +
    +
    {% endif %} {% if site.google_plus_one %}
    {% endif %} - {% if site.facebook_like %} -
    -
    - {% endif %}
    - - -