Merge branch 'develop'

mblode · Feb 18, 2016 · d6ae14a · d6ae14a
2 parents faa6666 + 552fdeb
commit d6ae14a
Show file tree

Hide file tree

Showing 19 changed files with 149 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v2.0.0
+## 02/18/2016
+
+1. [](#bugfix)
+    * Change the template structures
+
 # v1.1.2
 ## 02/15/2016
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Medium
-version: 1.1.2
+version: 2.0.0
 description: Medium is a simple and modern blogging theme based on Medium's design language, built for Grav CMS.
 icon: globe
 author:

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "grav-theme-medium",
-  "version": "1.1.2",
+  "version": "2.0.0",
   "authors": [
     "Matthew Blode"
   ],

diff --git a/dist/images/avatar.png b/dist/images/avatar.png
diff --git a/dist/images/favicon.ico b/dist/images/favicon.ico
diff --git a/dist/styles/app.css b/dist/styles/app.css
@@ -1307,15 +1307,15 @@ dl {
 
 blockquote {
   margin: 0 0 1rem;
-  padding: 0.5625rem 1.25rem 0 1.1875rem;
-  border-left: 2px solid #333; }
+  padding: 0;
+  border-left: none; }
   blockquote, blockquote p {
     line-height: 1.6;
     color: #333; }
 
 cite {
   display: block;
-  font-size: 0.8125rem;
+  font-size: 1rem;
   color: #808080; }
   cite:before {
     content: '\2014 \0020'; }
@@ -3849,6 +3849,9 @@ img {
 .hr--small {
   margin-top: 0; }
 
+.pad--10 {
+  padding-top: 10px; }
+
 body {
   font-size: 120%; }
 
@@ -3875,12 +3878,10 @@ h5 {
 button {
   font-family: -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", sans-serif; }
 
-blockquote {
-  font-style: italic; }
-
 pre {
   background: #efefef;
-  margin-bottom: 16px; }
+  margin-bottom: 16px;
+  padding: 5px; }
 
 date,
 .footer--text,
@@ -3903,6 +3904,39 @@ date,
   .dark:hover {
     color: #00ab6b; }
 
+blockquote > p {
+  padding: 15px;
+  border-left: 3px solid #333; }
+
+blockquote > blockquote > blockquote {
+  margin: 0; }
+  blockquote > blockquote > blockquote p {
+    padding: 15px; }
+  blockquote > blockquote > blockquote > p {
+    border-left: 3px solid #00ab6b;
+    color: #00ab6b; }
+    blockquote > blockquote > blockquote > p a {
+      color: #00ab6b;
+      text-decoration: underline; }
+  blockquote > blockquote > blockquote > blockquote > p {
+    border-left: 3px solid #ffae00;
+    color: #ffae00; }
+    blockquote > blockquote > blockquote > blockquote > p a {
+      color: #ffae00;
+      text-decoration: underline; }
+  blockquote > blockquote > blockquote > blockquote > blockquote > p {
+    border-left: 3px solid #ec5840;
+    color: #ec5840; }
+    blockquote > blockquote > blockquote > blockquote > blockquote > p a {
+      color: #ec5840;
+      text-decoration: underline; }
+  blockquote > blockquote > blockquote > blockquote > blockquote > blockquote > p {
+    border-left: 5px solid #3adb76;
+    color: #3adb76; }
+    blockquote > blockquote > blockquote > blockquote > blockquote > blockquote > p a {
+      color: #00ab6b;
+      text-decoration: underline; }
+
 .infinite-scroll {
   margin: 0; }
 
@@ -4009,7 +4043,6 @@ date,
   width: auto !important; }
 
 .profile {
-  margin-bottom: 40px;
   margin-top: 40px;
   padding: 0; }
 

diff --git a/dist/styles/app.min.css b/dist/styles/app.min.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grav-theme-medium",
-  "version": "1.1.2",
+  "version": "2.0.0",
   "description": "Medium is a simple and modern blogging theme based on Medium's design language, built for Grav CMS.",
   "main": "gulpfile.js",
   "devDependencies": {},

diff --git a/src/images/avatar.png b/src/images/avatar.png
diff --git a/src/styles/base/_defaults.scss b/src/styles/base/_defaults.scss
@@ -23,3 +23,7 @@ $value in $button-sizes {
 .hr--small {
   margin-top: 0;
 }
+
+.pad--10 {
+  padding-top: 10px;
+}
diff --git a/src/styles/base/_settings.scss b/src/styles/base/_settings.scss
@@ -117,9 +117,9 @@ $defnlist-margin-bottom: 1rem;
 $defnlist-term-weight: $global-weight-bold;
 $defnlist-term-margin-bottom: 0.3rem;
 $blockquote-color: $black;
-$blockquote-padding: rem-calc(9 20 0 19);
-$blockquote-border: 2px solid $black;
-$cite-font-size: rem-calc(13);
+$blockquote-padding: 0;
+$blockquote-border: none;
+$cite-font-size: rem-calc(16);
 $cite-color: $dark-gray;
 $keystroke-font: $font-family-monospace;
 $keystroke-color: $black;

diff --git a/src/styles/base/_typography.scss b/src/styles/base/_typography.scss
@@ -33,13 +33,10 @@ button {
   font-family: $default-font-family;
 }
 
-blockquote {
-  font-style: italic;
-}
-
 pre {
   background: $lighter-gray;
   margin-bottom: 16px;
+  padding: 5px;
 }
 
 date,
@@ -70,3 +67,61 @@ date,
     color: $primary-color;
   }
 }
+
+blockquote {
+  > p {
+    padding: 15px;
+    border-left: 3px solid $black;
+  }
+}
+
+
+blockquote > blockquote > blockquote {
+	margin: 0;
+
+	p {
+		padding: 15px;
+	}
+
+	> p {
+		border-left: 3px solid $primary-color;
+		color: $primary-color;
+
+    a {
+      color: $primary-color;
+      text-decoration: underline;
+    }
+	}
+
+	> blockquote > p {
+		// Red
+		border-left: 3px solid $warning-color;
+		color: $warning-color;
+
+    a {
+      color: $warning-color;
+      text-decoration: underline;
+    }
+	}
+
+	> blockquote > blockquote > p {
+		border-left: 3px solid $alert-color;
+		color: $alert-color;
+
+    a {
+      color: $alert-color;
+      text-decoration: underline;
+    }
+	}
+
+	> blockquote > blockquote > blockquote > p {
+		border-left: 5px solid $success-color;
+		color: $success-color;
+
+    a {
+      color: $primary-color;
+      text-decoration: underline;
+    }
+	}
+
+}
diff --git a/src/styles/partials/_profile.scss b/src/styles/partials/_profile.scss
@@ -1,5 +1,4 @@
 .profile {
-  margin-bottom: 40px;
   margin-top: 40px;
   padding: 0;
 }

diff --git a/templates/post-list.html.twig → templates/blog.html.twig b/templates/post-list.html.twig → templates/blog.html.twig
diff --git a/templates/default.html.twig b/templates/default.html.twig
@@ -0,0 +1,7 @@
+{% extends 'partials/base.html.twig' %}
+
+{% block content %}
+  <div class="columns small-12 pad--10">
+    {{ page.content }}
+  </div>
+{% endblock %}
diff --git a/templates/page.html.twig b/templates/page.html.twig
diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig
@@ -1,5 +1,5 @@
 {% set theme_config = attribute(config.themes, config.system.pages.theme) %}
-{% set avatar_url = pages.find('/about').media.images|first.url ?: url('theme://images/avatar.png') %}
+{% set avatar_url = pages.find('/about').media.images|first.url ?: url('theme://dist/images/avatar.png') %}
 {% import 'macros/dates.twig' as dates %}
 <!DOCTYPE html>
 <html class="no-js" lang="{{ grav.language.getActive ?: theme_config.default_lang }}">
@@ -39,6 +39,10 @@
         {% include 'partials/header.html.twig' %}
     {% endif %}
 
+    {% if page.header.profile %}
+        {% include 'partials/profile.html.twig' %}
+    {% endif %}
+
     <div class="row">
       {% block header %}
       {% endblock %}

diff --git a/templates/partials/profile.html.twig b/templates/partials/profile.html.twig
@@ -1,16 +1,21 @@
-<div class="columns profile">
-    <div class="columns small-8">
+<div class="row">
+  <div class="columns profile">
+      <div class="columns small-8">
+          <a href="http://twitter.com/{{ theme_config.social.twitter|trim('@') }}">
+            <h1 class="dark">{{ site.author.name }}</h1>
+          </a>
+          <p>{{ 'SITE.DESCRIPTION'|t }}</p>
+          <button class="button default hollow">
+              <a href="http://twitter.com/{{ theme_config.social.twitter|trim('@') }}"><i class="fa fa-twitter"></i> Follow</a>
+          </button>
+      </div>
+      <div class="columns small-4">
         <a href="http://twitter.com/{{ theme_config.social.twitter|trim('@') }}">
-          <h1 class="dark">{{ site.author.name }}</h1>
+            <img class="profile--avatar" src="{{ avatar_url}}">
         </a>
-        <p>{{ 'SITE.DESCRIPTION'|t }}</p>
-        <button class="button default hollow">
-            <a href="http://twitter.com/{{ theme_config.social.twitter|trim('@') }}"><i class="fa fa-twitter"></i> Follow</a>
-        </button>
-    </div>
-    <div class="columns small-4">
-      <a href="http://twitter.com/{{ theme_config.social.twitter|trim('@') }}">
-          <img class="profile--avatar" src="{{ avatar_url }}">
-      </a>
-    </div>
+      </div>
+  </div>
+  <div class="columns small-12">
+    <hr>
+  </div>
 </div>
diff --git a/templates/search_results.html.twig → templates/search.html.twig b/templates/search_results.html.twig → templates/search.html.twig