Merge branch 'revisions' into develop

factor1 · Mar 14, 2017 · 10f28c1 · 10f28c1
2 parents 821c3d5 + 56e3090
commit 10f28c1
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 4,322 deletions.
diff --git a/assets/js/all.js b/assets/js/all.js
diff --git a/assets/js/theme.min.js b/assets/js/theme.min.js
diff --git a/functions.php b/functions.php
@@ -1,6 +1,6 @@
 <?php
 
-  define('PRELUDE_VERSION', '0.1.16');
+  define('PRELUDE_VERSION', '0.1.17');
 
   if ( !function_exists( 'prelude_features' ) ) {
 

diff --git a/header.php b/header.php
@@ -91,7 +91,7 @@
               </div>
               <span>Upload a File</span>
             </a>
-            <a href="#">
+            <a href="<?php echo get_home_url();?>/contact/">
               <div>
                 <img src="<?php bloginfo('template_url');?>/assets/img/contact.svg" alt="Contact">
               </div>

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

diff --git a/parts/contact-form.php b/parts/contact-form.php
@@ -7,7 +7,7 @@
     </div>
     <div class="col-4 stretch contact--info">
       <h3>
-        Headquarters
+        Office
       </h3>
       <div itemscope itemtype="http://schema.org/ContactPoint">
          <div itemscope itemtype="schema.org/PostalAddress">

diff --git a/parts/default-slider.php b/parts/default-slider.php
@@ -25,9 +25,6 @@
             <?php // Work Content Container ?>
             <div class="work-content">
 
-              <span class="post-data">
-                <?php the_field('date'); ?>
-              </span>
               <h4>
                 <a href="<?php echo $permalink;?>">
                   <?php the_sub_field('headline');?>

diff --git a/parts/solutions-single-grid.php b/parts/solutions-single-grid.php
@@ -54,4 +54,8 @@
     </div>
   </section>
 
+<?php else: ?>
+
+	<div style="width:100%;height:60px;"></div>
+
 <?php endif; wp_reset_postdata();
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.16
+Version: 0.1.17
 */