From b11ae4d9a0ef9e122ae807e403d40785c4b6a3d6 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 31 Jul 2015 11:41:02 -0700 Subject: Revert "Merge pull request #66 from webstream-io/rusty-makeover" This reverts commit c3cac9513ba843e90fb0379fd0ed5ceae3730fd8, reversing changes made to f71ce5cdc718544159f98cdf8d89494aadc30c86. --- themes/rusted/static/css/_base.scss | 192 --------------------- themes/rusted/static/css/_bootstrap-overrides.scss | 6 - themes/rusted/static/css/_homepage.scss | 12 -- themes/rusted/static/css/_layout.scss | 135 --------------- themes/rusted/static/css/main.scss | 46 ----- themes/rusted/templates/_post-title.html | 10 -- themes/rusted/templates/_subscribe-form.html | 13 -- themes/rusted/templates/archives.html | 16 -- themes/rusted/templates/article.html | 37 ---- themes/rusted/templates/base.html | 78 --------- themes/rusted/templates/index.html | 31 ---- themes/rusted/templates/page.html | 31 ---- 12 files changed, 607 deletions(-) delete mode 100644 themes/rusted/static/css/_base.scss delete mode 100644 themes/rusted/static/css/_bootstrap-overrides.scss delete mode 100644 themes/rusted/static/css/_homepage.scss delete mode 100644 themes/rusted/static/css/_layout.scss delete mode 100644 themes/rusted/static/css/main.scss delete mode 100644 themes/rusted/templates/_post-title.html delete mode 100644 themes/rusted/templates/_subscribe-form.html delete mode 100644 themes/rusted/templates/archives.html delete mode 100644 themes/rusted/templates/article.html delete mode 100644 themes/rusted/templates/base.html delete mode 100644 themes/rusted/templates/index.html delete mode 100644 themes/rusted/templates/page.html (limited to 'themes') diff --git a/themes/rusted/static/css/_base.scss b/themes/rusted/static/css/_base.scss deleted file mode 100644 index 2adb494..0000000 --- a/themes/rusted/static/css/_base.scss +++ /dev/null @@ -1,192 +0,0 @@ -/** - * Reset some basic elements - */ -body, h1, h2, h3, h4, h5, h6, -p, blockquote, pre, hr, -dl, dd, ol, ul, figure { - margin: 0; - padding: 0; -} - - - -/** - * Basic styling - */ -body { - font-family: $base-font-family; - font-size: $base-font-size; - line-height: $base-line-height; - font-weight: 300; - color: $text-color; - background-color: $background-color; -} - - - -/** - * Set `margin-bottom` to maintain vertycal rhythm - */ -h1, h2, h3, h4, h5, h6, -p, blockquote, pre, -ul, ol, dl, figure, -%vertical-rhythm { - margin-bottom: $spacing-unit / 2; -} - - - -/** - * Images - */ -img { - max-width: 100%; - vertical-align: middle; -} - - - -/** - * Figures - */ -figure > img { - display: block; -} - -figcaption { - font-size: $small-font-size; -} - - - -/** - * Lists - */ -ul, ol { - margin-left: $spacing-unit; -} - -li { - > ul, - > ol { - margin-bottom: 0; - } -} - - - -/** - * Headings - */ -h1, h2, h3, h4, h5, h6 { - font-weight: 300; -} - - - -/** - * Links - */ -a { - color: $brand-color; - text-decoration: none; - - &:visited { - color: darken($brand-color, 15%); - } - - &:hover { - color: $text-color; - text-decoration: underline; - } -} - - - -/** - * Blockquotes - */ -blockquote { - color: $grey-colour; - border-left: 4px solid $grey-colour-light; - padding-left: $spacing-unit / 2; - font-size: 18px; - letter-spacing: -1px; - font-style: italic; - - > :last-child { - margin-bottom: 0; - } -} - - - -/** - * Code formatting - */ -pre, -code { - font-size: 15px; - border: 1px solid $grey-colour-light; - border-radius: 3px; - background-color: #eef; -} - -code { - padding: 1px 5px; -} - -pre { - padding: 8px 12px; - overflow-x: scroll; - - > code { - border: 0; - padding-right: 0; - padding-left: 0; - } -} - - - -/** - * Wrapper - */ -.wrapper { - // don't use calc(), doesn't seem to work in minified CSS. - max-width: 800px - ($spacing-unit * 2); - margin-right: auto; - margin-left: auto; - padding-right: $spacing-unit; - padding-left: $spacing-unit; - @extend %clearfix; - - @include media-query($on-laptop) { - max-width: 800px - $spacing-unit; - padding-right: $spacing-unit / 2; - padding-left: $spacing-unit / 2; - } -} - - - -/** - * Clearfix - */ -%clearfix { - - &:after { - content: ""; - display: table; - clear: both; - } -} - - - -/** - * Text styling - */ -strong, b { - font-weight: bold; -} diff --git a/themes/rusted/static/css/_bootstrap-overrides.scss b/themes/rusted/static/css/_bootstrap-overrides.scss deleted file mode 100644 index 6bee3a9..0000000 --- a/themes/rusted/static/css/_bootstrap-overrides.scss +++ /dev/null @@ -1,6 +0,0 @@ - -.btn-primary { - background-color: rgb(66, 139, 202); - border-color: rgb(53, 126, 189); - color: rgb(255, 255, 255); -} diff --git a/themes/rusted/static/css/_homepage.scss b/themes/rusted/static/css/_homepage.scss deleted file mode 100644 index 5fa0deb..0000000 --- a/themes/rusted/static/css/_homepage.scss +++ /dev/null @@ -1,12 +0,0 @@ - -.pitch { - font-size: 46px; - font-style: italic; - line-height: 1.25; - margin-bottom: 40px; - margin-top: 36px; -} - -.subtext { - -} diff --git a/themes/rusted/static/css/_layout.scss b/themes/rusted/static/css/_layout.scss deleted file mode 100644 index 8148717..0000000 --- a/themes/rusted/static/css/_layout.scss +++ /dev/null @@ -1,135 +0,0 @@ -/** - * Site header - */ -.site-header { - border-top: 5px solid $grey-colour-dark; - border-bottom: 1px solid $grey-colour-light; - min-height: 56px; - - // Positioning context for the mobile navigation icon - position: relative; -} - -.site-title { - font-size: 36px; - font-weight: bold; - line-height: 64px; - letter-spacing: -1px; - margin-bottom: 0; - - &, - &:visited { - color: $grey-colour-dark; - } -} - - -/** - * Site footer - */ -body > footer { - border-top: 1px solid $grey-colour-light; - padding: $spacing-unit 0; - margin-top: $spacing-unit; -} - - -/** - * Post list - */ - -.past-issues { - margin-top: 20px; - - li.nav-header h2 { - border-bottom: 1px solid $grey-colour-light; - } - - li { - line-height: 1.8; - } -} - -.time-prefix { - font-family: "Fira Mono", monospace; -} - -.post-title { - font-size: 20px; -} - - -/** - * Page content - */ -.page-content { - padding-top: $spacing-unit; -} - -.page-heading { - font-size: 20px; -} - -.post-list { - margin-left: 0; - list-style: none; - - > li { - margin-bottom: $spacing-unit; - } -} - -.post-meta { - font-size: $small-font-size; - color: $grey-colour; -} - -.post-link { - display: block; - font-size: 24px; -} - - - -/** - * Posts - */ - -.post { - margin-top: 32px; - border: 1px solid $grey-colour-light; - padding: 24px; - border-radius: 8px; -} - -.post-header { - margin-bottom: $spacing-unit; -} - -.post-content { - margin-bottom: $spacing-unit; - - h2 { - font-size: 32px; - - @include media-query($on-laptop) { - font-size: 28px; - } - } - - h3 { - font-size: 26px; - - @include media-query($on-laptop) { - font-size: 22px; - } - } - - h4 { - font-size: 20px; - - @include media-query($on-laptop) { - font-size: 18px; - } - } -} diff --git a/themes/rusted/static/css/main.scss b/themes/rusted/static/css/main.scss deleted file mode 100644 index 40e1ed3..0000000 --- a/themes/rusted/static/css/main.scss +++ /dev/null @@ -1,46 +0,0 @@ -@charset "utf-8"; - - -// Our variables -$base-font-family: 'Fira Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; -$base-font-size: 16px; -$small-font-size: $base-font-size * 0.875; -$base-line-height: 1.5; - -$spacing-unit: 30px; - -$text-color: #444; -$background-color: #fdfdfd; -$brand-color: #2a7ae2; - -$grey-colour: #828282; -$grey-colour-light: lighten($grey-colour, 40%); -$grey-colour-dark: darken($grey-colour, 25%); - -$on-palm: 600px; -$on-laptop: 800px; - - - -// Using media queries with like this: -// @include media-query($palm) { -// .wrapper { -// padding-right: $spacing-unit / 2; -// padding-left: $spacing-unit / 2; -// } -// } -@mixin media-query($device) { - @media screen and (max-width: $device) { - @content; - } -} - - - -// Import partials -@import - "bootstrap-overrides", - "base", - "layout", - "homepage" -; diff --git a/themes/rusted/templates/_post-title.html b/themes/rusted/templates/_post-title.html deleted file mode 100644 index 471135d..0000000 --- a/themes/rusted/templates/_post-title.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
- - - -
-
- {{ article.title }} -
-
diff --git a/themes/rusted/templates/_subscribe-form.html b/themes/rusted/templates/_subscribe-form.html deleted file mode 100644 index 9177ada..0000000 --- a/themes/rusted/templates/_subscribe-form.html +++ /dev/null @@ -1,13 +0,0 @@ -
-
-
-
- - - - -
- Receive a weekly newsletter, every Monday. Easy to unsubscribe and no spam, promise. -
-
-
diff --git a/themes/rusted/templates/archives.html b/themes/rusted/templates/archives.html deleted file mode 100644 index 17ebfb1..0000000 --- a/themes/rusted/templates/archives.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "base.html" %} - -{% block content %} -
-
-
    -

  • Past issues

    • - {% for article in articles %} -
  • - {% include "_post-title.html" %} -
    • - {% endfor %} -
-
-
-{% endblock content %} diff --git a/themes/rusted/templates/article.html b/themes/rusted/templates/article.html deleted file mode 100644 index 416f91b..0000000 --- a/themes/rusted/templates/article.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "base.html" %} - -{% block title %} -{{ article.title }} {%if article.subtitle %} - {{ article.subtitle }} {% endif %} · {{ super() }} -{% endblock title %} - -{% block head_description %} -{% if article.summary %} -{{ article.summary|striptags }} -{% endif %} -{% endblock head_description %} - -{% block meta_tags_in_head %} -{% if article.tags or article.category or article.keywords %} - -{% endif %} -{% endblock meta_tags_in_head %} - -{% block content %} - -
-

Like what you see? Subscribe!

-
- -{% include "_subscribe-form.html" %} - -
-
- {% include "_post-title.html" %} -
- -
- {{ article.content }} -
- -
-{% endblock content %} diff --git a/themes/rusted/templates/base.html b/themes/rusted/templates/base.html deleted file mode 100644 index a8f5606..0000000 --- a/themes/rusted/templates/base.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - {% if article and article.author %} - - - {% elif page and page.author %} - - - {% else %} - - - {% endif %} - - {% if SITE_DESCRIPTION %} - - {% endif %} - - {% block meta_tags_in_head %} - {% endblock meta_tags_in_head %} - - {% block title %}{{ SITENAME|striptags }}{% endblock title %} - - {% block head_links %} - {% endblock head_links %} - - - - - - {% assets filters="scss,cssmin", output="css/web-min.css", "css/main.scss" %} - - {% endassets %} - - -
-
- {{ SITENAME }} -
-
- -
-
- {% block content %} - {% endblock content %} -
-
- - - - diff --git a/themes/rusted/templates/index.html b/themes/rusted/templates/index.html deleted file mode 100644 index 43fa460..0000000 --- a/themes/rusted/templates/index.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "base.html" %} - -{% block content %} -
-
-

Handpicked Rust updates,
delivered to your inbox.

-

Stay up to date with events, learning resources, and recent developments in Rust community.

-
-
-{% include "_subscribe-form.html" %} -
-
-
    -

  • Past issues

    • - {% for article in articles %} - {% if not RECENT_ARTICLES_COUNT %} - {% set RECENT_ARTICLES_COUNT = 5 %} - {% endif %} - {% if loop.index0 < RECENT_ARTICLES_COUNT %} -
  • - {% include "_post-title.html" %} -
    • - {% endif %} - {% endfor %} -
  • - View more → -
    • -
-
-
-{% endblock content %} diff --git a/themes/rusted/templates/page.html b/themes/rusted/templates/page.html deleted file mode 100644 index a4f21f4..0000000 --- a/themes/rusted/templates/page.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "base.html" %} - -{% block title %} -{{ page.title }} {%if page.subtitle %} - {{ page.subtitle }} {% endif %} · {{ super() }} -{% endblock title %} - -{% block head_description %} -{% if page.summary %} -{{ article.summary|striptags }} -{% endif %} -{% endblock head_description %} - -{% block meta_tags_in_head %} -{% if page.tags or page.category or page.keywords %} - -{% endif %} -{% endblock meta_tags_in_head %} - -{% block content %} - -
-
-

{{ page.title }}

-
- -
- {{ page.content }} -
- -
-{% endblock content %} -- cgit v1.2.3