Saved: 2018-03-06 18:51

Torey Heinz committed Mar 07, 2018
commit 210120fc9deeb89d96c27400b05acf94b743e3f4
Showing 12 changed files with 126 additions and 38 deletions
app/views/pages/about.liquid +11 -0
@@ @@ -0,0 +1,11 @@
+ ---
+ title: About
+ slug: about
+ listed: true
+ published: true
+ is_layout: false
+ ---
+ {% extends 'layouts/application' %}
+ {% block 'main' %}
+
+ {% endblock %}
app/views/pages/index.liquid +1 -1
@@ @@ -36,7 +36,7 @@ is_layout: false
{% endfor %} {% endwith_scope %}
</div>
</div>
- <section class="services">
+ <section class="services standard">
<div class="row small-up-2 medium-up-3 large-up-4">
{% with_scope featured: nil %} {% for service in contents.services %}
<div class="columns medium-4">
app/views/pages/layouts/application.liquid +21 -4
@@ @@ -29,7 +29,9 @@ is_layout: true
<div class="row column">
<div class="top-bar-left">
<div class="logo">
- <img src="{{ 'CanvasInnovations-logo.jpg' | theme_image_url | resize: '125x40#'}}" width="125" height="87" alt="Canvas Innovations Logo">
+ <a href="/">
+ <img src="{{ 'CanvasInnovations-logo.jpg' | theme_image_url | resize: '125x40#'}}" width="125" height="87" alt="Canvas Innovations Logo">
+ </a>
</div>
</div>
@@ @@ -44,10 +46,25 @@ is_layout: true
<h1>{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
{% editable_text content %}Lorem ipsum{% endeditable_text %}
{% endblock %}
- <footer class="text-center">
- <p class="lead">Canvas Innovations</p>
- </footer>
</div>
+
+ <footer class="text-center">
+ <div class="top row expanded">
+ <p class="lead">
+ Canvas Innovations<br>
+ </p>
+ <p class="cta">
+ <a href="#" class="button"><strong>Get a Free Estimate</strong></a>
+ </p>
+ </div>
+ <div class="bottom row expanded">
+ <p>
+ <small>
+ You've reached the bottom of the page, please feel free to call if you have any questions: 616-393-4400
+ </small>
+ </p>
+ </div>
+ </footer>
<script src="https://code.jquery.com/jquery-2.2.3.min.js" integrity="sha256-a23g1Nt4dtEYOj7bR+vTu7+T8VP13humZFBJNIYoEJo=" crossorigin="anonymous"></script>
{{ 'app.js' | javascript_tag }}
{% block body_bottom %}
app/views/pages/layouts/page.liquid +17 -0
@@ @@ -0,0 +1,17 @@
+ ---
+ title: Page
+ slug: page
+ position: 99
+ listed: false
+ published: true
+ is_layout: true
+ ---
+ {% extends 'layouts/application' %}
+ {% block 'main' %}
+ <header class="service" data-background-url="{{ service.featured_image.url | resize: '1200x400#' }}">
+ <div class="content row column text-center">
+ <h1>{{ service.title }}</h1>
+ </div>
+ </header>
+ {% endblock %}
+
config/metafields_schema.yml +10 -1
@@ @@ -1 +1,10 @@
- --- {}
+ ---
+ contact_info:
+ label: Contact Info
+ fields:
+ phone_number:
+ type: string
+ address:
+ type: string
+ email:
+ type: string
config/site.yml +4 -0
@@ @@ -7,4 +7,8 @@ meta_keywords: ''
meta_description: ''
robots_txt: ''
metafields:
+ contact_info:
+ phone_number: "616-393-4400"
+ address: "11276 E. Lakewood Blvd., Holland, MI 49424"
+ email: "sales@canvasinnovations.us"
metafields_ui: {}
public/samples/company-photo.jpg +0 -0
public/stylesheets/_featured_services.scss +0 -30
@@ @@ -1,30 +0,0 @@
- .services {
- margin-top: rem-calc(10);
-
- .card {
- position: relative;
- .card-divider {
- // position: absolute;
- // top: 0;
- width: 100%;
- padding: 0.5rem;
- text-transform: uppercase;
- // background: $white;
- background: $primary-color;
- a {
- // color: $black;
- color: $white;
- }
- }
-
- .card-section {
- padding: 0.5rem;
- position: absolute;
- bottom: 0;
- background: rgba(255, 255, 255, 0.85);
- // background: $black;
- // color: $white;
- }
-
- }
- }
public/stylesheets/_footer.scss +16 -0
@@ @@ -0,0 +1,16 @@
+ footer {
+ .top {
+ color: $white;
+ background: $black;
+ }
+
+ .bottom {
+ color: $white;
+ background: $secondary-color;
+
+ p {
+ margin: 0;
+ font-style: italic;
+ }
+ }
+ }
public/stylesheets/_services.scss +39 -0
@@ @@ -0,0 +1,39 @@
+ .services {
+ margin-top: rem-calc(10);
+
+ .card {
+ position: relative;
+ .card-divider {
+ // position: absolute;
+ // top: 0;
+ width: 100%;
+ padding: 0.5rem;
+ text-transform: uppercase;
+ // background: $white;
+ background: $primary-color;
+ a {
+ // color: $black;
+ color: $white;
+ }
+ }
+
+ .card-section {
+ padding: 0.5rem;
+ position: absolute;
+ bottom: 0;
+ background: rgba(255, 255, 255, 0.85);
+ // color: $white;
+ }
+
+ }
+ &.standard {
+ .card-divider {
+ background: $black;
+ text-transform: none;
+
+ a {
+ // color: $black;
+ }
+ }
+ }
+ }
public/stylesheets/_settings.scss +3 -1
@@ @@ -68,8 +68,10 @@
$global-font-size: 100%;
$global-width: rem-calc(1200);
$global-lineheight: 1.5;
+ $light-blue: #aedbe2;
+ $dark-blue: #005D7A;
$foundation-palette: (
- primary: #005D7A,
+ primary: $dark-blue,
secondary: #AC3111,
success: #3adb76,
warning: #ffae00,
public/stylesheets/app.scss +4 -1
@@ @@ -49,6 +49,8 @@
@include foundation-visibility-classes;
@include foundation-float-classes;
+ @import 'footer';
+ @import "services";
body, html {
height: 100%;
@@ @@ -96,6 +98,8 @@ header {
}
}
+
+
.lead {
font-family: $header-font-family;
}
@@ @@ -104,4 +108,3 @@ header {
// background-color: $light-gray;
// }
- @import "featured_services";