From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 3 Sep 2015 14:43:35 +0000 (-0400)
Subject: editing front page elements
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7ee135970b173315844048aea25e28304a201870;p=WP-Themes%2Fmichsci.git

editing front page elements
---

diff --git a/assets/Untitled-2.png b/assets/Untitled-2.png
new file mode 100644
index 0000000..17fd8d3
Binary files /dev/null and b/assets/Untitled-2.png differ
diff --git a/css/app.css b/css/app.css
index b3d6561..06d8af9 100644
--- a/css/app.css
+++ b/css/app.css
@@ -6653,7 +6653,7 @@ header {
             text-shadow: 0 -1 1px #008752; }
 
 main .page-front #content-wrapper {
-  margin: 70px; }
+  margin: 70px 55px; }
 
 .breadcrumbs {
   margin-top: 10px; }
@@ -7069,7 +7069,7 @@ input[type="submit"].blogbutton {
         background: #1d63a0; }
 
 #copyright {
-  margin: 70px;
+  margin: 70px 55px;
   float: none; }
   #copyright p {
     font-size: 0.625rem; }
diff --git a/front-page.php b/front-page.php
index 853b913..4dc9e73 100644
--- a/front-page.php
+++ b/front-page.php
@@ -4,11 +4,6 @@
         <?php get_template_part('parts/slide-show');?>
     </div>
     <div id="content-wrapper">
-        <div class="row">
-            <?php
-            get_template_part('parts/glm-blocks');
-            ?>
-        </div>
         <div class="row">
             <div id="main-content" class="small-12 medium-6 large-8 columns">
                 <?php if(have_posts()) : while(have_posts()): the_post();?>
@@ -21,5 +16,10 @@
                 <?php get_sidebar(); ?>
             </div>
         </div>
+        <div class="row">
+            <?php
+            get_template_part('parts/glm-blocks');
+            ?>
+        </div>
     </div>
 <?php get_footer(); ?>
diff --git a/header.php b/header.php
index 7f2ef3c..8f3caa0 100644
--- a/header.php
+++ b/header.php
@@ -31,8 +31,10 @@
                                 </ul>
                             </div>
                         </div>
-                        <div class="row">
+                        <div class="row collapse">
+                            <a class="show-for-large-up" href="<?php bloginfo('url');?>"><img src="<?php echo get_template_directory_uri(); ?>/assets/michigan-scientific-logo.png"></a>
                             <?php get_template_part('parts/top-bar');?>
+                            <a href="#" class="show-for-large-up"><img src="<?php echo get_template_directory_uri(); ?>/assets/Untitled-2.png"></a>
                         </div>
                         <?php get_template_part('parts/off-canvas-menu');?>
                     </header>
diff --git a/parts/top-bar.php b/parts/top-bar.php
index 8e2bfb3..d154377 100644
--- a/parts/top-bar.php
+++ b/parts/top-bar.php
@@ -1,4 +1,4 @@
-<nav class="top-bar show-for-large-up" data-topbar role="navigation">
+<nav class="top-bar text-center show-for-large-up" data-topbar role="navigation">
     <section class="top-bar-section">
         <?php glm_page_menu(); ?>
     </section>
diff --git a/scss/_copyright.scss b/scss/_copyright.scss
index 5cab4a7..0817f30 100644
--- a/scss/_copyright.scss
+++ b/scss/_copyright.scss
@@ -1,5 +1,5 @@
 #copyright {
-    margin: 70px;
+    margin: 70px 55px;
     float: none;
     p {
         font-size: rem-calc(10);
diff --git a/scss/_main.scss b/scss/_main.scss
index eb331a3..9399fde 100644
--- a/scss/_main.scss
+++ b/scss/_main.scss
@@ -1,7 +1,7 @@
 main {
     .page-front {
         #content-wrapper {
-            margin: 70px;
+            margin: 70px 55px;
             
         }
     }