Resolve merge conflict

eddiesigner · May 16, 2019 · 4e1a482 · 4e1a482
2 parents af1b768 + fda2545
commit 4e1a482
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/assets/css/app.css b/assets/css/app.css
diff --git a/package.json b/package.json
@@ -54,5 +54,5 @@
     "desktop": "assets/screenshot-desktop.jpg",
     "mobile": "assets/screenshot-mobile.jpg"
   },
-  "version": "0.1.5"
+  "version": "0.1.4"
 }
diff --git a/page-authors.hbs b/page-authors.hbs
@@ -15,8 +15,8 @@ into the {body} of the default.hbs template --}}
     {{> hero background=feature_image}}
     <div class="m-hero__content" data-aos="fade-down">
       <h1 class="m-hero-title bigger">{{title}}</h1>
-      {{#if excerpt}}
-      <p class="m-hero-description">{{excerpt}}</p>
+      {{#if custom_excerpt}}
+      <p class="m-hero-description">{{custom_excerpt}}</p>
       {{/if}}
     </div>
     </header>

diff --git a/page.hbs b/page.hbs
@@ -15,8 +15,8 @@ into the {body} of the default.hbs template --}}
     {{> hero background=feature_image}}
     <div class="m-hero__content" data-aos="fade-down">
       <h1 class="m-hero-title bigger">{{title}}</h1>
-      {{#if excerpt}}
-      <p class="m-hero-description">{{excerpt}}</p>
+      {{#if custom_excerpt}}
+      <p class="m-hero-description">{{custom_excerpt}}</p>
       {{/if}}
     </div>
     </header>

diff --git a/post.hbs b/post.hbs
@@ -25,7 +25,7 @@ into the {body} of the default.hbs template --}}
           {{#if @labs.subscribers}}
           <div class="l-post-content has-subscribe-form js-progress-content">
           {{else}}
-          <div class="l-post-content js-progress-content"></div>
+          <div class="l-post-content js-progress-content">
           {{/if}}
             <header class="m-heading">
               <h1 class="m-heading__title in-post">{{title}}</h1>
@@ -40,10 +40,10 @@ into the {body} of the default.hbs template --}}
             <div class="pos-relative js-post-content">
               <div class="m-share">
                 <div class="m-share__content js-sticky">
-                  <a href="#" class="m-icon-button filled in-share" aria-label="Facebook">
+                  <a href="https://www.facebook.com/sharer/sharer.php?u={{url absolute='true'}}" class="m-icon-button filled in-share" target="_blank" rel="noopener" aria-label="Facebook">
                     <span class="icon-facebook"></span>
                   </a>
-                  <a href="#" class="m-icon-button filled in-share" aria-label="Twitter">
+                  <a href="https://twitter.com/intent/tweet?text={{encode title}}&url={{url absolute='true'}}" class="m-icon-button filled in-share" target="_blank" rel="noopener" aria-label="Twitter">
                     <span class="icon-twitter"></span>
                   </a>
                   <button class="m-icon-button filled in-share progress js-scrolltop" aria-label="Scroll to top">