Merge branch 'release/1.0.0'

pagekit · Apr 13, 2016 · 722a168 · 722a168
2 parents 3c9a3af + 4966256
commit 722a168
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.0 (April 13, 2016)
+
+### Changed
+- Changed article divider
+
 ## 0.11.1 (April 7, 2016)
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "pagekit/theme-one",
     "type": "pagekit-theme",
-    "version": "0.11.1",
+    "version": "1.0.0",
     "title": "One",
     "description": "Pagekit's default theme.",
     "license": "MIT",

diff --git a/image.jpg b/image.jpg
diff --git a/less/uikit/article.less b/less/uikit/article.less
@@ -64,7 +64,18 @@
 
 .hook-article-misc() {
 
-    .uk-article-title a:hover { border-bottom: 1px solid @global-color; }
+    .uk-article + .uk-article {
+        padding-top: @article-margin-top;
+        border-top: 1px solid @global-border;
+    }
+
+    /* Tablet and bigger */
+    @media (min-width: @breakpoint-medium) {
+        .uk-article + .uk-article {
+            margin-top: (@article-margin-top + 50px);
+            padding-top: (@article-margin-top + 50px);
+        }
+    }
 
     .uk-article .uk-subnav a:hover,
     .uk-article .uk-subnav a:focus { text-decoration: underline; }

diff --git a/views/blog/posts.php b/views/blog/posts.php
@@ -18,7 +18,7 @@
         <div class="uk-margin"><?= $post->excerpt ?: $post->content ?></div>
 
         <div class="uk-margin-large-top">
-            <ul class="uk-subnav">
+            <ul class="uk-subnav uk-margin-bottom-remove">
 
                 <?php if (isset($post->readmore) && $post->readmore || $post->excerpt) : ?>
                 <li><a href="<?= $view->url('@blog/id', ['id' => $post->id]) ?>"><?= __('Read more') ?></a></li>