Merge branch 'develop'

factor1 · Mar 7, 2017 · 30698d9 · 30698d9
2 parents 1356947 + 821c3d5
commit 30698d9
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git a/assets/css/theme.css b/assets/css/theme.css
diff --git a/assets/css/theme.min.css b/assets/css/theme.min.css
diff --git a/assets/scss/components/_footer.scss b/assets/scss/components/_footer.scss
@@ -28,6 +28,12 @@ footer.container{
   }
 }
 
+.google-map-link{
+  &:hover{
+    text-decoration: none;
+  }
+}
+
 .footer--social-icons{
   a{
     display: inline-block;

diff --git a/documentation/documentation.md b/documentation/documentation.md
@@ -11,3 +11,8 @@ you go to the Gallery page in WordPress and add images/items as you see fit.
 ## Our Work Sliders
 Per our pre-project planning, Our Work sliders are also individually managed and adding items
 to each page/slider as needed.
+
+## Solutions Single Grid
+On the solutions single page, the grid is populated by slug, matching posts from
+"Our Work" matching that category. For instance: /printing/ matches to Our Work posts
+categorized as 'printing'.
diff --git a/footer.php b/footer.php
@@ -43,14 +43,16 @@
         </div>
         <div class="col-4 sm-col-6 footer--address sm-text-left">
 
-          <div itemscope itemtype="http://schema.org/ContactPoint">
-             <div itemscope itemtype="schema.org/PostalAddress">
-                <span itemprop="streetAddress"><?php the_field('street_address', 'option');?></span>
-                <span itemprop="addressLocality"><?php the_field('city', 'option');?>,</span>
-                <span itemprop="addressRegion"> <?php the_field('state', 'option');?></span>
-                <span itemprop="postalCode"><?php the_field('zip_code', 'option');?></span>
-             </div>
-          </div>
+          <a href="<?php the_field('google_maps_link', 'option');?>" class="google-map-link">
+            <div itemscope itemtype="http://schema.org/ContactPoint">
+               <div itemscope itemtype="schema.org/PostalAddress">
+                  <span itemprop="streetAddress"><?php the_field('street_address', 'option');?></span>
+                  <span itemprop="addressLocality"><?php the_field('city', 'option');?>,</span>
+                  <span itemprop="addressRegion"> <?php the_field('state', 'option');?></span>
+                  <span itemprop="postalCode"><?php the_field('zip_code', 'option');?></span>
+               </div>
+            </div>
+          </a>
 
           <span>
             <strong>

diff --git a/functions.php b/functions.php
@@ -1,6 +1,6 @@
 <?php
 
-  define('PRELUDE_VERSION', '0.1.15');
+  define('PRELUDE_VERSION', '0.1.16');
 
   if ( !function_exists( 'prelude_features' ) ) {
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oneil",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "A custom WordPress theme for O'neil Printing",
   "main": "index.php",
   "scripts": {

diff --git a/style.css b/style.css
@@ -4,5 +4,5 @@ Theme URI:
 Author: Factor1
 Author URI: http://factor1studios.com
 Description: A custom WordPress theme for O'Neil Printing designed by Rule29 and developed by Factor1.
-Version: 0.1.15
+Version: 0.1.16
 */