yann/liebling
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolve merge conflict

Browse source
This commit is contained in:
Eduardo 2019-05-16 23:27:13 +02:00
parent af1b768721 fda254561f
commit 4e1a482d7f
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/css/app.css
View file

File diff suppressed because one or more lines are too long

2
package.json
View file

@ -54,5 +54,5 @@
"desktop": "assets/screenshot-desktop.jpg", "desktop": "assets/screenshot-desktop.jpg",
"mobile": "assets/screenshot-mobile.jpg" "mobile": "assets/screenshot-mobile.jpg"
}, },
"version": "0.1.5" "version": "0.1.4"
} }

4
page-authors.hbs
View file

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

4
page.hbs
View file

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

6
post.hbs
View file

@ -25,7 +25,7 @@ into the {body} of the default.hbs template --}}
{{#if @labs.subscribers}} {{#if @labs.subscribers}}
<div class="l-post-content has-subscribe-form js-progress-content"> <div class="l-post-content has-subscribe-form js-progress-content">
{{else}} {{else}}
<div class="l-post-content js-progress-content"></div> <div class="l-post-content js-progress-content">
{{/if}} {{/if}}
<header class="m-heading"> <header class="m-heading">
<h1 class="m-heading__title in-post">{{title}}</h1> <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="pos-relative js-post-content">
<div class="m-share"> <div class="m-share">
<div class="m-share__content js-sticky"> <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> <span class="icon-facebook"></span>
</a> </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> <span class="icon-twitter"></span>
</a> </a>
<button class="m-icon-button filled in-share progress js-scrolltop" aria-label="Scroll to top"> <button class="m-icon-button filled in-share progress js-scrolltop" aria-label="Scroll to top">