GitBlixt
teagles/ChoiceCastings.com

Saved: 2017-11-13 14:14

Torey Heinz committed Nov 13, 2017
commit 0eb942b66f2d51aa914ec4c7b10c0c758916e8c5
Showing 6 changed files with 112 additions and 21 deletions
app/views/pages/layouts/application.liquid +31 -5
@@ @@ -26,10 +26,15 @@ is_layout: true
<body class="{{ page.slug }}">
<!-- Start Top Bar -->
<div class="top-bar">
- <div class="row">
+ <div class="row wide">
<div class="top-bar-left">
+ <ul class="menu">
+ <li class="logo"><a href="/"><img src="{{ 'ChoiceCastingsLogo-web.png' | theme_image_url }}"></a></li>
+ </ul>
+ </div>
+ <div class="top-bar-right">
+ <div class="contact-bar text-center">(616) 956-6800 | <a href="mailto:info@choicecastings.com">info@choicecastings.com</a></div>
<ul class="dropdown menu" data-dropdown-menu data-alignment="left">
- <li class="menu-text logo"><img src="{{ 'ChoiceCastingsLogo-web.png' | theme_image_url }}"></li>
<li><a href="/">Home</a></li>
{% for page in site.pages %}
{% if page.depth == 1 and page.listed? %}
@@ @@ -61,10 +66,31 @@ is_layout: true
</div>
{% endblock %}
<footer class="row expanded">
- <div class="row wide text-center">
- <p><img src="{{ 'ChoiceCastingsLogo-web.png' | theme_image_url }}"></p>
- <p>Copyright © 2012, Choice Castings Inc. All rights reserved.</p>
+ <div class="row wide">
+ <div class="column medium-3">
+ <ul class="menu vertical">
+ <li><a href="/">Home</a></li>
+ {% for page in site.pages %}
+ {% if page.depth == 1 and page.children.size == 0 %}
+ <li>
+ {% link_to page %}
+ </li>
+ {% endif %}
+ {% endfor %}
+ <li class="menu-text"><img src="{{ 'ChoiceCastingsLogo-web.png' | theme_image_url }}"></li>
+ </ul>
+ </div>
+ <div class="column medium-3">
+ {% include 'footer-menu-block' with slug: 'solutions' %}
+ </div>
+ <div class="column medium-3">
+ {% include 'footer-menu-block' with slug: 'materials' %}
+ </div>
+ <div class="column medium-3">
+ {% include 'footer-menu-block' with slug: 'products' %}
+ </div>
</div>
+ <p class="text-center">Copyright © 2012, Choice Castings Inc. All rights reserved.</p>
</footer>
</div>
app/views/pages/need-expedited-service.liquid +4 -4
@@ @@ -1,12 +1,12 @@
---
title: Need Expedited Service?
slug: need-expedited-service
- position: 0
- listed: true
- published: false
+ position: 3
+ listed: false
+ published: true
is_layout: false
editable_elements:
main/content: Most of the time you want to avoid expediting&nbsp;orders, and we
can help with that too, but when you need fast we can make it happen!
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/application" %}
app/views/snippets/footer-menu-block.liquid +16 -0
@@ @@ -0,0 +1,16 @@
+ <ul class="menu vertical">
+ {% for page in site.pages %}
+ {% if page.slug == slug %}
+ <li>
+ {% link_to page %}
+ {% unless page.children.size == 0 %}
+ <ul class="nested vertical menu">
+ {% for subpage in page.children %}
+ <li>{% link_to subpage %}</li>
+ {% endfor %}
+ </ul>
+ {% endunless %}
+ </li>
+ {% endif %}
+ {% endfor %}
+ </ul>
log/server.log +3 -0
@@ @@ -41,3 +41,6 @@ I, [2017-11-08T13:46:11.446100 #19957] INFO -- : Listening on 0.0.0.0:3000, CTR
I, [2017-11-10T14:24:40.924428 #3476] INFO -- : Thin web server (v1.6.4 codename Gob Bluth)
I, [2017-11-10T14:24:40.924735 #3476] INFO -- : Maximum connections set to 1024
I, [2017-11-10T14:24:40.924767 #3476] INFO -- : Listening on 0.0.0.0:3000, CTRL+C to stop
+ I, [2017-11-13T14:14:40.527452 #5046] INFO -- : Thin web server (v1.6.4 codename Gob Bluth)
+ I, [2017-11-13T14:14:40.527716 #5046] INFO -- : Maximum connections set to 1024
+ I, [2017-11-13T14:14:40.527742 #5046] INFO -- : Listening on 0.0.0.0:3000, CTRL+C to stop
public/stylesheets/_settings.scss +1 -1
@@ @@ -66,7 +66,7 @@
// ---------
$global-font-size: 100%;
- $global-width: rem-calc(960);
+ $global-width: rem-calc(800);
$global-lineheight: 1.5;
$foundation-palette: (
primary: #EE6500,
public/stylesheets/app.scss +57 -11
@@ @@ -59,16 +59,37 @@ div.wrapper {
// box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
- body.index {
- .row.wide {
- max-width: rem-calc(1200);
- }
+ .row.wide {
+ max-width: rem-calc(1200);
}
.top-bar {
box-shadow: 0 1px 2px rgba(0,0,0,0.24);
// background-color: #201E1F;
+ .top-bar-right {
+ text-align: right;
+
+ .menu {
+ text-align: left;
+ }
+ }
+
+
+ .contact-bar {
+ display: inline-block;
+ padding: 0.2rem 0.8rem;
+ border-radius: 0 0 12px 12px;
+ background-color: $primary-color;
+ color: $white;
+ font-weight: bold;
+
+ a:hover {
+ color: $white;
+ text-decoration: underline;
+ }
+ }
+
.logo img {
max-width: 225px;
}
@@ @@ -82,9 +103,15 @@ body.index {
}
}
+ body.index {
+ .banner {
+ height: 350px;
+ }
+ }
+
.banner {
position: relative;
- height: 350px;
+ height: 250px;
background: image-url('/images/banner-1.jpg') top center no-repeat;
background-size: cover;
@@ @@ -112,6 +139,8 @@ body.index {
}
}
+
+
.row.services {
background-color: #E1E2E4;
}
@@ @@ -124,12 +153,6 @@ body.index {
background-color: #E1E2E4;
}
- footer {
- padding-top: rem-calc(10);
- background: $topbar-background;
- color: $white;
- }
-
.card {
.title {
background: linear-gradient(#4D5D66, #687B86); /* Standard syntax */
@@ @@ -146,3 +169,26 @@ footer {
}
}
}
+
+ footer {
+ padding-top: rem-calc(10);
+ background: $topbar-background;
+ color: $white;
+
+ .menu a {
+ font-weight: bold;
+ }
+
+ .menu a, .menu .button {
+ padding: 0.2rem 1rem;
+ }
+
+ .menu.nested {
+ margin-left: 0.5rem;
+
+ a {
+ font-size: 0.85rem;
+ font-weight: normal;
+ }
+ }
+ }