diff --git a/_config.yml b/_config.yml index bbed00a..ad4e4b4 100755 --- a/_config.yml +++ b/_config.yml @@ -4,8 +4,11 @@ title: 'Jekyll Serif' logo: mobile: "images/logo/logo-mobile.svg" + mobile_height: "32px" + mobile_width: "32px" desktop: "images/logo/logo.svg" - desktop_height: "36px" + desktop_height: "32px" + desktop_width: "120px" collections: services: @@ -27,7 +30,7 @@ defaults: sass: indentWidth: 4 - style: compact # possible values: nested expanded compact compressed + style: compressed # possible values: nested expanded compact compressed precision: 10 plugins: @@ -43,4 +46,4 @@ exclude: - vendor/ruby/ - LICENSE.md - LICENSE - - README.md \ No newline at end of file + - README.md diff --git a/_data/features.json b/_data/features.json index 6a0dd09..96b347d 100644 --- a/_data/features.json +++ b/_data/features.json @@ -2,16 +2,28 @@ { "title": "Free Consultation", "description": "New clients receive an obligation free consultation.", - "image": "images/features/noun_branding_1885335.svg" + "image": { + "url": "images/features/noun_branding_1885335.svg", + "width": 80, + "height": 80 + } }, { "title": "Certified Accountants", "description": "All members of our team are certified accountants.", - "image": "images/features/noun_The Process_1885341.svg" + "image": { + "url": "images/features/noun_The Process_1885341.svg", + "width": 80, + "height": 80 + } }, { "title": "Tax Compliance", "description": "We stay up to date on the latest changes to the tax code.", - "image": "images/features/noun_3d modeling_1885342.svg" + "image": { + "url": "images/features/noun_3d modeling_1885342.svg", + "width": 80, + "height": 80 + } } ] diff --git a/_includes/footer.html b/_includes/footer.html index 3cf4d09..dfb091c 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -3,7 +3,7 @@
-

{{site.title}}

+

{{site.title}}

    {% assign footermenu = site.data.menus.footer | sort: 'weight' %} {% for item in footermenu %} @@ -16,4 +16,4 @@
- \ No newline at end of file + diff --git a/_includes/header.html b/_includes/header.html index c9ec3bb..698320e 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,12 +1,12 @@
- {{ site.title }} + {{ site.title }}
{% include main-menu.html %} {% include hamburger.html %}
-
\ No newline at end of file + diff --git a/_layouts/default.html b/_layouts/default.html index 08f63cf..4ef991b 100755 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,7 +6,12 @@ {% if page.title %}{{page.title}}{% else %}{{ site.title | escape }}{% endif %} + + + + + {% if page.description %}{% endif %} @@ -29,7 +34,7 @@ {% include footer.html %} {% include sub-footer.html %} - + {% include google-analytics.html %} diff --git a/_layouts/home.html b/_layouts/home.html index 89ff970..f324c2e 100755 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -14,7 +14,7 @@ bodyClass: "page-home" {% if page.intro_image %}
- {{ + {{ page.title }}
{% endif %} @@ -54,7 +54,7 @@ bodyClass: "page-home"
{% if feature.image %} -
{{ feature.title }} logo
+
{{ feature.title }} logo
{% endif %}

{{ feature.title }}

{{ feature.description }}
diff --git a/_layouts/teams.html b/_layouts/teams.html index 67d06e2..397d502 100644 --- a/_layouts/teams.html +++ b/_layouts/teams.html @@ -26,14 +26,14 @@ bodyClass: "page-teams"
{% if team.image %}
- {{ team.title }} + {{ team.title }}
{% endif %}

{{ team.title }}

{{ team.jobtitle }}

{% if team.linkedinurl %} - LinkedIn + LinkedIn {% endif %}
{{ team.content | truncate: 120 }}
@@ -48,7 +48,7 @@ bodyClass: "page-teams"
{% if team.image %}
- {{ team.title }} + {{ team.title }}
{% endif %}
diff --git a/_sass/components/_fonts.scss b/_sass/components/_fonts.scss new file mode 100644 index 0000000..7eba470 --- /dev/null +++ b/_sass/components/_fonts.scss @@ -0,0 +1,7 @@ +@font-face { + font-family: 'Playfair Display'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: local(''), url('../fonts/playfair-display.woff2') format('woff2'); +} diff --git a/_sass/components/_type.scss b/_sass/components/_type.scss index 050b1e1..548352e 100644 --- a/_sass/components/_type.scss +++ b/_sass/components/_type.scss @@ -1,5 +1,5 @@ a { - color: $primary; + color: $primary-dark; } p { line-height: 26px; diff --git a/_team/mike-vance.md b/_team/mike-vance.md index aa131be..5728cd9 100644 --- a/_team/mike-vance.md +++ b/_team/mike-vance.md @@ -1,9 +1,9 @@ --- -title: 'Mike Vance' +title: "Mike Vance" date: 2018-12-20T13:44:30+10:00 draft: false -image: 'images/team/joseph-gonzalez-399972-unsplash.jpg' -jobtitle: 'Art Director' +image: "images/team/joseph-gonzalez-399972-unsplash.jpg" +jobtitle: "Art Director" linkedinurl: "" weight: 3 --- diff --git a/_team/robert-johnson.md b/_team/robert-johnson.md index 5f8b410..5784e49 100644 --- a/_team/robert-johnson.md +++ b/_team/robert-johnson.md @@ -1,9 +1,9 @@ --- -title: 'Robert Johnson' +title: "Robert Johnson" date: 2018-12-20T13:44:23+10:00 draft: false -image: 'images/team/vince-fleming-613817-unsplash.jpg' -jobtitle: 'Developer' +image: "images/team/vince-fleming-613817-unsplash.jpg" +jobtitle: "Developer" linkedinurl: "https://www.linkedin.com/" weight: 3 --- diff --git a/_team/susan-shelton.md b/_team/susan-shelton.md index 8df0f5c..46c62cd 100644 --- a/_team/susan-shelton.md +++ b/_team/susan-shelton.md @@ -1,9 +1,9 @@ --- -title: 'Susan Shelton' +title: "Susan Shelton" date: 2018-12-20T13:45:06+10:00 draft: false -image: 'images/team/cristian-newman-94319-unsplash.jpg' -jobtitle: 'Developer' +image: "images/team/cristian-newman-94319-unsplash.jpg" +jobtitle: "Developer" weight: 5 --- diff --git a/_team/tamara-ells.md b/_team/tamara-ells.md index bfc6352..70bed81 100644 --- a/_team/tamara-ells.md +++ b/_team/tamara-ells.md @@ -1,9 +1,9 @@ --- -title: 'Tamara Ells' +title: "Tamara Ells" date: 2018-12-20T13:44:55+10:00 draft: false -image: 'images/team/michael-dam-258165-unsplash.jpg' -jobtitle: 'UI Designer' +image: "images/team/michael-dam-258165-unsplash.jpg" +jobtitle: "UI Designer" weight: 4 --- diff --git a/about.md b/about.md index 1604cbb..613b0b7 100644 --- a/about.md +++ b/about.md @@ -1,7 +1,7 @@ --- -title: "About" -date: 2018-02-22T17:01:34+07:00 +title: About layout: page +description: About bodyClass: page-about --- diff --git a/assets/css/style.scss b/assets/css/style.scss old mode 100755 new mode 100644 index e696ae9..fe5739c --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -3,12 +3,13 @@ --- // Colors -$primary: #E5261F; +$primary: #e5261f; +$primary-dark: #a01b16; $secondary: #f88379; $black: #2f2f41; $white: #ffffff; $white-offset: #fff6f8; -$steel: #5C5A5A; +$steel: #5c5a5a; // Links $link-color: $primary; @@ -18,7 +19,7 @@ $link-hover-decoration: underline; // Fonts $font-family-base: Helvetica, Arial, sans-serif, -apple-system; -$font-family-heading: 'Playfair Display', serif, -apple-system; +$font-family-heading: "Playfair Display", serif, -apple-system; // Footer $footer-background-color: $primary; @@ -27,39 +28,39 @@ $sub-footer-background-color: darken($primary, 10%); $sub-footer-text-color: $white; // Bootstrap -@import 'bootstrap-variables'; -@import 'bootstrap/bootstrap-reboot'; -@import 'bootstrap/bootstrap-grid'; +@import "bootstrap-variables"; +@import "bootstrap/bootstrap-reboot"; +@import "bootstrap/bootstrap-grid"; // @import 'bootstrap/bootstrap'; // Uncomment this line to import the entire Bootstrap library - // Libraries -@import 'libraries/hamburgers/hamburgers'; +@import "libraries/hamburgers/hamburgers"; // Components -@import 'components/type'; -@import 'components/page'; -@import 'components/header'; -@import 'components/footer'; -@import 'components/sub-footer'; -@import 'components/logo'; -@import 'components/main-menu'; -@import 'components/main-menu-mobile'; -@import 'components/hamburger'; -@import 'components/buttons'; -@import 'components/call'; -@import 'components/title'; -@import 'components/content'; -@import 'components/intro'; -@import 'components/intro-image'; -@import 'components/strip'; -@import 'components/feature'; -@import 'components/social'; +@import "components/type"; +@import "components/page"; +@import "components/header"; +@import "components/footer"; +@import "components/sub-footer"; +@import "components/logo"; +@import "components/main-menu"; +@import "components/main-menu-mobile"; +@import "components/hamburger"; +@import "components/buttons"; +@import "components/call"; +@import "components/title"; +@import "components/content"; +@import "components/intro"; +@import "components/intro-image"; +@import "components/strip"; +@import "components/feature"; +@import "components/social"; +// @import "components/fonts"; // Uncomment this line to self host font // Pages -@import 'pages/page-home'; -@import 'pages/page-teams'; -@import 'pages/page-service'; +@import "pages/page-home"; +@import "pages/page-teams"; +@import "pages/page-service"; body { font-size: 16px; diff --git a/assets/fonts/playfair-display.woff2 b/assets/fonts/playfair-display.woff2 new file mode 100644 index 0000000..ac3b4a5 Binary files /dev/null and b/assets/fonts/playfair-display.woff2 differ diff --git a/contact.md b/contact.md index 852158f..8aee08f 100644 --- a/contact.md +++ b/contact.md @@ -1,6 +1,7 @@ --- title: Contact layout: contact +description: 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. diff --git a/images/team/cristian-newman-94319-unsplash.jpg b/images/team/cristian-newman-94319-unsplash.jpg index ffee98f..4d25c0a 100644 Binary files a/images/team/cristian-newman-94319-unsplash.jpg and b/images/team/cristian-newman-94319-unsplash.jpg differ diff --git a/images/team/joseph-gonzalez-399972-unsplash.jpg b/images/team/joseph-gonzalez-399972-unsplash.jpg index be9a1d3..fd038d1 100644 Binary files a/images/team/joseph-gonzalez-399972-unsplash.jpg and b/images/team/joseph-gonzalez-399972-unsplash.jpg differ diff --git a/images/team/michael-dam-258165-unsplash.jpg b/images/team/michael-dam-258165-unsplash.jpg index 666f910..f60f11a 100644 Binary files a/images/team/michael-dam-258165-unsplash.jpg and b/images/team/michael-dam-258165-unsplash.jpg differ diff --git a/images/team/nonsap-visuals-kMJp7620W6U-unsplash.jpg b/images/team/nonsap-visuals-kMJp7620W6U-unsplash.jpg index c686bbc..b6d20c9 100644 Binary files a/images/team/nonsap-visuals-kMJp7620W6U-unsplash.jpg and b/images/team/nonsap-visuals-kMJp7620W6U-unsplash.jpg differ diff --git a/images/team/original/cristian-newman-94319-unsplash.jpg b/images/team/original/cristian-newman-94319-unsplash.jpg new file mode 100644 index 0000000..ffee98f Binary files /dev/null and b/images/team/original/cristian-newman-94319-unsplash.jpg differ diff --git a/images/team/original/joseph-gonzalez-399972-unsplash.jpg b/images/team/original/joseph-gonzalez-399972-unsplash.jpg new file mode 100644 index 0000000..be9a1d3 Binary files /dev/null and b/images/team/original/joseph-gonzalez-399972-unsplash.jpg differ diff --git a/images/team/original/michael-dam-258165-unsplash.jpg b/images/team/original/michael-dam-258165-unsplash.jpg new file mode 100644 index 0000000..666f910 Binary files /dev/null and b/images/team/original/michael-dam-258165-unsplash.jpg differ diff --git a/images/team/original/nonsap-visuals-kMJp7620W6U-unsplash.jpg b/images/team/original/nonsap-visuals-kMJp7620W6U-unsplash.jpg new file mode 100644 index 0000000..c686bbc Binary files /dev/null and b/images/team/original/nonsap-visuals-kMJp7620W6U-unsplash.jpg differ diff --git a/images/team/original/peter-van-eijk-711986-unsplash.jpg b/images/team/original/peter-van-eijk-711986-unsplash.jpg new file mode 100644 index 0000000..f1483f7 Binary files /dev/null and b/images/team/original/peter-van-eijk-711986-unsplash.jpg differ diff --git a/images/team/original/sage-kirk-485982-unsplash.jpg b/images/team/original/sage-kirk-485982-unsplash.jpg new file mode 100644 index 0000000..8568d34 Binary files /dev/null and b/images/team/original/sage-kirk-485982-unsplash.jpg differ diff --git a/images/team/original/sung-wang-g4DgCF90EM4-unsplash.jpg b/images/team/original/sung-wang-g4DgCF90EM4-unsplash.jpg new file mode 100644 index 0000000..560cdb5 Binary files /dev/null and b/images/team/original/sung-wang-g4DgCF90EM4-unsplash.jpg differ diff --git a/images/team/original/vince-fleming-613817-unsplash.jpg b/images/team/original/vince-fleming-613817-unsplash.jpg new file mode 100644 index 0000000..a07ed54 Binary files /dev/null and b/images/team/original/vince-fleming-613817-unsplash.jpg differ diff --git a/images/team/peter-van-eijk-711986-unsplash.jpg b/images/team/peter-van-eijk-711986-unsplash.jpg index f1483f7..05af0d7 100644 Binary files a/images/team/peter-van-eijk-711986-unsplash.jpg and b/images/team/peter-van-eijk-711986-unsplash.jpg differ diff --git a/images/team/sage-kirk-485982-unsplash.jpg b/images/team/sage-kirk-485982-unsplash.jpg index 8568d34..b2febe9 100644 Binary files a/images/team/sage-kirk-485982-unsplash.jpg and b/images/team/sage-kirk-485982-unsplash.jpg differ diff --git a/images/team/sung-wang-g4DgCF90EM4-unsplash.jpg b/images/team/sung-wang-g4DgCF90EM4-unsplash.jpg index 560cdb5..fae6e52 100644 Binary files a/images/team/sung-wang-g4DgCF90EM4-unsplash.jpg and b/images/team/sung-wang-g4DgCF90EM4-unsplash.jpg differ diff --git a/images/team/vince-fleming-613817-unsplash.jpg b/images/team/vince-fleming-613817-unsplash.jpg index a07ed54..af8437e 100644 Binary files a/images/team/vince-fleming-613817-unsplash.jpg and b/images/team/vince-fleming-613817-unsplash.jpg differ diff --git a/services.md b/services.md index a288868..afb2d42 100644 --- a/services.md +++ b/services.md @@ -1,9 +1,10 @@ --- title: Services layout: services +description: Services intro_image: "images/illustrations/reading.svg" intro_image_absolute: true -intro_image_hide_on_mobile: false +intro_image_hide_on_mobile: true --- # Services that grow with your business diff --git a/team.md b/team.md index af1083b..99e21bc 100644 --- a/team.md +++ b/team.md @@ -1,6 +1,7 @@ --- title: Team layout: teams +description: Team permalink: "/team/" intro_image_absolute: true intro_image_hide_on_mobile: false