From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 5 Oct 2015 15:19:52 +0000 (-0400)
Subject: Merging for a release 1.0
X-Git-Tag: v1.0.1~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=91039f476936ae8a1f1972e1f2b1fa570dbbac5e;p=WP-Themes%2FChippewaCounty.git

Merging for a release 1.0
---

91039f476936ae8a1f1972e1f2b1fa570dbbac5e
diff --cc footer.php
index f642634,c1b01eb..9ad1c26
mode 100755,100644..100644
--- a/footer.php
+++ b/footer.php
@@@ -80,23 -38,18 +38,19 @@@
                      </div>
                  </footer>
              </div>
 +			<a class="exit-off-canvas"></a>
              <div id="copy" class="row">
-                 <div class="medium-12 show-for-medium-up columns">
-                     <p>Copyright &copy; 2014 &#8226; Produced by <a href="#">Gaslight Media</a> &#8226; All rights Reserved</p>
-                 </div>
-                 <div class="row">
-                     <div class="small-12 text-center columns" id="copyright">
-                         <span>Produced by <a href="http://www.gaslightmedia.com">Gaslight Media</a></span>
-                         <span class="bullet"> &#8226; </span>
-                         <span>Copyright &copy; <?php echo date('Y');?></span>
-                         <span class="bullet"> &#8226; </span>
-                         <span> All Rights Reserved</span>
-                     </div>
+                 <div class="small-12 text-center columns" id="copyright">
+                     <span>Produced by <a href="http://www.gaslightmedia.com" target="_blank">Gaslight Media</a></span>
+                     <span class="bullet"> &#8226; </span>
+                     <span>Copyright &copy; <?php echo date('Y');?></span>
+                     <span class="bullet"> &#8226; </span>
+                     <span> All Rights Reserved</span>
                  </div>
              </div>
+             <a class="exit-off-canvas"></a>
          </div><!--/inner-wrap-->
       </div><!--/off-canvas-->
      <?php wp_footer();?>
   </body>
--</html>
++</html>
diff --cc header.php
index fc4ccc7,9619f61..9a7e10b
mode 100755,100644..100644
--- a/header.php
+++ b/header.php
diff --cc home.php
index 1c986bd,1197b4b..849ead9
--- a/home.php
+++ b/home.php
@@@ -1,17 -1,5 +1,17 @@@
  <?php get_header(); ?>
 -<div class="row">
 +    <div class="row">
 +        <div class="small-12 columns">
 +            <?php
 +            if(function_exists('bcn_display') && !is_front_page()) {
 +                echo "<div class=\"breadcrumbs\">";
 +                bcn_display();
 +                echo "</div>";
 +            }
 +            ?>
 +        </div>
 +    </div>
 +    <div id="blog-posts-over main" class="small-12 medium-9 columns">
-         
++
  <!--    <div id="searchform_container" class="small-12 medium-3 columns alignright">
          <form id="searchform" action="<?php bloginfo('url'); ?>" method="get">
              <div><input id="s" class="text" type="text" name="s" value="" />
@@@ -19,53 -7,11 +19,53 @@@
              <input type="hidden" name="searchType" value="blog" /> </div>
          </form>
      </div>-->
 -    <div id="blog-posts-over" class="small-12 medium-9 columns">
 -        
 +
-         
++
 +<?php
 +if ( 'page' == get_option('show_on_front') && get_option('page_for_posts') && is_home() ) : the_post();
 +	$page_for_posts_id = get_option('page_for_posts');
 +	setup_postdata(get_page($page_for_posts_id));
 +?>
 +                <div id="main">
 +                    <div class="entry-content">
 +                        <?php the_content(); ?>
 +                    </div>
 +                </div>
 +                <?php
 +                endif;
 +                ?>
 +                <div class="row">
 +                    <div class="medium-12 show-for-medium-up columns">
 +                        <header id="still"
 +                        <?php
 +                            if (has_post_thumbnail()) {
 +                                    $image_data = wp_get_attachment_image_src(get_post_thumbnail_id($post->ID), "full");
 +                                    echo ' style="background: url('.$image_data[0].'); height: '.$image_data[2].'px;max-height: 400px; "';
 +                            }
 +                            else {
 +                                    echo ' style="display: none;"';
 +                            }
 +                        ?>
 +                        >
 +                        </header>
 +                    </div>
 +                </div>
-                 <div id="main">                    
++                <div id="main">
 +                    <div class="row">
 +                        <div class="small-12 columns">
 +                            <?php if(have_posts()) : while(have_posts()): the_post();?>
 +                            <?php endwhile; else:?>
 +                            <?php endif;?>
 +                        </div>
 +                    </div>
 +                    <div class="row">
 +                        <img src="<?php bloginfo('template_url'); ?>/assets/dotted-line.jpg">
 +                    </div>
 +                </div>
 +
          <?php if(have_posts()): $i = 1; while (have_posts() && $i < 6) : the_post(); ?>
          <div class="row content" id="blog-posts-container">
-             <div class="small-11 small-centered columns">
+             <div class="small-12 small-centered columns">
                  <div class="row">
                      <div class="small-12 columns">
  
@@@ -95,7 -42,7 +96,7 @@@
          <?php endif;?>
      </div>
      <div id="blog-side-info" class="alignright small-12 medium-3">
--        
++
          <p>Recent Posts</p>
          <ul>
          <?php
@@@ -116,12 -63,10 +117,16 @@@
              'order' => 'ASC'
              );
            $categories = get_categories($args);
--            foreach($categories as $category) { 
--              echo '<li><a href="' . get_category_link( $category->term_id ) . '" title="' . sprintf( __( "View all posts in %s" ), $category->name ) . '" ' . '>' . $category->name.'</a> </li> ';  } 
++            foreach($categories as $category) {
++              echo '<li><a href="' . get_category_link( $category->term_id ) . '" title="' . sprintf( __( "View all posts in %s" ), $category->name ) . '" ' . '>' . $category->name.'</a> </li> ';  }
              ?>
          </ul>
      </div>
++<<<<<<< HEAD
 +    <div>
 +        <img src="<?php bloginfo('template_url'); ?>/assets/dotted-line.jpg">
 +    </div>
++=======
+ </div>
++>>>>>>> release/1.0
          <?php get_footer(); ?>
diff --cc page.php
index c96ef5f,07ddac7..1dbf8c4
mode 100755,100644..100644
--- a/page.php
+++ b/page.php
@@@ -16,18 -16,18 +16,18 @@@
                          </header>
                      </div>
                  </div>
-                 <div id="main">    
-                     <div class="row">
-                         <div class="small-12 columns">
-                             <?php
-                             if(function_exists('bcn_display') && !is_front_page()) {
-                                 echo "<div class=\"breadcrumbs\">";
-                                 bcn_display();
-                                 echo "</div>";
-                             }
-                             ?>
-                         </div>
+                 <div class="row">
+                     <div class="small-12 columns">
+                         <ul class="breadcrumbs">
+                         <?php if(function_exists('bcn_display'))
+                         {
+                             bcn_display();
+                         }?>
+                         <br>
+                         </ul>
                      </div>
+                 </div>
 -                <div id="main">                    
++                <div id="main">
                      <div class="row">
                          <div class="small-12 columns">
                              <?php if(have_posts()) : while(have_posts()): the_post();?>
@@@ -41,4 -41,4 +41,4 @@@
                          <img src="<?php bloginfo('template_url'); ?>/assets/dotted-line.jpg">
                      </div>
                  </div>
--<?php get_footer(); ?>
++<?php get_footer(); ?>
diff --cc scss/_settings.scss
index adf437a,8a43025..adf437a
mode 100755,100644..100644
--- a/scss/_settings.scss
+++ b/scss/_settings.scss
diff --cc scss/_structure.scss
index ffbbffd,d0ebaf6..b718e28
mode 100755,100644..100644
--- a/scss/_structure.scss
+++ b/scss/_structure.scss
@@@ -24,14 -20,12 +24,17 @@@ h1, h2, h3, h4, h5 
  h1 {
      font-size: 36px;
      margin: 20px 0;
+     @media #{$small-only} {
+         font-size: 30px;
+     }
  }
 -.nivo-caption h1 {
 -    margin: 0;
 +.nivo-caption {
 +    @media #{$small-only} {
 +        display: none !important;
 +    }
 +    h1, h2 {
 +        margin: 0;
 +    }
  }
  h2 {
      font-size: 24px;
@@@ -376,30 -427,8 +445,11 @@@ footer #part p 
  #weather {
      text-align: center;
  }
- #p-1 {
-     margin-top: 33px;
- }
- #p-2 {
-     margin-top: 34px;
-     margin-left: 20px;
- }
- #p-3 {
-     margin-top: 45px;
-     margin-left: -45px;
- }
- #p-4 {
-     margin-top: 48px;
-     margin-left: -35px;
- }
- #p-5 {
-     margin-top: 35px;
-     margin-left: -25px;
- }
  #blocks {
      margin-top: 30px;
 +    > div {
 +        margin: 20px 0;
 +    }
      img {
          background-color: white;
          border: 10px solid #2b5e88;
@@@ -450,6 -464,7 +500,10 @@@
  }
  #copyright {
      padding: 5px 20px;
++<<<<<<< HEAD
++=======
+     font-family: Times New Roman, sans-serif;
++>>>>>>> release/1.0
      p, a {
      color: white;
      }
@@@ -595,66 -712,71 +754,88 @@@ aside.left-off-canvas-menu ul.open 
  
  
  /* Blog & Search*/
-     #blog-posts-container {
-         margin: 30px 0 60px 0;
-         
-         embed, iframe, object, video {
-             max-width: 100%;
-         }
-         
-         a {
-             text-decoration: none;
-         }
-         
-         .wp-caption .wp-caption-text, .gallery-caption, .entry-caption {
-             overflow: hidden;
-             color: #757575;
-             font-size: 0.857143rem;
-             font-style: italic;
-             line-height: 2;
-         }
-         
-         .date {
-             font-size: 12px;
-         }
-         
-         footer.entry-meta {
-             color: #757575;
-             font-size: 0.928571rem;
-             line-height: 1.84615;
-             margin-top: 1.71429rem;
-             clear: both;
-             float: none;
-             margin-right: auto;
-         }
-         
-         footer {
-             clear: both;
-             padding: 15px 0 0;
-             position: relative;
-             text-align: center;
-         }
+ #blog-posts-over {
+     padding-left: 20px; 
+     
+ }
+ #blog-posts-container {
+     margin: 30px 0 60px 0;
+     padding-left: 0;
+     embed, iframe, object, video {
+         max-width: 100%;
      }
-     #searchform_container {
-         margin-top: 40px;
+ 
+     a {
+         text-decoration: none;
      }
-     #searchform {
-         max-width: 100%;
+ 
+     .wp-caption .wp-caption-text, .gallery-caption, .entry-caption {
+         overflow: hidden;
+         color: #757575;
+         font-size: 0.857143rem;
+         font-style: italic;
+         line-height: 2;
      }
+ 
+     .date {
+         font-size: 12px;
+     }
++<<<<<<< HEAD
 +    .search-result-header {
 +        margin: 20px;
 +    }
 +    #blog-side-info {
 +        border-left: 1px solid grey;
 +        padding-left: 20px;
 +        margin-top: 30px;
 +        ul {
 +            columns: 1;
 +            -moz-columns: 1;
 +            -webkit-columns: 1;
 +        }
 +    }
 +    /* End Blog & Search */
++=======
+ 
+     footer.entry-meta {
+         color: #757575;
+         font-size: 0.928571rem;
+         line-height: 1.84615;
+         margin-top: 1.71429rem;
+         clear: both;
+         float: none;
+         margin-right: auto;
+     }
+ 
+     footer {
+         clear: both;
+         padding: 15px 0 0;
+         position: relative;
+         text-align: center;
+     }
+ }
+ #blog-side-info {
+     border-left: 1px solid grey;
+     padding-left: 20px;
+     margin-top: 30px;
+     ul {
+         columns: 1;
+         -moz-columns: 1;
+         -webkit-columns: 1;
+         }
+ }
+ #searchform_container {
+     margin-top: 40px;
+ }
+ #searchform {
+     max-width: 100%;
+ }
+ .search-result-header {
+     margin: 10px 15px 0;
+ }
+ 
+ /* End Blog & Search */
++>>>>>>> release/1.0
      
      
      
@@@ -710,83 -832,9 +891,91 @@@
  }
  /* End Ninja Forms */
  
++<<<<<<< HEAD
 +/* Locations Map */
 +#map {
 +    background: url("../airpark.jpg") no-repeat scroll left top #fff;
 +    font-family: arial,helvetica,sans-serif;
 +    font-size: 8pt;
 +    height: 544px;
 +    position: relative;
 +    width: 673px;
 +}
 +#map li {
 +    list-style: outside none none;
 +    margin: 0;
 +    padding: 0;
 +}
 +#map li a {
 +    background: url("../blank.gif") repeat scroll 0 0 rgba(0, 0, 0, 0);
 +    border: medium none;
 +    display: block;
 +    position: relative;
 +}
 +#map li a span {
 +    display: none;
 +}
 +#map li a:hover span {
 +    background: none repeat scroll 0 0 #fff;
 +    border: 1px solid #000;
 +    color: #000;
 +    display: block;
 +    left: 20px;
 +    padding: 5px;
 +    text-decoration: none;
 +    top: 20px;
 +    width: 120px;
 +}
 +#map a.bldg110 {
 +    background: none repeat scroll 0 0 transparent;
 +    height: 8px;
 +    left: 310px;
 +    position: absolute;
 +    top: 220px;
 +    width: 8px;
 +}
 +#map a.bldg227 {
 +    background: none repeat scroll 0 0 transparent;
 +    height: 8px;
 +    left: 205px;
 +    position: absolute;
 +    top: 98px;
 +    width: 8px;
 +}
 +#map a.bldg232 {
 +    background: none repeat scroll 0 0 transparent;
 +    height: 8px;
 +    left: 208px;
 +    position: absolute;
 +    top: 109px;
 +    width: 8px;
 +}
 +#map a.bldg421 {
 +    background: none repeat scroll 0 0 transparent;
 +    height: 8px;
 +    left: 530px;
 +    position: absolute;
 +    top: 286px;
 +    width: 8px;
 +}
 +#map a.coop {
 +    height: 30px;
 +    left: 108px;
 +    position: absolute;
 +    top: 225px;
 +    width: 30px;
 +}
 +/* */
 +
++=======
++>>>>>>> release/1.0
  /* For fixing cellphones not showing phone numbers because of goofy auto-coloring */
  a[href^=tel]{
      color:inherit;
      text-decoration:none;
- }
++<<<<<<< HEAD
++}
++=======
+ }
+ /* */
++>>>>>>> release/1.0
diff --cc search.php
index f7fde7f,5fe25b9..018d4da
--- a/search.php
+++ b/search.php
@@@ -8,16 -8,12 +8,16 @@@
  
          <?php if(have_posts()): $i = 1; while (have_posts() && $i < 6) : the_post(); ?>
          <div class="content" id="blog-posts-container">
-             <div class="small-11 small-centered columns">
+             <div class="small-12 small-centered columns">
                  <div class="row">
                      <div class="small-12 columns">
 -<!--                        <ul class="breadcrumbs">
 -
 -                        </ul>-->
 +                        <?php
 +                        if(function_exists('bcn_display') && !is_front_page()) {
 +                            echo "<div class=\"breadcrumbs\">";
 +                            bcn_display();
 +                            echo "</div>";
 +                        }
 +                        ?>
                      </div>
                  </div>
                  <div class="row">
diff --cc single.php
index 11a4766,93f6d5c..917324a
--- a/single.php
+++ b/single.php
@@@ -13,19 -10,9 +10,9 @@@
      <div id="blog-posts-over" class="small-12 medium-9 columns">
          <?php if(have_posts()) : while(have_posts()): the_post();?>
          <div class="row content" id="blog-posts-container">
-             <div class="small-11 small-centered columns">
-                 <div class="row">
-                     <div class="small-12 columns">
-                         <?php
-                         if(function_exists('bcn_display') && !is_front_page()) {
-                             echo "<div class=\"breadcrumbs\">";
-                             bcn_display();
-                             echo "</div>";
-                         }
-                         ?>
-                     </div>
-                 </div>
-                 <div class="row">
+             <div class="small-12 small-centered columns">
 -                
++
+                 <div >
                      <div class="small-12 columns">
  
                          <article id="<?php the_ID()?>" <?php post_class()?>>
@@@ -37,11 -24,11 +24,11 @@@
                              </header>
  
                              <?php echo the_content(); ?>
--                            
--                            
--                            
++
++
++
                              <footer class="entry-meta small-12 medium-6 medium-push-3 center">
--                                
++
                                  <?php $post_categories = wp_get_post_categories( get_the_ID() );
                                  $cats = array();
  
@@@ -65,7 -52,7 +52,7 @@@
                                          echo '<a rel="category" title="View all posts in '. $tag->name . ' " href="'. $tag->slug .'">'. $tag->name .'</a>, ';
                                      }
                                  }
--                                
++
                                  echo ' on ';
                                  echo ' <span class="meta date"> ' . the_time('F jS, Y') . '. </span>';
                                  ?>
@@@ -88,7 -75,7 +75,7 @@@
          <?php endif;?>
      </div>
      <div id="blog-side-info" class="alignright small-12 medium-3">
--        
++
          <p>Recent Posts</p>
          <ul>
          <?php
@@@ -109,8 -96,8 +96,8 @@@
              'order' => 'ASC'
              );
            $categories = get_categories($args);
--            foreach($categories as $category) { 
--              echo '<li><a href="' . get_category_link( $category->term_id ) . '" title="' . sprintf( __( "View all posts in %s" ), $category->name ) . '" ' . '>' . $category->name.'</a> </li> ';  } 
++            foreach($categories as $category) {
++              echo '<li><a href="' . get_category_link( $category->term_id ) . '" title="' . sprintf( __( "View all posts in %s" ), $category->name ) . '" ' . '>' . $category->name.'</a> </li> ';  }
              ?>
          </ul>
      </div>