projects / WP-Themes / ParrotsLanding.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2043ab8)
JS calls put into functions, slideshow enabled
authorLaury GvR <laury@gaslightmedia.com>
Fri, 2 Jan 2015 17:56:50 +0000 (12:56 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 2 Jan 2015 17:56:50 +0000 (12:56 -0500)
footer.php patch | blob | history
functions.php patch | blob | history
header.php patch | blob | history
js/dollarsign.js [new file with mode: 0644] patch | blob
style.css patch | blob | history

diff --git a/footer.php b/footer.php
index 4f0183c..bf965a6 100755 (executable)
--- a/footer.php
+++ b/footer.php
@@ -13,8 +13,6 @@
             </div> <!-- inner-wrap -->
         </div> <!-- off-canvas-wrap -->
         <?php wp_footer();?>
-        <script src="<?php bloginfo('template_url'); ?>/js/vendor/jquery.js"></script>
-        <script src="<?php bloginfo('template_url'); ?>/js/foundation.min.js"></script>
         <script>
             jQuery(window).resize( function() {
                 if(jQuery(window).width() <= 640) {
diff --git a/functions.php b/functions.php
index be4ff71..00bdc0a 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -35,6 +35,34 @@ if (!function_exists('glm_quicksite_widget_init')) {
 
 }      
 
+/**
+ * site_scripts()
+ *
+ * Add the scripts that we'll need for any home page stuff
+ */
+function site_scripts()
+{
+    wp_enqueue_script(
+        'modernizr',
+        get_template_directory_uri() . '/js/vendor/modernizr.js'
+    );
+    wp_enqueue_script(
+        'jquery',
+        get_template_directory_uri() . '/js/vendor/jquery.js'
+    );
+    wp_enqueue_script(
+        'dollarsign',
+        get_template_directory_uri() . '/js/dollarsign.js'
+    );
+    wp_enqueue_script(
+        'foundation',
+        get_template_directory_uri() . '/js/foundation.min.js',
+        'jquery',
+        '1.0',
+        true
+    );
+}
+add_action('wp_enqueue_scripts', 'site_scripts');
 
 
 if (!function_exists('glm_wp_list_pages')) {
diff --git a/header.php b/header.php
index b5f67e1..66d813c 100755 (executable)
--- a/header.php
+++ b/header.php
@@ -10,7 +10,6 @@
 <link rel="stylesheet" href="<?php bloginfo('template_url'); ?>/css/foundation.css" />
 <link type="text/css" rel="stylesheet" href="<?php echo get_template_directory_uri();?>/qs.css">
 <link type="text/css" rel="stylesheet" href="<?php echo get_stylesheet_uri();?>">
-<script src="<?php bloginfo('template_url'); ?>/js/vendor/modernizr.js"></script>
 <!-- Google Analytics Code -->
 </head>
 <body>
diff --git a/js/dollarsign.js b/js/dollarsign.js
new file mode 100644 (file)
index 0000000..34d34e5
--- /dev/null
+++ b/js/dollarsign.js
@@ -0,0 +1,8 @@
+/* 
+ * To avoid conflicts, Wordpress tends to prefer jQuery being used over $.
+ * As long as this file is included, no such conflicts should arise. Ensure it
+ * is called before other .js files using $.
+ */
+
+
+var $=jQuery.noConflict();
diff --git a/style.css b/style.css
index ab38fa7..0d105ed 100755 (executable)
--- a/style.css
+++ b/style.css
@@ -482,11 +482,23 @@ ul, ol, dl {
 
 /* Nextgen Gallery */
 
-/* End Nextgen Gallery */
 .ngg-gallery-thumbnail-box,
 .ngg-gallery-thumbnail {
     width: 100%;
 }
+/* End Nextgen Gallery */
+
+/* MetaSlider */
+#toolbox .metaslider .slides li,
+.metaslider .slides li {
+    padding: 0;
+}
+#toolbox .metaslider .slides li img,
+.metaslider .slides li img {
+    margin: 0;
+}
+/* End MetaSlider */
+
 /* */
 
 /* End */
\ No newline at end of file