From 7ee135970b173315844048aea25e28304a201870 Mon Sep 17 00:00:00 2001
From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 3 Sep 2015 10:43:35 -0400
Subject: [PATCH] editing front page elements

---
 assets/Untitled-2.png | Bin 0 -> 1285 bytes
 css/app.css           |   4 ++--
 front-page.php        |  10 +++++-----
 header.php            |   4 +++-
 parts/top-bar.php     |   2 +-
 scss/_copyright.scss  |   2 +-
 scss/_main.scss       |   2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 assets/Untitled-2.png

diff --git a/assets/Untitled-2.png b/assets/Untitled-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..17fd8d3d38dacfafb88fa4fe921662ffabfebfbe
GIT binary patch
literal 1285
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU&_u!9QqR!T
z%-qskN5Kfl*Eg`xH!{#Qu(UEYwlXkMfC43;ZAB?*RzWUqP`iLUTcwPWk^(Dz{qpj1
zy>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU-MnIDm<cYa#mPmP1tppJc?uvC6O-~w
zOKg>ZE`@j@w*YQzUNJP7fB~jokyxN_sAmB35=^15FMg%Dxp39RB|)hO_hL1;IHa;5
zRX-@TIKQ+g85nVC${?!>telHd6HD@oLh|!-V4)b0kzbNuoRMFk;Oq<zH3g0E%)FHR
z@?uS}9$#N8&%EN2#JuEGPZwJypecHpnJHGrj?RWAPKL&&MkeNlhOVX-CN9RV#>SQg
zF2)vSX6A-4y)OC5rManjB{01y2)!ma^@5T^ZUN9{m(-%nveXo}qWoM1u(z!;al6G3
zr+HAlDY)HYgj26R&@uX;$VG~5m=G`pftc{53*^8Pe`+2u#TNmSw(xw(L<R=NQcoAh
zkcwMdLJs;KHQ@2R&B~>o7n0PtficIy{Kx-eYjZw?Hz+T^@5kWdV7?%nuj3CVhk2ik
zviqh*+X}Dtt7`iu{l2MRW-NU2Xl3d~lYrA+j~3W&`E9Y|p3Vdx7QKyc7L;?!Gp%5J
za+N{mPiV><A+9=3f$2tPD(|`;{J*JXo&twzA#bhN_bC@9uVQ-k$9K+Fj$N|GZEx95
z$I0X--d?7ak@76~pr^%+y%t#}BA!`tBB9>Wr{6DU^Vp_f|3<;lq+e#v-zL2v&vVWq
zav!yx9+={>TaopGex=C?x0>A{S6MD}{^i~NDCFC;bTyCZr<VQr_3hmjot00t8WQ52
z?iW61*1d866VHitD-%C2{u^53cCImAzA(?k+49@w)fIo%MyhRAaQ&fRwV;2&qXQ*#
zUAOhMuX(n6LPx7V>;36BxzuhMvPeG4JNVb`)ryN=Mw^{X6pl(UENXo*b8)t416zuz
w1J@G`hGK=CmWw_xZ-2JGbyv6bnLk_x3?0GqwJcZpWP%DNPgg&ebxsLQ09*3I8vp<R

literal 0
HcmV?d00001

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;
             
         }
     }
-- 
2.17.1