Skip to content

Commit

Permalink
Solving conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
GodoFredo committed Sep 10, 2018
2 parents 8387851 + 5232a1e commit 07b46f4
Show file tree
Hide file tree
Showing 31 changed files with 82 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ var followSocialMedia = {
'pinterest':'https://...',
'telegram':'https://...',
'discord':'https://...',
'feed':'https://...',
'rss':'https://...',
};
/* 02. Instagram - Optional
Expand Down
4 changes: 2 additions & 2 deletions assets/scripts/main.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/styles/amp.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/styles/main.css
View file

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion author.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@

{{/author}}

{{!-- Ad --}}
{{> "ad/ad-author-tag-top"}}

<section class="extreme-container">
{{!-- The tag below includes the post loop - partials/loop.hbs --}}
{{>"loop"}}

</section>

{{!-- Ad --}}
{{> "ad/ad-author-tag-footer"}}
3 changes: 3 additions & 0 deletions custom-post-full-header.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{{!-- Layout --}}
{{!< default }}

{{!-- Ad --}}
{{> "ad/ad-post-header"}}

<section class="extreme-container u-marginTop30">
{{!-- Article Header - partials/article/article-header.hbs --}}
{{> "article/article-header"}}
Expand Down
3 changes: 3 additions & 0 deletions custom-post-image-single.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
</div>
</div>

{{!-- Ad --}}
{{> "ad/ad-post-header"}}

<section class="post u-maxWidth740 u-container u-marginAuto u-marginTop30 u-marginBottom40">

{{!-- Article Author - partials/article/article-author.hbs --}}
Expand Down
3 changes: 3 additions & 0 deletions custom-post-image.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
</div>
</div>

{{!-- Ad --}}
{{> "ad/ad-post-header"}}

<section class="post extreme-container u-marginTop30 u-marginBottom40">
<div class="row">
<div class="col-left">
Expand Down
3 changes: 3 additions & 0 deletions custom-post-not-image.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{{!-- Layout --}}
{{!< default }}

{{!-- Ad --}}
{{> "ad/ad-post-header"}}

<section class="post extreme-container u-marginTop30 u-marginBottom40">
<div class="row">
<div class="col-left">
Expand Down
4 changes: 3 additions & 1 deletion custom-post-single.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

{{#contentFor "mapache_class_body"}}is-article-single{{/contentFor}}

{{!-- Ad --}}
{{> "ad/ad-post-header"}}

<div class="u-container u-maxWidth740 u-marginTop30">
{{!-- Title & Excerpt - partials/article/article-header.hbs --}}
{{> "article/article-header"}}
Expand All @@ -11,7 +14,6 @@
{{> "article/article-author"}}
</div>


{{#post}}
{{!-- Image post - Default Post --}}
{{#if feature_image}}
Expand Down
3 changes: 3 additions & 0 deletions custom-post-video.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
</div>
</div>

{{!-- Ad --}}
{{> "ad/ad-post-header"}}

<section class="post extreme-container u-paddingTop30 u-marginBottom40">
<div class="row">
<div class="col-left">
Expand Down
12 changes: 10 additions & 2 deletions default.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">

{{!-- Styles'n'Scripts --}}
<link rel="stylesheet" type="text/css" href="{{asset "styles/main.css"}}"/>
{{!-- <link rel="stylesheet" type="text/css" href="{{asset "styles/main.css"}}"/> --}}

{{!-- All Styles Compress --}}
<style>{{> "styles"}}</style>

{{!-- Ghost outputs important style and meta data with this tag --}}
{{ghost_head}}
</head>
<body class="{{#is "post"}}is-article{{/is}} {{{block "mapache_class_body"}}}" data-page="{{@blog.url}}">
<body class="{{#is "post"}}is-article{{/is}} {{{block "mapache_class_body"}}}">

{{!-- Header Content --}}
{{>"header"}}
Expand Down Expand Up @@ -51,6 +54,11 @@
{{!-- Ghost outputs important scripts and data with this tag - it should always be the very last thing before the closing body tag --}}
{{ghost_foot}}

<script>
var maxPages = parseInt('{{pagination.pages}}');
var blogUrl = '{{@blog.url}}';
</script>

{{!-- The main JavaScript file for Casper --}}
<script src="{{asset "scripts/main.js"}}"></script>

Expand Down
6 changes: 6 additions & 0 deletions home.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

</div>

{{!-- Ad --}}
{{> "ad/ad-home-top"}}

<section class="extreme-container">
<div class="row u-marginBottom40">

Expand All @@ -29,3 +32,6 @@
{{!-- show 4 articles - partials/home/home-story-list.hbs --}}
{{> "home/home-story-list"}}
</section>

{{!-- Ad --}}
{{> "ad/ad-home-footer"}}
6 changes: 6 additions & 0 deletions index.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
{{> "home/home-personal-cover"}}
{{/is}}

{{!-- Ad --}}
{{> "ad/ad-home-top"}}

<section id="main-content" class="extreme-container u-marginTop20">
{{> "loop"}}
</section>

{{!-- Ad --}}
{{> "ad/ad-home-footer"}}
5 changes: 2 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
"name": "mapache-godofredoninja",
"description": "mapache theme for ghost by @GodoFredoNinja",
"demo": "https://godofredo.ninja",
"version": "3.0.1",
"version": "3.0.2",
"engines": {
"ghost": ">=2.0.0",
"node": ">= 6.9.4"
"ghost": ">=2.0.0"
},
"license": "CC BY-NC-SA 4.0",
"author": {
Expand Down
1 change: 1 addition & 0 deletions partials/ad/ad-amp-footer.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="amp-ad u-textAlignCenter"> {{!-- Add your ad code here --}} </div>
1 change: 1 addition & 0 deletions partials/ad/ad-amp-header.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="amp-ad u-textAlignCenter"> {{!-- Add your ad code here --}} </div>
1 change: 1 addition & 0 deletions partials/ad/ad-amp-medium.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="amp-ad u-textAlignCenter"> {{!-- Add your ad code here --}} </div>
1 change: 1 addition & 0 deletions partials/ad/ad-author-tag-footer.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="mapache-ad-author-tag-footer u-textAlignCenter"> {{!-- Add your ad code here --}} </div>
1 change: 1 addition & 0 deletions partials/ad/ad-author-tag-top.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="mapache-ad-author-tag-top u-textAlignCenter"> {{!-- Add your ad code here --}} </div>
1 change: 1 addition & 0 deletions partials/ad/ad-home-footer.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="mapache-ad-home-footer u-textAlignCenter"> {{!-- Add your ad code here --}} </div>
1 change: 1 addition & 0 deletions partials/ad/ad-home-top.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="mapache-ad-home-top u-textAlignCenter"> {{!-- Add your ad code here --}} </div>
1 change: 1 addition & 0 deletions partials/ad/ad-post-footer.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="mapache-ad mapache-ad-post-footer u-textAlignCenter"> {{!-- Add your ad code here --}} </div>
1 change: 1 addition & 0 deletions partials/ad/ad-post-header.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="mapache-ad-post-header u-textAlignCenter"> {{!-- Add your ad code here --}} </div>
1 change: 1 addition & 0 deletions partials/ad/ad-sidebar-medium.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="mapache-ad u-textAlignCenter sidebar-items u-marginBottom30"> {{!-- Add your ad code here --}} </div>
10 changes: 6 additions & 4 deletions partials/article/article-related.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{{!-- Article related --}}
{{#get "posts" limit="6" filter="tags:[{{post.tags}}]+id:-{{post.id}}" include="tags" as |post_related|}}

{{#if post_related}}

<section class="post-related u-backgroundWhite u-paddingTop30 u-paddingBottom20 u-overflowHidden">

{{!-- Ad --}}
{{> "ad/ad-post-footer"}}

{{#if post_related}}
<div class="extreme-container">
<div class="row story-card">

Expand All @@ -17,8 +20,7 @@

</div>
</div>
</section>

{{/if}}

</section>
{{/get}}
5 changes: 0 additions & 5 deletions partials/helper/helper-pagination.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@
{{else}}
{{"pagination"}}
{{/is}}


{{#if pagination.pages}}
{{#contentFor "scripts"}} <script>var maxPages = parseInt('{{pagination.pages}}');</script> {{/contentFor}}
{{/if}}
3 changes: 3 additions & 0 deletions partials/sidebar.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
{{/get}}
{{/is}}

{{!-- Ad --}}
{{> "ad/ad-sidebar-medium"}}

{{!-- Wig¡dget Sybscribe --}}
{{> "widget/widget-subscribers"}}

Expand Down
1 change: 1 addition & 0 deletions partials/styles.hbs
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions post.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{{!-- Layout --}}
{{!< default }}

{{!-- Ad --}}
{{> "ad/ad-post-header"}}

<section class="post extreme-container u-marginTop30 u-marginBottom40">
<div class="row">
<div class="col-left">
Expand Down
6 changes: 6 additions & 0 deletions tag.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,14 @@
</section>
{{/tag}}

{{!-- Ad --}}
{{> "ad/ad-author-tag-top"}}

{{!-- Post Grid --}}
<section class="extreme-container">
{{!-- lates post --}}
{{> "loop"}}
</section>

{{!-- Ad --}}
{{> "ad/ad-author-tag-footer"}}

0 comments on commit 07b46f4

Please sign in to comment.