GitBlixt
teagles/VS-America.com

Saved: 2017-10-30 07:05

Torey Heinz committed Oct 30, 2017
commit 62cccc259f96ab0e263525bbc612b5b87962b1ae
Showing 4 changed files with 63 additions and 36 deletions
app/views/pages/history-of-vs-america.liquid +1 -2
@@ @@ -17,7 +17,6 @@ editable_elements:
copper alloys produced via permanent-mold casting.<br><br>We assist in the entire
sourcing decision, from the design phase to selection of process and material,
prototype tooling and sampling, quality control and offer logistical support including
- consigning product and warehousing for JIT deliveries.<br><br>Please consider
- us when addressing your casting needs and contact Oliver Diehm at 248-585-6715.'
+ consigning product and warehousing for JIT deliveries.<br><br><br>'
---
{% extends "layouts/default" %}
app/views/pages/layouts/default.liquid +17 -6
@@ @@ -33,12 +33,12 @@ is_layout: true
<div class="banner column large-5" data-equalizer-watch>
{{ 'banner.png' | theme_image_tag }}
</div>
- <div class="menu-wrapper column large-7" data-equalizer-watch>
- <p class="contact-info">
+ <div class="menu-wrapper column large-7 show-for-large" data-equalizer-watch>
+ <div class="contact-info">
<i class="fa fa-phone fa-lg">&nbsp;</i><a href="tel:16169566800">(616) 956-6800</a>
&nbsp;
<i class="fa fa-envelope fa-lg">&nbsp;</i><a href="mailto:contact@vs-america.com">contact@vs-america.com</a>
- </p>
+ </div>
{% comment %}{% nav 'site', active_class: 'is-active', id: 'top-menu' %}{% endcomment %}
<nav id="top-menu">
<ul class="menu">
@@ @@ -50,12 +50,23 @@ is_layout: true
</div>
</header>
+ <div class="title-bar" data-responsive-toggle="sidebar-nav" data-hide-for="large">
+ <button class="menu-icon" type="button" data-toggle="sidebar-nav"></button>
+ <div class="title-bar-title">Menu</div>
+ <div class="contact-info float-right">
+ <i class="fa fa-phone fa-lg">&nbsp;</i><a href="tel:16169566800">(616) 956-6800</a>
+ &nbsp;
+ <i class="fa fa-envelope fa-lg">&nbsp;</i><a href="mailto:contact@vs-america.com">contact@vs-america.com</a>
+ </div>
+ </div>
<div id="main" class="row">
- <div class="medium-3 column sidebar">
- {% link_to site.index %}
+ <div class="large-3 column sidebar">
+ <div class="show-for-large">
+ {% link_to site.index %}
+ </div>
{% nav 'site', depth: 2, active_class: 'is-active', id: 'sidebar-nav' %}
</div>
- <div class="medium-9 column">
+ <div class="large-9 column">
<ul class="breadcrumbs">
{% for item in page.breadcrumbs %}
<li>{% link_to item %}</li>
log/server.log +3 -0
@@ @@ -15,3 +15,6 @@ I, [2017-10-01T15:22:03.186946 #38668] INFO -- : Listening on 0.0.0.0:3000, CTR
I, [2017-10-24T15:26:33.575525 #10074] INFO -- : Thin web server (v1.6.4 codename Gob Bluth)
I, [2017-10-24T15:26:33.575749 #10074] INFO -- : Maximum connections set to 1024
I, [2017-10-24T15:26:33.575774 #10074] INFO -- : Listening on 0.0.0.0:3333, CTRL+C to stop
+ I, [2017-10-30T07:04:59.745543 #95761] INFO -- : Thin web server (v1.6.4 codename Gob Bluth)
+ I, [2017-10-30T07:04:59.745850 #95761] INFO -- : Maximum connections set to 1024
+ I, [2017-10-30T07:04:59.745900 #95761] INFO -- : Listening on 0.0.0.0:3000, CTRL+C to stop
public/stylesheets/app.scss +42 -28
@@ @@ -66,6 +66,29 @@
@include motion-ui-transitions;
@include motion-ui-animations;
+ h1, h2, h3 {
+ text-transform: uppercase;
+ }
+
+ ul.breadcrumbs {
+ margin-bottom: 0;
+ }
+
+ li > a:hover {
+ color: #ff6100;
+ }
+
+ li.is-active > a {
+ font-style: italic;
+ font-weight: bold;
+ // color: #ff6100;
+ // background-color: yellow;
+ }
+
+ li.has-submenu > a {
+ font-weight: bold;
+ }
+
body {
background: image-url('/images/body-bg.png') repeat;
// font-size: rem-calc(17)
@@ @@ -82,13 +105,15 @@ header {
.menu-wrapper {
position: relative;
- p.contact-info {
- margin-top: rem-calc(10);
- padding-right: 1.0em;
- text-align: right;
- }
}
+ .contact-info {
+ margin-top: rem-calc(10);
+ padding-right: 1.0em;
+ text-align: right;
+ }
+
+
nav#top-menu {
position: absolute;
bottom: rem-calc(5);
@@ @@ -109,6 +134,18 @@ header {
}
}
+ .title-bar {
+ .contact-info {
+ @include breakpoint(small only) {
+ font-size: 0.75rem;
+ }
+
+ a {
+ color: #fff;
+ }
+ }
+ }
+
#main {
padding-top: rem-calc(5);
background: #fff;
@@ @@ -120,26 +157,3 @@ header {
box-shadow: 3px 1px 3px -2px rgba(0,0,0,0.12);
// border-right: 2px solid $primary-color;
}
-
- h1, h2, h3 {
- text-transform: uppercase;
- }
-
- ul.breadcrumbs {
- margin-bottom: 0;
- }
-
- li > a:hover {
- color: #ff6100;
- }
-
- li.is-active > a {
- font-style: italic;
- font-weight: bold;
- // color: #ff6100;
- // background-color: yellow;
- }
-
- li.has-submenu > a {
- font-weight: bold;
- }