Slider color, hyperlink color, sidebar blogs, other small changes as per meeting

diff --git a/css/app.css b/css/app.css
index d279c03..1fad373 100644 (file)
--- a/css/app.css
+++ b/css/app.css
@@ -4855,7 +4855,7 @@ h1, h2, h3, h4, h5, h6 {
     line-height: 0; }
 
 h1 {
-  font-size: 2.9375rem; }
+  font-size: 2.6875rem; }
 
 h2 {
   font-size: 2.6875rem; }
@@ -6533,7 +6533,8 @@ main {
 
 #statement-slider {
   width: 100px;
-  display: inline-block; }
+  display: inline-block;
+  color: #f5822a; }
 
 @media only screen and (max-width: 40em) {
   #statement-pre-slider {
@@ -6972,10 +6973,13 @@ input[type="submit"].blogbutton {
   #blog-posts-over article .entry-header {
     margin-bottom: 10px; }
     #blog-posts-over article .entry-header .entry-title {
+      font-size: 40px;
+      line-height: 1;
       margin-bottom: 0; }
     #blog-posts-over article .entry-header .meta.date {
       font-size: 13px;
-      font-weight: bold; }
+      font-weight: bold;
+      margin-left: 10px; }
 
 /*#searchform div input &[type="text"] {
     width: 95%;
@@ -7016,49 +7020,51 @@ input[type="submit"].blogbutton {
       #blog-side-info #searchform #s {
         width: 100%; } }
 
-.sidebar h6 {
-  color: #000000;
-  font-size: 1.5rem;
-  margin-left: 10px; }
-  .sidebar h6:before {
-    color: #f5822a;
-    content: "|";
-    position: absolute;
-    top: 2px;
-    left: 3px;
-    font-size: 24px;
-    font-weight: bold;
+.sidebar {
+  margin-top: 10px; }
+  .sidebar h6 {
+    color: #000000;
+    font-size: 1.5rem;
+    margin-left: 10px; }
+    .sidebar h6:before {
+      color: #f5822a;
+      content: "|";
+      position: absolute;
+      top: 2px;
+      left: 3px;
+      font-size: 24px;
+      font-weight: bold;
+      display: block;
+      padding: 0 10px; }
+  .sidebar ul.sidebar {
+    border: 1px solid #dcddde;
+    margin: 20px 0;
+    list-style: none;
+    width: 95%; }
+    .sidebar ul.sidebar li {
+      border-bottom: 1px solid #dcddde;
+      padding: 5px 0 5px 16px; }
+      .sidebar ul.sidebar li:last-child {
+        border: none; }
+      .sidebar ul.sidebar li.current_page_item {
+        background: #f2f7fb; }
+        .sidebar ul.sidebar li.current_page_item a {
+          color: #0568b3; }
+      .sidebar ul.sidebar li a {
+        font-size: 1.25rem;
+        color: #000000;
+        letter-spacing: 0.05em; }
+        .sidebar ul.sidebar li a:hover {
+          color: #0568b3; }
+  .sidebar a#ready {
     display: block;
-    padding: 0 10px; }
-.sidebar ul.sidebar {
-  border: 1px solid #dcddde;
-  margin: 20px 0;
-  list-style: none;
-  width: 95%; }
-  .sidebar ul.sidebar li {
-    border-bottom: 1px solid #dcddde;
-    padding: 5px 0 5px 16px; }
-    .sidebar ul.sidebar li:last-child {
-      border: none; }
-    .sidebar ul.sidebar li.current_page_item {
-      background: #f2f7fb; }
-      .sidebar ul.sidebar li.current_page_item a {
-        color: #0568b3; }
-    .sidebar ul.sidebar li a {
-      font-size: 1.25rem;
-      color: #000000;
-      letter-spacing: 0.05em; }
-      .sidebar ul.sidebar li a:hover {
-        color: #0568b3; }
-.sidebar a#ready {
-  display: block;
-  height: 70px;
-  width: 219px;
-  margin-top: 50px;
-  background: url(../assets/ready-to-get-started.jpg);
-  background-position: 0 0; }
-  .sidebar a#ready:hover {
-    background-position: 0 69px; }
+    height: 70px;
+    width: 219px;
+    margin-top: 50px;
+    background: url(../assets/ready-to-get-started.jpg);
+    background-position: 0 0; }
+    .sidebar a#ready:hover {
+      background-position: 0 69px; }
 
 #side-nav {
   padding-top: 10px;
@@ -7174,6 +7180,11 @@ footer#page-footer {
       text-decoration: none;
       display: block;
       margin-top: 15px; }
+  footer#page-footer #blog-feed-front h3 a {
+    text-decoration: none;
+    border-bottom: 1px solid rgba(255, 255, 255, 0.5); }
+    footer#page-footer #blog-feed-front h3 a:hover {
+      border-bottom-color: white; }
   footer#page-footer #webcam img {
     border: 2px solid #FFFFFF; }
     @media only screen and (max-width: 40em) {

diff --git a/footer.php b/footer.php
index ac51b83..8976f7e 100644 (file)
--- a/footer.php
+++ b/footer.php
@@ -11,7 +11,7 @@
                                     <a class="facebook show-for-medium-up" href="#"><img src="<?php bloginfo('template_url'); ?>/assets/facebook-icon.png"></a>
                                 </div>
                                 <div id="title-feed" class="small-12 medium-4 columns">
-                                    <h2>From The Blog</h2>
+                                    <h2>Featured Articles</h2>
                                     <?php get_template_part('parts/blog-feed-front');?>
                                 </div>
                                 <div id="webcam" class="small-12 medium-4 columns">

diff --git a/functions.php b/functions.php
index f6bb51d..6ca0f55 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -136,6 +136,7 @@ function mytheme_search_loop() {
 
   <?php endwhile;
 }
+// Allows simpler post type checks
 function is_post_type($type){
     global $wp_query;
     if($type == get_post_type($wp_query->post->ID)) return true;

diff --git a/home.php b/home.php
index 08bef75..43d6b2d 100644 (file)
--- a/home.php
+++ b/home.php
@@ -5,7 +5,10 @@
     </article> -->
     <?php get_template_part('parts/statements');?>
     <div class="row">
-        <div id="blog-posts-over" class="small-12 medium-9 columns">
+        <div class="large-3 columns">
+            <?php get_sidebar(); ?>
+        </div>
+        <div id="blog-posts-over" class="small-12 medium-6 columns">
             <?php if(have_posts()) : while(have_posts()): the_post();?>
             <div class="row content blog-posts-container">
               <!--  <div class="small-11 small-centered columns"> -->

diff --git a/index.php b/index.php
index 2b006cd..cf4b66b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,12 +1,11 @@
 <?php get_header(); ?>
 <main class="page-inside">
-    <div class="statements">
-        <div class="row">
-            <h1 class="text-center">Modern <img src="<?php bloginfo('template_url'); ?>/assets/glm-flame-icon.png"> Intelligent <img src="<?php bloginfo('template_url'); ?>/assets/glm-flame-icon.png"> Powerful<br>Websites That Amaze</h1>
-        </div>
-    </div>
+<?php get_template_part('parts/statements');?>
         <div id="content-wrapper">
             <div class="row">
+                <div class="large-3 columns">
+                    <?php get_sidebar(); ?>
+                </div>
                 <div id="main-content" class="small-12 large-9 columns right">
                     <?php
                     get_template_part('parts/bread-crumbs');
@@ -17,9 +16,6 @@
                     <p><?php _e('Sorry, no results found.');?></p>
                     <?php endif;?>
                 </div>
-                <div class="large-3 columns">
-                    <?php get_sidebar(); ?>
-                </div>
             </div>
         </div>
 <?php get_footer(); ?>

diff --git a/js/app.js b/js/app.js
index 92ac4e6..44d92cd 100644 (file)
--- a/js/app.js
+++ b/js/app.js
@@ -41,5 +41,5 @@ $(document).ready(function () {
         slider.fadeOut(function(){
             $(this).text(val).fadeIn(1000);
         });
-    },3000);
+    },3100);
 });

diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js
index 5a3990b..2437660 100644 (file)
--- a/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@ -32,5 +32,5 @@ $(document).ready(function () {
         slider.fadeOut(function(){
             $(this).text(val).fadeIn(1000);
         });
-    },3000);
+    },3100);
 });

diff --git a/lib/navigation.php b/lib/navigation.php
index 2224007..63770cd 100644 (file)
--- a/lib/navigation.php
+++ b/lib/navigation.php
@@ -144,13 +144,21 @@ function glm_side_menu() {
     global $post;
     $parents = get_post_ancestors($post->ID);
     $id = ($parents) ? $parents[count($parents)-1]: $post->ID;
+    if (is_post_type("post") || is_home() ) {
+        $id = 511;
+    } 
     $parent = get_page( $id );
+    
     if ($id == 0) {
         $ID = $post->ID;
     } else {
         $ID = $parent->ID;
     }
-    echo '<h6>'.get_the_title($ID).'</h6>';
+    if (is_post_type("post") || is_home() ) {
+        echo '<h6>Gaslight News</h6>';
+    } else {
+        echo '<h6>'.get_the_title($ID).'</h6>';
+    }
     echo '<ul class="sidebar"><!-- begin -->'."\n";
     echo wp_list_pages( 'child_of='.$ID.'&title_li=&depth=1&echo=0');
     echo '</ul><!-- end -->'."\n";

diff --git a/scss/_blog.scss b/scss/_blog.scss
index f8e033b..4290059 100644 (file)
--- a/scss/_blog.scss
+++ b/scss/_blog.scss
@@ -52,11 +52,15 @@ input[type="submit"].blogbutton {
      .entry-header {
         margin-bottom: 10px;
         .entry-title {
+            font-size: 40px;
+            line-height: 1;
             margin-bottom: 0;
+            
         }
         .meta.date {
             font-size: 13px;
             font-weight: bold;
+            margin-left: 10px;
         }
     }
 }

diff --git a/scss/_main.scss b/scss/_main.scss
index 3e86c65..bc18379 100644 (file)
--- a/scss/_main.scss
+++ b/scss/_main.scss
@@ -1,5 +1,8 @@
 main {
     margin-top: 75px;
+}
+a:hover {
+    
 }
 .statements {
     background: $l-blue;
@@ -21,6 +24,7 @@ main {
 #statement-slider {
     width: 100px;
     display: inline-block;
+    color: $orange;
 }
 @media #{$small-only} {
     #statement-pre-slider {

diff --git a/scss/_page.footer.scss b/scss/_page.footer.scss
index aae5435..9a1ffea 100644 (file)
--- a/scss/_page.footer.scss
+++ b/scss/_page.footer.scss
@@ -19,6 +19,13 @@ footer#page-footer {
             margin-top: 15px;
         }
     }
+    #blog-feed-front h3 a {
+        text-decoration: none;
+        border-bottom: 1px solid rgba(255, 255, 255, .5);
+        &:hover {
+            border-bottom-color: rgba(255,255,255,1);
+        }
+    }
     #webcam {
         img {
             border: 2px solid $white;

diff --git a/scss/_settings.scss b/scss/_settings.scss
index 5130891..cbf8641 100644 (file)
--- a/scss/_settings.scss
+++ b/scss/_settings.scss
@@ -228,7 +228,7 @@ $h5-font-size: rem-calc(24);
 $h6-font-size: rem-calc(22);
 
 // We use these to control header size reduction on small screens
-$h1-font-reduction: rem-calc(5);
+$h1-font-reduction: rem-calc(9);
 $h2-font-reduction: rem-calc(5);
 $h3-font-reduction: rem-calc(5);
 $h4-font-reduction: rem-calc(2);

diff --git a/scss/_sidebar.scss b/scss/_sidebar.scss
index a9f9380..3de5dc2 100644 (file)
--- a/scss/_sidebar.scss
+++ b/scss/_sidebar.scss
@@ -1,4 +1,5 @@
 .sidebar {
+    margin-top: 10px;
     h6 {
         color: $black;
         font-size: rem-calc(24);

diff --git a/single.php b/single.php
index 9f1199a..1cc0c24 100644 (file)
--- a/single.php
+++ b/single.php
@@ -2,7 +2,10 @@
 <main class="blog-single">
     <?php get_template_part('parts/statements');?>
     <div class="row">
-        <div id="blog-posts-over" class="small-12 medium-9 columns">
+        <div class="large-3 columns">
+            <?php get_sidebar(); ?>
+        </div>
+        <div id="blog-posts-over" class="small-12 medium-6 columns">
             <?php if(have_posts()) : while(have_posts()): the_post();?>
             <div class="row blog-post-container">
                 <div class="small-11 small-centered columns">
@@ -10,7 +13,7 @@
                         <div class="small-12 columns">
                             <article id="<?php the_ID()?>" <?php post_class()?>>
                                 <header class="entry-header">
-                                    <h2 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title();?></a></h2>
+                                    <h1 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title();?></a></h1>
                                     <?php if ( has_post_thumbnail() ):?>
                                              <?php if (get_post_type( $post ) != "ai1ec_event") { ?>
                                     <div class="featured-image-wrap"><?php the_post_thumbnail("large"); ?></div>
@@ -20,9 +23,6 @@
                                 </header>
                                 <?php echo the_content(); ?>
                             </article>
-                            <?php if ( comments_open() || get_comments_number() ) :
-                            comments_template();
-                            endif; ?>
                         </div>
                     </div>
                 </div>