resolving conflicts ☑️

godofredoninja · Dec 12, 2019 · 74c0b77 · 74c0b77
2 parents a84e479 + 7f7fc10
commit 74c0b77
Show file tree

Hide file tree

Showing 49 changed files with 180 additions and 131 deletions.
diff --git a/README.md b/README.md
@@ -12,14 +12,16 @@ It is available for free so you can use on your site. If you have any suggestion
 
 [![donate](./donate.gif)](https://www.paypal.me/godofredoninja)
 
-If you still don't have a **Hosting for your Ghost**. You can use [Digital Ocean](https://m.do.co/c/710a27a3b3de) using my [reference link]((https://m.do.co/c/710a27a3b3de)) and you will get **50 dollars** to use in [Digital Ocean]((https://m.do.co/c/710a27a3b3de)). This way you will also be helping me.
+:arrow_right: If you still don't have a **Hosting for your Ghost**. Use [Digital Ocean](https://m.do.co/c/710a27a3b3de) using my [referral link]((https://m.do.co/c/710a27a3b3de)) and you will get free a **$50 credit** to use in [Digital Ocean]((https://m.do.co/c/710a27a3b3de)). This way you will also be helping me.
 
 ![mapache theme for ghost](./screenshot.png)
 
 ## Featured
 
 - Support for different [languages](http://themes.ghost.org/docs/i18n#section-how-to-add-any-language) (en - es - de - ko - fr)
 - Light Mode / Dark Mode
+- First navigation menu for the header of the page
+- Second navigation menu for the footer of the page
 - 404 error page
 - Pagination Infinite Scroll
 - Instagram Feed in footer of Post
@@ -611,6 +613,7 @@ routes:
     limit: 10
     template: godo-podcast
 ```
+
 - In an `HTML` block in your ghost editor add this code for your content.
 
 ```html

diff --git a/amp.hbs b/amp.hbs
@@ -11,7 +11,7 @@
     {{amp_ghost_head}}
 
     {{!-- Google Fonst --}}
-    <link href="https://fonts.googleapis.com/css?family=Merriweather:400,700|Roboto:400,500,700&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Domine|Rubik:400,500,700&display=swap" rel="stylesheet">
 
     {{!-- Only For dev --}}
     {{!-- <link rel="stylesheet" type="text/css" href="{{asset "styles/amp.css"}}"/>

diff --git a/assets/scripts/main.js b/assets/scripts/main.js
diff --git a/assets/scripts/pagination.js b/assets/scripts/pagination.js
diff --git a/assets/scripts/prismjs.js b/assets/scripts/prismjs.js
diff --git a/assets/scripts/search.js b/assets/scripts/search.js
diff --git a/assets/styles/amp.css b/assets/styles/amp.css
diff --git a/assets/styles/main.css b/assets/styles/main.css
diff --git a/assets/styles/signup.css b/assets/styles/signup.css
diff --git a/author.hbs b/author.hbs
@@ -40,10 +40,8 @@
         </div>
     </div>
 
-    <div class="title-line u-flexCenter u-flexContentCenter u-marginBottom30">
-        <div class="u-flexCenter">
-            <span class="u-textUppercase u-oblique">{{t "Stories by"}} {{name}}</span>
-        </div>
+    <div class="title-line u-marginBottom30">
+            <span class="u-oblique">{{t "Stories by"}} {{name}}</span>
     </div>
 </section>
 

diff --git a/custom-archive-newsletter.hbs b/custom-archive-newsletter.hbs
@@ -12,6 +12,7 @@
         src="{{asset "images/crystal-mountain.png"}}"
         srcset="{{asset "images/crystal-mountain.png"}}, {{asset "images/[email protected]"}} 2x"
         style="z-index: -1"
+        alt=""
     />
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ @@
             src="{{asset "images/crystal-mountain.png"}}"
             srcset="{{asset "images/crystal-mountain.png"}}, {{asset "images/[email protected]"}} 2x"
             style="z-index: -1"
+            alt=""
         />
     </div>
@@ Expand Down @@