Merge pull request #1 from fanfarian/develop

Develop
fanfarian · Mar 31, 2017 · 5b34c01 · 5b34c01
2 parents 56c82fb + c8da490
commit 5b34c01
Show file tree

Hide file tree

Showing 153 changed files with 12,445 additions and 2,692 deletions.
diff --git a/assets/css/style.css b/assets/css/style.css
diff --git a/assets/css/style.css.map b/assets/css/style.css.map
diff --git a/assets/js/foundation.js b/assets/js/foundation.js
@@ -13,4 +13,4 @@ jQuery(document).ready(function() {
 
 	// Makes sure last grid item floats left
 	jQuery('.archive-grid .columns').last().addClass( 'end' );	
-});
+});
diff --git a/assets/js/foundation.min.js b/assets/js/foundation.min.js
diff --git a/assets/js/jquery-migrate-3.0.0.min.js b/assets/js/jquery-migrate-3.0.0.min.js
diff --git a/bower.json b/bower.json
@@ -12,8 +12,8 @@
     "jquery": "^2.2.2"
   },
   "resolutions": {
-    "what-input": "~4.0.3",
-    "jquery": "^2.2.2",
+    "what-input": "^4.0.6",
+    "jquery": "^3.1.1",
     "fontfaceobserver": "^2.0.1"
   }
 }
diff --git a/favicon.png b/favicon.png
diff --git a/footer.php b/footer.php
@@ -1,28 +1,27 @@
-						<footer class="footer" role="contentinfo">
-							<section id="inner-footer" class="row">
-
-								<div class="small-12 columns">
-									<nav role="navigation">
-			    						<?php sr_footer_menu(); ?>
-			    					</nav>
-			    				</div>
-
-								<?php if ( is_active_sidebar( 'sr-footer' ) ) : ?>
-									<div id="sidebar-sr-footer" class="small-12 columns">
-										<?php dynamic_sidebar( 'sr-footer' ); ?>
-									</div>
-								<?php endif; ?>
-
-								<div class="small-12 columns">
-									<p class="source-org copyright">&copy; <?php echo date('Y'); ?> <?php bloginfo('name'); ?>.</p>
+					<footer class="footer" role="contentinfo">
+						<section id="inner-footer" class="row">
+
+							<div class="small-12 columns">
+								<nav role="navigation">
+		    						<?php sr_footer_menu(); ?>
+		    					</nav>
+		    				</div>
+
+							<?php if ( is_active_sidebar( 'sr-footer' ) ) : ?>
+								<div id="sidebar-sr-footer" class="small-12 columns">
+									<?php dynamic_sidebar( 'sr-footer' ); ?>
 								</div>
-
-							</section> <!-- end #inner-footer -->
-						</footer> <!-- end .footer -->
-
-					</section> <!-- end .main-content -->
-				</div>  <!-- end .off-canvas-content -->
-			</div> <!-- end .off-canvas-wrapper-inner -->
+							<?php endif; ?>
+
+							<div class="small-12 columns">
+								<p class="source-org copyright">&copy; <?php echo date('Y'); ?> <?php bloginfo('name'); ?>.</p>
+							</div>
+
+						</section> <!-- end #inner-footer -->
+					</footer> <!-- end .footer -->
+
+				</section> <!-- end .main-content -->
+			</div>  <!-- end .off-canvas-content -->
 		</div> <!-- end .off-canvas-wrapper -->
 		<?php wp_footer(); ?>
 	</body>

diff --git a/header.php b/header.php
@@ -21,19 +21,18 @@
 	<body <?php body_class(); ?>>
 
 		<div class="off-canvas-wrapper">
-
-			<div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
-
-				<!-- Include 'offcanvas-left' for navigation on the left side	-->
-				<?php // get_template_part( 'parts/content', 'offcanvas-right' ); ?>
+
+			<!-- Include 'offcanvas-left' for navigation on the left side	-->
+			<?php // get_template_part( 'parts/content', 'offcanvas-right' ); ?>
 
-				<div class="off-canvas-content" data-off-canvas-content>
+			<div class="off-canvas-content" data-off-canvas-content>
 
-					<header class="header" role="banner">
+				<header id="top" class="header" role="banner">
 
-						 <!-- Include your navigation here, please see /template-parts for other styles -->
-						<?php get_template_part( 'parts/nav', 'title-bar' ); ?>
+					 <!-- Include your navigation here, please see /template-parts for other styles -->
+					<?php get_template_part( 'parts/nav', 'title-bar' ); ?>
 
-					</header> <!-- end .header -->
+				</header> <!-- end .header -->
 
-					<section id="ajax-content" class="main-content">
+				<section id="ajax-content" class="main-content">
+
diff --git a/library/functions/enqueue-scripts-styles.php b/library/functions/enqueue-scripts-styles.php
@@ -10,14 +10,16 @@ function sr_enqueue_scripts_styles()
 	wp_enqueue_style( 'sr-theme', get_template_directory_uri() . '/assets/css/style.css', array(), '', 'all' );
 
 	// Load What-Input files in footer
-	wp_enqueue_script( 'what-input', get_template_directory_uri() . '/library/vendor/what-input/dist/what-input.min.js', array(), '4.0.4', true );				// What-Input plugin for input specific styles with foundation
+	wp_enqueue_script( 'what-input', get_template_directory_uri() . '/library/vendor/what-input/dist/what-input.min.js', array(), '4.0.6', true );				// What-Input plugin for input specific styles with foundation
 
 	// use newest jquery from /library/vendor/
 	wp_deregister_script('jquery');																																// disable WP internal jquery for own version
-	wp_enqueue_script( 'jquery', get_template_directory_uri() . '/library/vendor/jquery/dist/jquery.min.js', array( ), '2.2.3', true );
+	wp_enqueue_script( 'jquery', get_template_directory_uri() . '/library/vendor/jquery/dist/jquery.min.js', array( ), '3.1.1', true );
+	wp_deregister_script('jquery-migrate');																														// disable WP internal jquery-migrate for own version
+	wp_enqueue_script( 'jquery-migrate', get_template_directory_uri() . '/assets/js/jquery-migrate-3.0.0.min.js', array( ), '3.0.0', true );
 
 	// Adding Foundation scripts file in the footer
-	wp_enqueue_script( 'foundation', get_template_directory_uri() . '/assets/js/foundation.min.js', array( 'jquery', 'what-input' ), '6.2.3', true );
+	wp_enqueue_script( 'foundation', get_template_directory_uri() . '/assets/js/foundation.min.js', array( 'jquery', 'what-input' ), '6.3.0', true );			// Foundation init + js
 
 
 	// enqueue comment js

diff --git a/library/vendor/fontfaceobserver/.bower.json b/library/vendor/fontfaceobserver/.bower.json
@@ -19,12 +19,12 @@
     "events"
   ],
   "homepage": "https://github.com/bramstein/fontfaceobserver",
-  "version": "2.0.7",
-  "_release": "2.0.7",
+  "version": "2.0.8",
+  "_release": "2.0.8",
   "_resolution": {
     "type": "version",
-    "tag": "v2.0.7",
-    "commit": "636d07ae4dcbbe95449e95b76c3bda50f577f278"
+    "tag": "v2.0.8",
+    "commit": "afc6bc6a2ac22ce37a999ac170b047702832cb3d"
   },
   "_source": "https://github.com/bramstein/fontfaceobserver.git",
   "_target": "^2.0.1",

diff --git a/library/vendor/fontfaceobserver/Gruntfile.js b/library/vendor/fontfaceobserver/Gruntfile.js
@@ -1,6 +1,8 @@
 var extend = require('extend');
 
 module.exports = function (grunt) {
+  require('google-closure-compiler').grunt(grunt);
+
   var compilerOptions = {
     compilation_level: 'ADVANCED_OPTIMIZATIONS',
     warning_level: 'VERBOSE',
@@ -11,6 +13,14 @@ module.exports = function (grunt) {
     externs: ['externs-commonjs.js']
   };
 
+  var src = [
+    'node_modules/closure-dom/src/dom.js',
+    'src/descriptors.js',
+    'src/ruler.js',
+    'src/observer.js',
+    'exports.js'
+  ];
+
   grunt.initConfig({
     clean: {
       options: {
@@ -38,26 +48,22 @@ module.exports = function (grunt) {
         '-W092': true
       }
     },
-    closurecompiler: {
+    'closure-compiler': {
       dist: {
         files: {
-          'fontfaceobserver.js': ['src/**/*.js', 'exports.js', 'node_modules/closure-dom/src/dom.js']
+          'fontfaceobserver.js': src
         },
-        options: extend({}, compilerOptions, {
-          define: 'DEBUG=false'
-        })
+        options: compilerOptions
       },
       compile: {
         files: {
-          'build/fontfaceobserver.js': ['src/**/*.js', 'exports.js', 'node_modules/closure-dom/src/dom.js'],
+          'build/fontfaceobserver.js': src
         },
-        options: extend({}, compilerOptions, {
-          define: 'DEBUG=false'
-        })
+        options: compilerOptions
       },
       debug: {
         files: {
-          'build/fontfaceobserver.debug.js': ['src/**/*.js', 'exports.js', 'node_modules/closure-dom/src/dom.js']
+          'build/fontfaceobserver.debug.js': src
         },
         options: extend({}, compilerOptions, {
           debug: true,
@@ -83,9 +89,9 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-exec');
 
-  grunt.registerTask('compile', ['closurecompiler:compile']);
-  grunt.registerTask('debug', ['closurecompiler:debug']);
+  grunt.registerTask('compile', ['closure-compiler:compile']);
+  grunt.registerTask('debug', ['closure-compiler:debug']);
   grunt.registerTask('default', ['compile']);
   grunt.registerTask('test', ['jshint', 'exec:test']);
-  grunt.registerTask('dist', ['clean', 'closurecompiler:compile', 'concat:dist', 'concat:dist_promises']);
+  grunt.registerTask('dist', ['clean', 'closure-compiler:compile', 'concat:dist', 'concat:dist_promises']);
 };
diff --git a/library/vendor/fontfaceobserver/exports.js b/library/vendor/fontfaceobserver/exports.js
@@ -1,10 +1,5 @@
 goog.require('fontface.Observer');
 
-/**
- * @define {boolean} DEBUG
- */
-var DEBUG = true;
-
 if (typeof module !== 'undefined') {
   module.exports = fontface.Observer;
 } else {
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,4 @@ jQuery(document).ready(function() { @@
     	// Makes sure last grid item floats left
     	jQuery('.archive-grid .columns').last().addClass( 'end' );
-    });
+    });