Saved: 2017-10-24 15:58
Torey Heinz
committed Oct 24, 2017
commit b6426d1bae7eeee2503e9a93a1b02ec2d9350a17
Showing 7
changed files with
42 additions
and 5 deletions
app/views/pages/layouts/default.liquid
+12
-3
| @@ | @@ -26,9 +26,18 @@ is_layout: true |
| {{ 'app.css' | stylesheet_tag }} | |
| </head> | |
| <body> | |
| - | <header class="row"> |
| - | <div class="banner"> |
| - | {{ 'logo.png' | theme_image_tag }} |
| + | <header class="row collapse"> |
| + | <div class="banner column medium-5 "> |
| + | {{ 'banner.png' | theme_image_tag }} |
| + | </div> |
| + | <div class="column medium-7 "> |
| + | {% comment %}{% nav 'site', active_class: 'is-active', id: 'top-menu' %}{% endcomment %} |
| + | <nav id="top-menu"><ul class="menu"> |
| + | <li id="why-castings-link" class="link"><a href="/why-castings">Why Castings?</a></li> |
| + | <li id="material-choices-link" class="link"><a href="/material-choices">Material Choices</a></li> |
| + | <li id="manufacturers-link" class="link"><a href="/manufacturers">Manufacturers</a></li> |
| + | <li id="stock-items-link" class="link"><a href="/stock-items">Stock Items</a></li> |
| + | <li id="applications-link" class="link last"><a href="/applications">Applications</a></li></ul></nav> |
| </div> | |
| </header> | |
| <div class="row"> | |
log/server (Torey Heinz's conflicted copy 2017-10-24).log
+23
-0
| @@ | @@ -0,0 +1,23 @@ |
| + | # Logfile created on 2017-09-28 16:15:45 -0400 by logger.rb/56815 |
| + | I, [2017-09-28T16:15:45.858949 #72005] INFO -- : Thin web server (v1.6.4 codename Gob Bluth) |
| + | I, [2017-09-28T16:15:45.859025 #72005] INFO -- : Maximum connections set to 1024 |
| + | I, [2017-09-28T16:15:45.859042 #72005] INFO -- : Listening on 0.0.0.0:3000, CTRL+C to stop |
| + | I, [2017-09-28T16:27:13.398112 #72005] INFO -- : Waiting for 2 connection(s) to finish, can take up to 30 sec, CTRL+C to stop now |
| + | I, [2017-09-29T07:04:53.124934 #84772] INFO -- : Thin web server (v1.6.4 codename Gob Bluth) |
| + | I, [2017-09-29T07:04:53.125044 #84772] INFO -- : Maximum connections set to 1024 |
| + | I, [2017-09-29T07:04:53.125067 #84772] INFO -- : Listening on 0.0.0.0:3000, CTRL+C to stop |
| + | I, [2017-10-01T15:21:45.132400 #38571] INFO -- : Thin web server (v1.6.4 codename Gob Bluth) |
| + | I, [2017-10-01T15:21:45.132655 #38571] INFO -- : Maximum connections set to 1024 |
| + | I, [2017-10-01T15:21:45.132680 #38571] INFO -- : Listening on 0.0.0.0:3000, CTRL+C to stop |
| + | I, [2017-10-01T15:22:03.186805 #38668] INFO -- : Thin web server (v1.6.4 codename Gob Bluth) |
| + | I, [2017-10-01T15:22:03.186901 #38668] INFO -- : Maximum connections set to 1024 |
| + | I, [2017-10-01T15:22:03.186946 #38668] INFO -- : Listening on 0.0.0.0:3000, CTRL+C to stop |
| + | 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-24T15:26:42.435496 #10110] INFO -- : Thin web server (v1.6.4 codename Gob Bluth) |
| + | I, [2017-10-24T15:26:42.435588 #10110] INFO -- : Maximum connections set to 1024 |
| + | I, [2017-10-24T15:26:42.435608 #10110] INFO -- : Listening on 0.0.0.0:3000, CTRL+C to stop |
| + | I, [2017-10-24T15:29:08.962979 #10397] INFO -- : Thin web server (v1.6.4 codename Gob Bluth) |
| + | I, [2017-10-24T15:29:08.963073 #10397] INFO -- : Maximum connections set to 1024 |
| + | I, [2017-10-24T15:29:08.963092 #10397] INFO -- : Listening on 0.0.0.0:3000, CTRL+C to stop |
log/server.log
+3
-0
| @@ | @@ -12,3 +12,6 @@ I, [2017-10-01T15:21:45.132680 #38571] INFO -- : Listening on 0.0.0.0:3000, CTR |
| I, [2017-10-01T15:22:03.186805 #38668] INFO -- : Thin web server (v1.6.4 codename Gob Bluth) | |
| I, [2017-10-01T15:22:03.186901 #38668] INFO -- : Maximum connections set to 1024 | |
| I, [2017-10-01T15:22:03.186946 #38668] INFO -- : Listening on 0.0.0.0:3000, CTRL+C to stop | |
| + | 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 |
public/images/banner.png
+0
-0
public/images/logo.png
+0
-0
public/javascripts/app.js
+2
-0
| @@ | @@ -3,5 +3,7 @@ $(document).foundation(); |
| $('nav#sidebar-nav > ul').addClass('vertical menu') | |
| $('nav#sidebar-nav > ul ul').addClass('vertical nested menu') | |
| + | $('nav#top-menu > ul').addClass('menu') |
| + | |
| var menu = new Foundation.AccordionMenu($('nav#sidebar-nav > ul'), {submenuToggle: true}); | |
| menu.down($('nav#sidebar-nav li.is-active ul')) | |
public/stylesheets/app.scss
+2
-2
| @@ | @@ -43,11 +43,11 @@ |
| @include motion-ui-animations; | |
| header { | |
| - | background-color: #B9134E; |
| + | background-color: #ECEEEE; |
| .banner { | |
| img { | |
| - | height: rem-calc(125); |
| + | // height: rem-calc(125); |
| } | |
| } | |
| } | |