2.0.1

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.0.1
+## 02/18/2016
+
+1. [](#bugfix)
+    * Fix sidebar
+
 # v2.0.0
 ## 02/18/2016
 

blueprints.yaml

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

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "grav-theme-medium",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "authors": [
     "Matthew Blode"
   ],

dist/styles/app.css

@@ -3938,37 +3938,32 @@ blockquote > blockquote > blockquote {
       text-decoration: underline; }
 
 .infinite-scroll {
-  margin: 0; }
+  padding: 0; }
 
-@media screen and (min-width: 64em) {
+@media screen and (min-width: 40em) {
   .infinite-scroll {
-    margin-right: 350px; } }
+    padding-left: 15px;
+    padding-right: 15px; } }
 
 .post-list {
-  margin-top: 10px;
-  margin-bottom: 10px;
   background-color: #fff;
   border: 1px solid rgba(0, 0, 0, 0.0392157);
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.025), 0 1px 4px rgba(0, 0, 0, 0.03);
-  border-radius: 3px; }
+  border-radius: 3px;
+  margin-bottom: 15px;
+  margin-top: 5px; }
+  .post-list a {
+    color: #333;
+    display: block; }
+  .post-list img {
+    display: block;
+    margin-bottom: 10px;
+    margin-top: 10px;
+    max-height: 240px;
+    width: auto; }
 
 .post-list--data {
-  padding: 15px 0; }
-
-@media screen and (min-width: 40em) {
-  .post-list--data {
-    padding: 15px; } }
-
-.post-list a {
-  color: #333;
-  display: block; }
-
-.post-list img {
-  display: block;
-  margin-bottom: 10px;
-  margin-top: 10px;
-  max-height: 240px;
-  width: auto; }
+  padding: 15px; }
 
 .post {
   margin-top: 20px; }
@@ -4052,15 +4047,6 @@ blockquote > blockquote > blockquote {
   height: 100px;
   width: 100px; }
 
-.sidebar {
-  width: 350px;
-  display: inline-block;
-  padding-left: 15px; }
-
-.sidebar--inner {
-  padding-left: 15px;
-  padding-right: 15px; }
-
 .sidebar--heading {
   margin-top: 40px;
   font-family: -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", sans-serif;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "grav-theme-medium",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Medium is a simple and modern blogging theme based on Medium's design language, built for Grav CMS.",
   "main": "gulpfile.js",
   "devDependencies": {},

src/styles/app.scss

@@ -47,7 +47,7 @@
 @import 'base/defaults';
 @import 'base/typography';
 
-@import 'templates/post-list';
+@import 'templates/blog';
 @import 'templates/post';
 
 @import 'partials/navigation';

src/styles/partials/_sidebar.scss

@@ -1,14 +1,3 @@
-.sidebar {
-  width: 350px;
-  display: inline-block;
-  padding-left: 15px;
-}
-
-.sidebar--inner {
-  padding-left: 15px;
-  padding-right: 15px;
-}
-
 .sidebar--heading {
   margin-top: 40px;
   font-family: $default-font-family;

src/styles/templates/_blog.scss

@@ -0,0 +1,36 @@
+.infinite-scroll {
+  padding: 0;
+}
+
+@include breakpoint(medium) {
+  .infinite-scroll {
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+}
+
+.post-list {
+  background-color: $white;
+  border: 1px solid rgba(0, 0, 0, .0392157);
+  box-shadow: 0 1px 4px rgba(0, 0, 0, .025), 0 1px 4px rgba(0, 0, 0, .03);
+  border-radius: 3px;
+  margin-bottom: 15px;
+  margin-top: 5px;
+
+  a {
+    color: $black;
+    display: block;
+  }
+
+  img {
+    display: block;
+    margin-bottom: 10px;
+    margin-top: 10px;
+    max-height: 240px;
+    width: auto;
+  }
+}
+
+.post-list--data {
+  padding: 15px;
+}

templates/blog.html.twig

@@ -26,7 +26,7 @@
     {% endblock %}
 
     {% block content %}
-      <div class="infinite-scroll">
+      <div class="infinite-scroll columns small-12 large-8">
         {% for post in collection %}
           {% include 'partials/post-item.html.twig' %}
         {% endfor %}
@@ -35,12 +35,15 @@
         {% endif %}
       </div>
 
-      <div class="sidebar show-for-large">
+
+
+      <div class="sidebar columns large-4 show-for-large">
         <div class="sidebar--inner">
           {% include 'partials/sidebar.html.twig' with {'blog':page} %}
         </div>
       </div>
 
+
     {% endblock %}
 
 {% endembed %}

templates/page.html.twig

@@ -0,0 +1,15 @@
+{% extends 'partials/base.html.twig' %}
+
+{% block header %}
+    {% if page.header.profile %}
+        {% include 'partials/profile.html.twig' %}
+    {% else %}
+        {{ parent() }}
+    {% endif %}
+{% endblock %}
+
+{% block content %}
+  <div class="columns small-12">
+    {{ page.content }}
+  </div>
+{% endblock %}

templates/partials/post-item.html.twig

@@ -1,4 +1,4 @@
-<div class="post-list columns small-12">
+<div class="post-list">
   <div class="post-list--data">
       <a href="{{ post.url }}"><h1 class="dark">{{ post.title }}</h1></a>
       <a href="{{ post.url }}"><date>{{ post.date|nicetime(true) }}</date></a>

templates/search_results.html.twig

@@ -0,0 +1,19 @@
+{% extends 'partials/simplesearch_base.html.twig' %}
+
+{% block content %}
+  <div class="column small-12">
+    <div class="content-padding simplesearch">
+    <h1 class="search-header">Search Results</h1>
+    <div class="center">
+        {% include 'partials/simplesearch_searchbox.html.twig' %}
+
+    </div>
+
+
+    <p>Query: <strong>{{ query }}</strong> found {{ search_results.count }} {{ 'result'|pluralize(search_results.count) }}</p>
+    {% for page in search_results %}
+        {% include 'partials/simplesearch_item.html.twig' with {'page':page} %}
+    {% endfor %}
+    </div>
+  </div>
+{% endblock %}