Frontpage markup changes, top navigation tweaks.

diff --git a/css/app.css b/css/app.css
index 91c2f9a..b3c092a 100644 (file)
--- a/css/app.css
+++ b/css/app.css
@@ -5343,7 +5343,7 @@ blockquote, blockquote p {
   position: absolute;
   top: 0;
   width: 2.8125rem;
-  border-right: solid 1px #022437;
+  border-right: solid 1px #022537;
   left: 0; }
 
 .right-small {
@@ -5351,7 +5351,7 @@ blockquote, blockquote p {
   position: absolute;
   top: 0;
   width: 2.8125rem;
-  border-left: solid 1px #022437;
+  border-left: solid 1px #022537;
   right: 0; }
 
 .tab-bar-section {
@@ -6602,7 +6602,8 @@ header {
       .top-bar#front_nav .top-bar-section ul li ul.dropdown {
         height: auto; }
         .top-bar#front_nav .top-bar-section ul li ul.dropdown li {
-          height: auto; }
+          height: auto;
+          min-width: 250px; }
           .top-bar#front_nav .top-bar-section ul li ul.dropdown li a {
             font-size: 16px;
             color: #000000;
@@ -6635,6 +6636,10 @@ header {
   top: -15px;
   left: 20px; }
 
+.top-bar-section .has-dropdown .dropdown li.has-dropdown > a::after {
+  right: -10px;
+  top: 33%; }
+
 .top-bar-section {
   float: none;
   margin-left: auto;
@@ -6854,6 +6859,12 @@ header {
 #page-front #main-content {
   margin-top: 60px; }
 
+#page-front #main-content img.aligncenter, #page-front #main-content h1 {
+  clear: none; }
+
+#front-blog-feed {
+  padding-left: 20px; }
+
 .breadcrumbs {
   margin: 30px 0 20px; }
 

diff --git a/front-page.php b/front-page.php
index 51c5ade..e97f270 100644 (file)
--- a/front-page.php
+++ b/front-page.php
@@ -13,36 +13,28 @@
     <div id="content-wrapper">
         <div id="link-blocks">
             <div class="row">
-                <ul class="small-block-grid-1 medium-block-grid-3">
-                    <li id="partner"><a href="<?php bloginfo('url'); ?>/"><img src="<?php echo get_template_directory_uri(); ?>/assets/partner-resources.jpg"></a></li>
-                    <li id="area"><a href="<?php bloginfo('url'); ?>/why-northern-michigan/regional-info-and-demographics"><img src="<?php echo get_template_directory_uri(); ?>/assets/area-profile-and-demographics.jpg"></a></li>
-                    <li id="workshops"><a href="<?php bloginfo('url'); ?>/business-assistance/trainings-workshops"><img src="<?php echo get_template_directory_uri(); ?>/assets/training-and-workshops.jpg"></a></li>
-                </ul>
+                    <?php
+                    get_template_part('parts/glm-blocks');
+                    ?>
             </div>
         </div>
-        <div class="row">
-            <div class="small-12 medium-6 large-5 columns">
-                <h1>Latest News</h1>
-                <?php 
-                get_template_part('parts/blog-feed-front');
-                ?>
-            </div>
-            <div class="small-12 medium-6 large-7 columns small-text-center medium-text-left">
-                <h1>Featured Content</h1>
-                <?php
-                get_template_part('parts/glm-blocks');
-                ?>
-            </div>
-        </div>
-        <div class="row">
-            <div id="main-content" class="small-10 small-centered columns">
+            <div id="main-content" class="row small-10 medium-12">
+                <div id="front-blog-feed" class="right small-7 column">
+                    <h1>Latest News</h1>
+                    <?php 
+                    get_template_part('parts/blog-feed-front');
+                    ?>
+                </div>
+                    
                 <?php if(have_posts()) : while(have_posts()): the_post();?>
                 <?php the_content();?>
                 <?php endwhile; else:?>
                 <p><?php _e('Sorry, no posts yet');?></p>
                 <?php endif;?>  
             </div>
+            
+        <div class="row">
+            
         </div>
     </div>
-<?php get_footer(); ?>
-    
\ No newline at end of file
+<?php get_footer(); ?>
\ No newline at end of file

diff --git a/parts/glm-blocks.php b/parts/glm-blocks.php
index a3ace02..ede3ed9 100644 (file)
--- a/parts/glm-blocks.php
+++ b/parts/glm-blocks.php
@@ -1,38 +1,20 @@
 <?php if(function_exists('fetch_all_glm_blocks')):?>
 <?php $blocks = fetch_all_glm_blocks();?>
-<div class="blocks">
-    <?php foreach ($blocks as $block):?>
-    <div class="row">
-        
-    <?php if ($block->thumbnail) { ?>
-        <div class="small-12 medium-4 columns block block-img">
-            <?php if($block->url):?>
-            <a href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
-            <?php endif;?>
-                       
-                            
-            <?php echo $block->thumbnail;?>
-            <?php if($block->url):?>
-            </a>
-            <?php endif;?>
-        </div>
-        <div class="small-11 medium-8 columns block block-content">
-    <?php } else { ?>
-        <div class="small-11 right columns block block-content">
+
+<div class="blocks small-block-grid-1 medium-block-grid-3">
+    <?php foreach ($blocks as $block) { ?>
+        <?php if ($block->thumbnail) { ?>
+            <div class="small-12 medium-4 columns block block-img">
+                <?php if($block->url) {?>
+                    <a href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target=\'_blank\'';}?>>
+                <?php }?>
+                <?php echo $block->thumbnail; ?>`
+                <?php if($block->url) {?>
+                    </a>
+                <?php } ?>
+            </div>
+        <?php  } ?>
     <?php } ?>
-            <?php if($block->url):?>
-            <a class="title-posts" href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
-            <?php endif;?>
-                <h1><?php echo $block->post_title;?></h1>
-            <?php if($block->url):?>
-            </a>
-             <?php endif;?>
-            <p><?php echo $block->post_content;?></p>
-            <?php if($block->url):?>
-            <a class="blocks-readmore" href="<?php echo $block->url;?>">read more...</a>
-            <?php endif;?>
-        </div>
-    </div>
-    <?php endforeach;?>
 </div>
-<?php endif;?>
+
+<?php endif; ?>
\ No newline at end of file

diff --git a/scss/_main.scss b/scss/_main.scss
index c1465c0..0fca6a1 100644 (file)
--- a/scss/_main.scss
+++ b/scss/_main.scss
@@ -13,6 +13,13 @@
 #page-front #main-content {
     margin-top: 60px;
 }
+#page-front #main-content img.aligncenter,
+#page-front #main-content h1 {
+    clear: none;
+}
+#front-blog-feed {
+    padding-left: 20px;
+}
 .breadcrumbs {
     margin: 30px 0 20px;
 }

diff --git a/scss/_topbar.scss b/scss/_topbar.scss
index 604a9d6..d4964ff 100644 (file)
--- a/scss/_topbar.scss
+++ b/scss/_topbar.scss
@@ -65,6 +65,7 @@
                                 height: auto;
                                 li {
                                     height: auto;
+                                    min-width: 250px;
                                     a {
                                         font-size: 16px;
                                         color: $black;
@@ -115,6 +116,10 @@
     top: -15px;
     left: 20px;
 } 
+.top-bar-section .has-dropdown .dropdown li.has-dropdown > a::after {
+    right: -10px;
+    top: 33%;
+}
 .top-bar-section {
     float: none;
     margin-left: auto;

diff --git a/single.php b/single.php
index 84e3970..fa6bb18 100644 (file)
--- a/single.php
+++ b/single.php
@@ -4,6 +4,7 @@
             <div id="blog-posts-over" class="small-12 medium-9 columns">
                 <?php if(have_posts()) : while(have_posts()): the_post();?>
                 <div class="row blog-post-container">
+                    <h2><a class="read" href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
                     <div class="small-11 small-centered columns">
                         <div class="row">
                             <div class="small-12 columns">