Gruntfile updates, searchFilter isset check, wordpress styles, cleaner glmPhotos...

diff --git a/Gruntfile.js b/Gruntfile.js
index 997e4d3..753734c 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,7 +12,7 @@ module.exports = function(grunt) {
         },
         files: {
           'css/app.css': 'scss/app.scss'
-        }        
+        }
       }
     },
 
@@ -46,8 +46,9 @@ module.exports = function(grunt) {
       },
       dist: {
         src: [
+          'js/dollarsign.js',
           'js/foundation/js/foundation.min.js',
-          'js/custom/*.js'
+          'js/custom/*.js',
         ],
 
         dest: 'js/app.js'
@@ -59,9 +60,15 @@ module.exports = function(grunt) {
       grunt: { files: ['Gruntfile.js'] },
 
       sass: {
-        files: 'scss/**/*.scss',
+        files: 'scss/**/*.{scss,sass}',
         tasks: ['sass']
+      },
+
+      scripts: {
+          files: ['js/custom/*.js'],
+          tasks: ['concat', 'uglify']
       }
+
     }
   });
 
@@ -71,7 +78,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-uglify');
 
-  grunt.registerTask('build', ['sass']);
-  grunt.registerTask('default', ['copy', 'uglify', 'concat', 'watch']);
-
-}
\ No newline at end of file
+  grunt.registerTask('build', ['sass', 'copy', 'uglify', 'concat']);
+  grunt.registerTask('runwatch', ['sass','uglify', 'concat']);
+  grunt.registerTask('default', ['runwatch','watch']);
+}

diff --git a/functions.php b/functions.php
index a0a78a5..c875b8d 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -44,9 +44,11 @@ function add_excerpts_to_pages() {
 }
 
 function SearchFilter($query) {
-    $searchType = $_GET["searchType"];
-    if ($searchType == 'blog') {
-        $query->set('post_type', 'post');
+    if(isset($_GET['search-type'])) {
+        $searchType = $_GET['searchType'];
+        if ($searchType == 'blog' && !is_admin()) {
+            $query->set('post_type', 'post');
+        }
     }
     return $query;
 }

diff --git a/nggallery/gallery-glmphotos.php b/nggallery/gallery-glmphotos.php
index 122942b..8170730 100644 (file)
--- a/nggallery/gallery-glmphotos.php
+++ b/nggallery/gallery-glmphotos.php
@@ -15,28 +15,10 @@ Follow variables are useable :
 <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?><?php if (!empty ($gallery)) : ?>
 
 <ul id='gallery' class='gallery row small-block-grid-2 medium-block-grid-3 large-block-grid-4'>
-<?php if ($gallery->show_slideshow) { ?>
-       <!-- Slideshow link -->
-       <div class="slideshowlink">
-               <a class="slideshowlink" href="<?php echo nextgen_esc_url($gallery->slideshow_link) ?>">
-                       <?php echo $gallery->slideshow_link_text ?>
-               </a>
-       </div>
-<?php } ?>
-
-<?php if ($gallery->show_piclens) { ?>
-       <!-- Piclense link -->
-       <div class="piclenselink">
-               <a class="piclenselink" href="<?php echo nextgen_esc_url($gallery->piclens_link) ?>">
-                       <?php _e('[View with PicLens]','nggallery'); ?>
-               </a>
-       </div>
-<?php } ?>
-       
        <!-- Thumbnails -->
     <?php $i = 0; ?>
        <?php foreach ( $images as $image ) : ?>
-       <li>
+        <li>
             <div id="ngg-image-<?php echo $image->pid ?>" class="ngg-gallery-thumbnail-box imgBorderMe" <?php echo $image->style ?> >
 
                 <div class="ngg-gallery-thumbnail" >

diff --git a/scss/app.scss b/scss/app.scss
index bd78177..7719f8a 100644 (file)
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -2,6 +2,7 @@
 @import "config/variables"; // Your custom variables
 @import "config/colors"; // Your custom color scheme
 @import "config/settings"; // Default settings file. Uncomment each setting you need to change
+@import "config/wordpress"
 
 /* Foundation 5 */
 @import "foundation"; // Foundation 5 by Zurb

diff --git a/scss/site/_structure.scss b/scss/site/_structure.scss
index 2a30a2d..3cf845d 100644 (file)
--- a/scss/site/_structure.scss
+++ b/scss/site/_structure.scss
@@ -1068,6 +1068,17 @@ footer {
     .ngg-album-gallery-image-counter {
         font-size: 13px;
     }
+    img.alignleft, img.alignright, img.aligncenter, div.wp-caption img {
+    border: 2px solid #b1b3b5;
+    }
+
+    .alignright {
+        float: right;
+    }
+
+    .alignleft {
+        float: left;
+    }
     /**
      * 4.2 Posts
      * ------------------------------------
@@ -1263,3 +1274,10 @@ footer {
     line-height: 1;
     margin-bottom: 30px;
 }
+
+/* For fixing cellphones not showing phone numbers because of goofy auto-coloring */
+a[href^=tel]{
+    color:inherit;
+    text-decoration:none;
+}
+/* */
\ No newline at end of file

diff --git a/scss/site/_wordpress.scss b/scss/site/_wordpress.scss
new file mode 100644 (file)
index 0000000..cc0a32e
--- /dev/null
+++ b/scss/site/_wordpress.scss
@@ -0,0 +1,124 @@
+/* Images */
+
+img.aligncenter {
+    display: block;
+    clear: both;
+    float:none;
+    padding:0;
+    margin-left: auto;
+    margin-right: auto;
+    }
+
+img.alignright {
+    padding: 0;
+    margin: 0 0 6px 11px;
+    display: inline;
+    }
+    
+blockquote.alignleft,
+img.alignleft,
+.wp-caption.alignleft {
+    margin: rem-calc(7) rem-calc(35) rem-calc(7) 0;
+}
+
+blockquote.alignright,
+img.alignright,
+.wp-caption.alignright {
+    margin: rem-calc(7) 0 rem-calc(7) rem-calc(35);
+}
+img.alignleft {
+    padding: 0;
+/*    margin: 0 11px 6px 0;*/
+    display: inline;
+    }
+img.alignleft, img.alignright, img.aligncenter, div.wp-caption img {
+    border: 1px solid #008000;
+}
+
+.alignright {
+    float: right;
+}
+.alignnone {
+    float: none;
+}
+.alignleft {
+    float: left;
+}
+.wp-caption {
+    background: #008000;
+    width: auto;
+}
+.wp-caption-text {
+    font-family: Open Sans, sans-serif;
+    font-size: 9px !important;
+    color: #fff;
+    font-style: italic;
+    margin: 0;
+    padding: 0 5px;
+}
+.gallery-one-title {
+    height: 45px;
+    font-size: 0.8em;
+    text-align: center;
+    font-family: sans-serif;
+    padding: 5px;
+}
+.gallery-holder {
+    margin: 10px 0 20px 0;
+}
+@media (max-width:640px) {
+    img.alignright, img.alignleft, img.aligncenter {
+        width: 70% !important;
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
+        float: none;
+        text-align: center;
+    }
+    div.wp-caption.alignright, div.wp-caption.alignleft {
+        width: 44% !important;
+        margin-left: auto;
+        margin-right: auto;
+        float: none;
+        text-align: center;
+    }
+    div.wp-caption.aligncenter {
+        width: 85% !important;
+        margin-left: auto;
+        margin-right: auto;
+        float: none;
+        text-align: center;
+    }
+    div.wp-caption.alignnone {
+        width: 85% !important;
+        float: none;
+    }
+    div.wp-caption.alignright, div.wp-caption.alignleft, div.wp-caption.aligncenter {
+        width: 100%;
+    }
+}
+@media (min-width:40.063em) {
+    img.aligncenter, img.alignnone {
+        width: 70% !important;
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
+        float: none;
+        text-align: center;
+    }
+    div.wp-caption.aligncenter {
+        width: 74% !important;
+        margin-left: auto;
+        margin-right: auto;
+        float: none;
+        text-align: center;
+    }
+    div.wp-caption.aligncenter {
+        width: 100%;
+    }
+    div.wp-caption.alignnone {
+        width: 73% !important;
+        float: none;
+    }
+}
+/* End Images */