update seo, update page layouts css, update stackbit.yaml

Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem "jekyll", "~> 4.1"
+gem "jekyll"
 gem "jekyll-environment-variables"

README.md

@@ -74,15 +74,21 @@ This theme has been tested to work with Github Pages (and Github Project Pages).
 
 For example the site https://zerostaticthemes.github.io/jekyll-serif-theme would have `baseurl: "/jekyll-serif-theme/"`
 
-## Other
+## License & Credits
 
 ### Credits
 
 - Beautiful royalty free Illustrations by Icons8 - https://icons8.com/illustrations/style--pixeltrue
+- Stock images by Unsplash - https://unsplash.com/
+- Feature icons by Noun Project - https://thenounproject.com/
 
 ### License
 
-This theme is open source under the MIT license. Please be respectful 🙏🏽
+This theme is open source under the MIT license. Please be respectful 🙏🏽 Leave me as an original author in the LICENSE file if you fork or copy this theme. 
 
-* If you fork or copy this theme please leave me as an original author in the LICENSE file on line 3 where I am listed as the author.
+> Do not create ports of this theme. Do You can't re-distribute or re-sell this theme as a theme, stock, in a tool or as a template.
-* Please don't create ports of this theme without at least asking me. Yes this theme is open-source but I've had several people "port" this theme (with only minor changes) and then advertise the theme as their own. Then they don't update it and it starts to get old and break etc. Now lots of people are finding these old crappy versions of the theme.
+
+### Other Versions
+
+- [Hugo Serif Theme](https://github.com/zerostaticthemes/hugo-serif-theme) (official)
+- [Gatsby Serif Theme](https://github.com/zerostaticthemes/gatsby-serif-theme) (official)

_config.yml

@@ -2,35 +2,29 @@ baseurl: '/'
 permalink: pretty
 title: 'Jekyll Serif'
 
-google_analytics_id: ""
-
-homepage:
-  show_call_box: true
-
 logo:
   mobile: "images/logo/logo-mobile.svg"
   desktop: "images/logo/logo.svg"
   desktop_height: "36px"
 
-footer:
-  copyright_text: 'Free Jekyll theme by <a class="zerostatic" href="https://www.zerostatic.io">www.zerostatic.io</a>'
-
-seo:
-  meta_og_title: "Jekyll Serif Theme"
-  meta_og_type: "website"
-  meta_og_url: "https://jekyll-serif.netlify.app"
-  meta_og_image: "https://raw.githubusercontent.com/zerostaticthemes/jekyll-serif-theme/master/screenshots/tn.png"
-  meta_og_description: "Jekyll Serif is a modern business theme for Hugo. It contains content types for the archetypical business website. The theme is fully responsive, blazing fast and artfully illustrated."
-  meta_twitter_card: "summary"
-  meta_twitter_site: "@zerostaticio"
-  meta_twitter_creator: "@zerostaticio"
-
 collections:
   services:
     output: true
   team:
     output: true
 
+defaults:
+  - scope:
+      path: ""
+      type: "services"
+    values:
+      layout: "service"
+  - scope:
+      path: ""
+      type: "team"
+    values:
+      layout: "team"
+
 sass:
   indentWidth: 4
   style: compact # possible values: nested expanded compact compressed

_data/seo.yml

@@ -0,0 +1,4 @@
+google_analytics_id: ""  
+meta_twitter_site: "@zerostaticio"
+meta_twitter_creator: "@zerostaticio"
+copyright_text: 'Free Jekyll theme by <a class="zerostatic" href="https://www.zerostatic.io">www.zerostatic.io</a>'

_includes/google-analytics.html

@@ -11,8 +11,8 @@
       gtag('js', new Date());
       gtag('config', '{{ $gid }}');
     </script>
-    {% elsif site.google_analytics_id %}
+    {% elsif site.data.seo.google_analytics_id %}
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics_id }}"></script>
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.data.seo.google_analytics_id }}"></script>
     <script>
       window.dataLayer = window.dataLayer || [];
 
@@ -20,7 +20,7 @@
         dataLayer.push(arguments);
       }
       gtag('js', new Date());
-      gtag('config', '{{ site.google_analytics_id }}');
+      gtag('config', '{{ site.data.seo.google_analytics_id }}');
     </script>
     {% endif %}
 {% endif %}

_includes/sub-footer.html

@@ -6,8 +6,8 @@
           {% if site.data.social %}
             {% include social.html %}
           {% endif %}
-          {% if site.footer.copyright_text %}
+          {% if site.data.seo.copyright_text %}
-          <div class="copyright">{{ site.footer.copyright_text }}</div>
+          <div class="copyright">{{ site.data.seo.copyright_text }}</div>
           {% endif %}
         </div>
       </div>

_layouts/contact.html

@@ -1,7 +1,7 @@
 ---
 title: Contact
 layout: default
-bodyClass: page-contact
+bodyClass: "page-contact"
 ---
 
 <div class="container pb-6 pt-6 pt-md-10 pb-md-10">

_layouts/default.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
   <meta charset="utf-8">
   <title>{% if page.title %}{{page.title}}{% else %}{{ site.title | escape }}{% endif %}</title>
@@ -7,19 +8,20 @@
   <link rel="icon" type="image/png" href="{{ '/images/favicon-32x32.svg' | relative_url }}">
   <link href="https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;700&display=swap" rel="stylesheet">
   <link href="{{ '/assets/css/style.css' | relative_url }}" rel="stylesheet">
-  {% if page.description %}
+  
-  <meta name="description" content="{{ page.description }}" />
+  {% if page.description %}<meta name="description" content="{{ page.description }}" />{% endif %}
-  {% endif %}
+  {% if page.meta_title %}<meta property="og:title" content="{{ page.meta_title }}"/>{% else %}<meta property="og:title" content="{{ page.title }}"/>{% endif %}
-  <meta property="og:title" content="{{ site.seo.meta_og_title }}" />
+  <meta property="og:type" content="website"/>
-  <meta property="og:type" content="{{ site.seo.meta_og_type }}" />
+  <meta property="og:url" content="{{ url }}"/>
-  <meta property="og:url" content="{{ site.seo.meta_og_url }}" />
+  {% if page.image %}<meta property="og:image" content="{{ page.image | absolute_url }}"/>{% endif %}
-  <meta property="og:image" content="{{ site.seo.meta_og_image }}" />
+  {% if page.description %}<meta property="og:description" content="{{ page.description }}"/>{% endif %}
-  <meta property="og:description" content="{{ site.seo.meta_og_description }}" />
+  <meta name="twitter:card" content="summary"/>
-  <meta name="twitter:card" content="{{ site.seo.meta_twitter_card }}" />
+  {% if site.data.seo.meta_twitter_site %}<meta name="twitter:site" content="{{ site.seo.meta_twitter_site }}"/>{% endif %}
-  <meta name="twitter:site" content="{{ site.seo.meta_twitter_site }}" />
+  {% if site.data.seo.meta_twitter_creator %}<meta name="twitter:creator" content="{{ site.seo.meta_twitter_creator }}"/>{% endif %}
-  <meta name="twitter:creator" content="{{ site.seo.meta_twitter_creator }}" />
+
 </head>
-<body class='page {{page.bodyClass}}'>
+
+<body class='page {{layout.bodyClass}}'>
   {% include main-menu-mobile.html %}
   <div id="wrapper" class="wrapper">
     {% include header.html headerClass='header-extra' %}

_layouts/home.html

@@ -1,7 +1,6 @@
 ---
-title: Jekyll Serif - Jekyll Small Business Theme
 layout: default
-bodyClass: page-home
+bodyClass: "page-home"
 ---
 
 <div class="intro">
@@ -9,7 +8,7 @@ bodyClass: page-home
     <div class="row justify-content-start">
       <div class="col-12 col-md-7 col-lg-6 order-2 order-md-1">
         {{ content }}
-        {% if site.homepage.show_call_box %}
+        {% if page.show_call_box %}
           {% include call.html show_button=true %}
         {% endif %}
       </div>

_layouts/page.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+bodyClass: "page-basic"
 ---
 
 <div class="container pb-6 pt-6 pt-md-10 pb-md-10">

_layouts/service.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+bodyClass: "page-service"
 ---
 
 <div class="container pb-6 pt-6 pt-md-10 pb-md-10">

_layouts/services.html

@@ -1,6 +1,6 @@
 ---
 layout: default
-bodyClass: page-services-list
+bodyClass: "page-services"
 ---
 
 <div class="intro">

_layouts/team.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+bodyClass: "page-team"
 ---
 
 <div class="container pb-6 pt-6 pt-md-10 pb-md-10">

_layouts/teams.html

@@ -1,6 +1,6 @@
 ---
 layout: default
-bodyClass: page-team-list
+bodyClass: "page-teams"
 ---
 
 <div class="intro">

_sass/pages/_page-service.scss

@@ -1,4 +1,4 @@
-.page-services-single {
+.page-service {
   .content {
     > p {
       &:first-of-type {

_sass/pages/_page-teams.scss

@@ -0,0 +1,52 @@
+.page-teams {
+  .team-summary {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    .team-image {
+      height: 60px;
+      width: 60px;
+      margin-right: 10px;
+      border-radius: 50%;
+      overflow: hidden;
+      img {
+        width: 60px;
+      }
+    }
+    .team-meta {
+      flex: 1;
+      h2 {
+        margin: 0;
+        font-size: 22px;
+        font-weight: normal;
+      }
+      p {
+        color: $black;
+        text-transform: uppercase;
+        margin: 0;
+        font-size: 12px;
+        font-weight: 500;
+      }
+    }
+    .team-content {
+      margin-top: 20px;
+      flex: 1 0 100%;
+    }
+  }
+
+  .team-summary-large {
+    background-color: $white-offset;
+    padding: 30px;
+    border-radius: 3px;
+    .team-image {
+      height: 90px;
+      width: 90px;
+      margin-right: 20px;
+      border-radius: 50%;
+      overflow: hidden;
+      img {
+        width: 90px;
+      }
+    }
+  }
+}

_sass/pages/team/_team-summary.scss

@@ -1,50 +0,0 @@
-.team-summary {
-  display: flex;
-  flex-wrap: wrap;
-  flex-direction: row;
-  .team-image {
-    height: 60px;
-    width: 60px;
-    margin-right: 10px;
-    border-radius: 50%;
-    overflow: hidden;
-    img {
-      width: 60px;
-    }
-  }
-  .team-meta {
-    flex: 1;
-    h2 {
-      margin: 0;
-      font-size: 22px;
-      font-weight: normal;
-    }
-    p {
-      color: $black;
-      text-transform: uppercase;
-      margin: 0;
-      font-size: 12px;
-      font-weight: 500;
-    }
-  }
-  .team-content {
-    margin-top: 20px;
-    flex: 1 0 100%;
-  }
-}
-
-.team-summary-large {
-  background-color: $white-offset;
-  padding: 30px;
-  border-radius: 3px;
-  .team-image {
-    height: 90px;
-    width: 90px;
-    margin-right: 20px;
-    border-radius: 50%;
-    overflow: hidden;
-    img {
-      width: 90px;
-    }
-  }
-}

_services/accounting.md

@@ -3,7 +3,6 @@ title: "Accounting"
 date: 2018-11-18T12:33:46+10:00
 featured: true
 weight: 1
-layout: service
 ---
 
 Financial accounting (or financial accountancy) is the field of accounting concerned with the **summary, analysis and reporting** of financial transactions related to a business.

_services/business-advisory.md

@@ -3,7 +3,6 @@ title: "Business Advisory"
 date: 2018-11-28T15:14:39+10:00
 featured: true
 weight: 2
-layout: service
 ---
 
 Lorem markdownum, dictis umbrosum dextrum, Lelegeia quamquam distantes pares

_services/business-sales.md

@@ -3,7 +3,6 @@ title: "Business Sales"
 date: 2018-11-28T15:15:26+10:00
 featured: true
 weight: 3
-layout: service
 ---
 
 Cyanee nec pedicis positi. Esse et diem forte quoque et ieiunia

_services/mergers.md

@@ -3,7 +3,6 @@ title: "Mergers"
 date: 2018-11-28T15:15:34+10:00
 featured: true
 weight: 4
-layout: service
 ---
 
 Lorem markdownum aequalis strigis. Saetigeri iubeas, vultu huic alvum nondum

_team/mike-vance.md

@@ -6,7 +6,6 @@ image: 'images/team/joseph-gonzalez-399972-unsplash.jpg'
 jobtitle: 'Art Director'
 linkedinurl: ""
 weight: 3
-layout: team
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum arcu vitae elementum curabitur vitae nunc sed. Tortor at risus viverra adipiscing at in.

_team/robert-johnson.md

@@ -6,7 +6,6 @@ image: 'images/team/vince-fleming-613817-unsplash.jpg'
 jobtitle: 'Developer'
 linkedinurl: "https://www.linkedin.com/"
 weight: 3
-layout: team
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum arcu vitae elementum curabitur vitae nunc sed. Tortor at risus viverra adipiscing at in.

_team/sage-kirk.md

@@ -7,7 +7,6 @@ jobtitle: "Accounting Partner"
 linkedinurl: "https://www.linkedin.com/example2"
 promoted: true
 weight: 2
-layout: team
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum arcu vitae elementum curabitur vitae nunc sed. Tortor at risus viverra adipiscing at in.

_team/susan-shelton.md

@@ -5,7 +5,6 @@ draft: false
 image: 'images/team/cristian-newman-94319-unsplash.jpg'
 jobtitle: 'Developer'
 weight: 5
-layout: team
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum arcu vitae elementum curabitur vitae nunc sed. Tortor at risus viverra adipiscing at in.

_team/tamara-ells.md

@@ -5,7 +5,6 @@ draft: false
 image: 'images/team/michael-dam-258165-unsplash.jpg'
 jobtitle: 'UI Designer'
 weight: 4
-layout: team
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum arcu vitae elementum curabitur vitae nunc sed. Tortor at risus viverra adipiscing at in.

about.md

@@ -1,5 +1,5 @@
 ---
-title: 'About'
+title: "About"
 date: 2018-02-22T17:01:34+07:00
 layout: page
 bodyClass: page-about

assets/css/style.scss

@@ -57,9 +57,9 @@ $sub-footer-text-color: $white;
 @import 'components/social';
 
 // Pages
-@import 'pages/home';
+@import 'pages/page-home';
-@import 'pages/team/team-summary';
+@import 'pages/page-teams';
-@import 'pages/services/page-services-single';
+@import 'pages/page-service';
 
 body {
   font-size: 16px;

contact.md

@@ -1,7 +1,6 @@
 ---
 title: Contact
 layout: contact
-bodyClass: page-contact
 ---
 
 Lorem markdownum aequalis strigis. Saetigeri iubeas, vultu huic alvum nondum de obside ut laniavit arbor palmis, cum quin. Rupes vetat videndo, armigerae crimen habet Priamum nec.

index.md

@@ -5,6 +5,7 @@ description: Jekyll Serif contains content types for a typical business website.
 intro_image: "images/illustrations/pointing.svg"
 intro_image_absolute: true
 intro_image_hide_on_mobile: true
+show_call_box: true
 ---
 
 # Serif - A Jekyll Business Theme.

stackbit.yaml

@@ -25,180 +25,15 @@ models:
         hidden: true
       - type: string
         name: permalink
-        label: Permalink
-        description: 'The output path for your pages, posts, or collections.'
-        default: '/posts/:slug:output_ext'
         hidden: true
-      - type: string
-        name: google_analytics_id
-      - type: object
-        name: homepage
-        fields:
-          - type: boolean
-            name: show_call_box
-      - type: object
-        name: logo
-        fields:
-          - type: image
-            name: desktop
-            required: true
-          - type: image
-            name: mobile
-          - type: string
-            name: desktop_height
-      - type: object
-        name: footer
-        fields:
-          - type: string
-            name: copyright_text
-      - type: object
-        name: seo
-        fields:
-          - type: string
-            name: meta_description
-            label: meta_description
-          - type: string
-            name: meta_og_title
-            label: meta_og_title
-          - type: string
-            name: meta_og_type
-            label: meta_og_type
-          - type: string
-            name: meta_og_url
-            label: meta_og_url
-          - type: string
-            name: meta_og_image
-            label: meta_og_image
-          - type: string
-            name: meta_og_description
-            label: meta_og_description
-          - type: string
-            name: meta_twitter_card
-            label: meta_twitter_card
-          - type: string
-            name: meta_twitter_site
-            label: meta_twitter_site
-          - type: string
-            name: meta_twitter_creator
-            label: meta_twitter_creator
-      - type: object
-        name: collections
-        fields:
-          - type: object
-            name: services
-            fields:
-              - type: boolean
-                name: output
-              - type: string
-                name: permalink
-          - type: object
-            name: team
-            fields:
-              - type: boolean
-                name: output
-              - type: string
-                name: permalink
-      - type: object
-        name: sass
-        label: Sass
-        hidden: true
-        fields:
-          - type: number
-            name: indentWidth
-            label: Indent Width
-            description: >-
-              Used to determine the number of spaces or tabs to be used for
-              indentation.
-            default: 4
-          - type: enum
-            name: style
-            label: Output Style
-            description: Determines the output format of the final CSS style.
-            options:
-              - nested
-              - expanded
-              - compact
-              - compressed
-            default: nested
-          - type: number
-            name: precision
-            label: Precision
-            description: >-
-              Used to determine how many digits after the decimal will be
-              allowed.
-            default: 10
-      - type: list
-        name: plugins
-        label: Plugins
-        hidden: true
-      - type: list
-        name: exclude
-        label: Exclude
-        description: Exclude directories and/or files from the conversion.
-        hidden: true
-  site_menus:
-    type: object
-    label: Site Menus
-    description: >-
-      Site menus model, defines list of menus that can be specified from within
-      site configuration
-    fields:
-      - type: list
-        name: main
-        label: Main menu
-        description: List of items for Main menu
-        items:
-          type: model
-          models:
-            - site_menu_item
-      - type: list
-        name: footer
-        label: Footer menu
-        description: List of items for Footer menu
-        items:
-          type: model
-          models:
-            - site_menu_item
-  site_menu_item:
-    type: object
-    label: Site Menu Item
-    labelField: name
-    description: 'Site menu item model, defines fields for a single site menu item'
-    fields:
-      - type: string
-        name: identifier
-        label: Identifier
-        description: >-
-          The identifier of a menu item could be used as a parent menu of
-          another menu item
-      - type: string
-        name: name
-        label: Title
-        description: The title of the menu item
-        required: true
-      - type: string
-        name: url
-        label: URL
-        description: The URL the menu item links to
-        required: true
-      - type: number
-        name: weight
-        label: Weight
-        description: Position for sorting
-      - type: string
-        name: parent
-        label: Parent Menu Identifier
-        description: The parent of an entry should be the identifier of another entry.
   home:
     type: page
     label: Home
-    file: index.md
+    file: ['index.md', 'services.md', 'team.md']
-    hideContent: false
     singleInstance: true
     fields:
       - type: string
         name: title
-        label: Title
         required: true
       - type: string
         name: description
@@ -214,11 +49,19 @@ models:
         name: intro_image_hide_on_mobile
         label: Hide the intro image on mobile
         description: Hide the intro image on mobile screen sizes
+      - type: date
+        name: date
+      - type: string
+        name: bodyClass
       - type: enum
         name: layout
         options:
           - label: home
             value: home
+          - label: services
+            value: services
+          - label: teams
+            value: teams
   basicpage:
     type: page
     label: Basic Page
@@ -227,11 +70,10 @@ models:
     fields:
       - type: string
         name: title
-        label: Title
-        description: The title of the page.
       - type: date
         name: date
-        label: Date
+      - type: string
+        name: bodyClass
       - type: enum
         name: layout
         options:
@@ -239,16 +81,6 @@ models:
             value: page
           - label: contact
             value: contact
-      - type: enum
-        name: menu
-        label: Menu
-        options:
-          - label: Main Menu
-            value: main
-          - label: Footer Menu
-            value: footer
-      - type: string
-        name: bodyClass
   service:
     type: page
     label: Service
@@ -269,7 +101,6 @@ models:
         options:
           - label: service
             value: service
-  services:
     type: page
     label: Services Overview
     file: services.md
@@ -337,7 +168,6 @@ models:
         options:
           - label: team
             value: team
-  teams:
     type: page
     label: Team Overview
     file: team.md
@@ -367,3 +197,27 @@ models:
         options:
           - label: teams
             value: teams
+  contact:
+    type: data
+    label: Contact Details
+    file: contact.yml
+    fields:
+      - type: string
+        name: email
+      - type: string
+        name: phone
+      - type: string
+        name: contact_button_link  
+  seo:
+    type: data
+    label: SEO
+    file: seo.yml
+    fields:
+      - type: string
+        name: google_analytics_id
+      - type: string
+        name: meta_twitter_site
+      - type: string
+        name: meta_twitter_creator
+      - type: string
+        name: copyright_text

team.md

@@ -1,7 +1,7 @@
 ---
 title: Team
 layout: teams
-permalink: /team/
+permalink: "/team/"
 intro_image_absolute: true
 intro_image_hide_on_mobile: false
 ---