v0.97.5 Release

safetrax · Dec 22, 2015 · 14f272a · 14f272a
1 parent 18e012a
commit 14f272a
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 53 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -514,7 +514,7 @@ module.exports = function(grunt) {
             linebreak: true
           },
           files: {
-            src: [ 'extras/**/*','dist/css/*.css', 'dist/js/*.js']
+            src: [ 'dist/css/*.css', 'dist/js/*.js']
           }
         }
       },

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 
 Materialize, a CSS Framework based on material design
 
-### Current Version : v0.97.4
+### Current Version : v0.97.5
 
 ## Sass Requirements:
 - Ruby Sass 3.3+, LibSass 0.6+
@@ -14,6 +14,8 @@ Materialize, a CSS Framework based on material design
 Chrome 35+, Firefox 31+, Safari 7+, IE 10+
 
 ## Changelog
+- v0.97.5 (Dec 21, 2015)
+  - Fixed Meteor package crash
 - v0.97.4 (Dec 20, 2015)
   - Added Jasmine testing with Travis CI
   - Select bugfixes

diff --git a/bin/materialize-src-v0.97.4.zip → bin/materialize-src-v0.97.5.zip b/bin/materialize-src-v0.97.4.zip → bin/materialize-src-v0.97.5.zip
diff --git a/bin/materialize-v0.97.4.zip → bin/materialize-v0.97.5.zip b/bin/materialize-v0.97.4.zip → bin/materialize-v0.97.5.zip
diff --git a/dist/css/materialize.css b/dist/css/materialize.css
@@ -1,5 +1,5 @@
 /*!
- * Materialize v0.97.4 (http://materializecss.com)
+ * Materialize v0.97.5 (http://materializecss.com)
  * Copyright 2014-2015 Materialize
  * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
  */

diff --git a/dist/css/materialize.min.css b/dist/css/materialize.min.css
diff --git a/dist/js/materialize.js b/dist/js/materialize.js
@@ -1,11 +1,18 @@
 /*!
- * Materialize v0.97.4 (http://materializecss.com)
+ * Materialize v0.97.5 (http://materializecss.com)
  * Copyright 2014-2015 Materialize
  * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
  */
 // Check for jQuery.
 if (typeof(jQuery) === 'undefined') {
-  var jQuery = $ = require('jQuery');
+  var jQuery;
+  // Check if require is a defined function.
+  if (typeof(require) === 'function') {
+    jQuery = $ = require('jQuery');
+  // Else use the dollar sign alias.
+  } else {
+    jQuery = $;
+  }
 };/*
  * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
  *

diff --git a/dist/js/materialize.min.js b/dist/js/materialize.min.js
diff --git a/extras/noUiSlider/nouislider.css b/extras/noUiSlider/nouislider.css
@@ -1,20 +1,5 @@
 /*!
- * Materialize v0.97.4 (http://materializecss.com)
- * Copyright 2014-2015 Materialize
- * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
- */
-/*!
- * Materialize v0.97.3 (http://materializecss.com)
- * Copyright 2014-2015 Materialize
- * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
- */
-/*!
- * Materialize v0.97.2 (http://materializecss.com)
- * Copyright 2014-2015 Materialize
- * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
- */
-/*!
- * Materialize v0.97.1 (http://materializecss.com)
+ * Materialize v0.97.5 (http://materializecss.com)
  * Copyright 2014-2015 Materialize
  * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
  */

diff --git a/extras/noUiSlider/nouislider.js b/extras/noUiSlider/nouislider.js
@@ -1,20 +1,5 @@
 /*!
- * Materialize v0.97.4 (http://materializecss.com)
- * Copyright 2014-2015 Materialize
- * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
- */
-/*!
- * Materialize v0.97.3 (http://materializecss.com)
- * Copyright 2014-2015 Materialize
- * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
- */
-/*!
- * Materialize v0.97.2 (http://materializecss.com)
- * Copyright 2014-2015 Materialize
- * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
- */
-/*!
- * Materialize v0.97.1 (http://materializecss.com)
+ * Materialize v0.97.5 (http://materializecss.com)
  * Copyright 2014-2015 Materialize
  * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
  */

diff --git a/extras/noUiSlider/nouislider.min.js b/extras/noUiSlider/nouislider.min.js
diff --git a/getting-started.html b/getting-started.html
@@ -134,23 +134,23 @@ <h2 class="col s12 header">Download</h2>
         <div class="col s12 m6">
           <p class="promo-caption">Materialize</p>
           <p>This is the standard version that comes with both the minified and unminified CSS and JavaScript files. This option requires little to no setup. Use this if you are unfamiliar with Sass.</p>
-          <a id="download-source" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-v0.97.4.zip">Materialize<i class="material-icons right">file_download</i></a>
+          <a id="download-source" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-v0.97.5.zip">Materialize<i class="material-icons right">file_download</i></a>
         </div>
         <div class="col s12 m6">
           <p class="promo-caption">Sass</p>
           <p>This version contains the source SCSS files. By choosing this version you have more control over which components to include. You will need a Sass compiler if you choose this option.</p>
-          <a id="download-sass" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-src-v0.97.4.zip">Source<i class="material-icons right">file_download</i></a>
+          <a id="download-sass" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-src-v0.97.5.zip">Source<i class="material-icons right">file_download</i></a>
         </div>
         <div class="col s12">
           <br>
           <p class="promo-caption">CDN</p>
           <p>You can find all the versions of the CDN at <a href="https://cdnjs.com/libraries/materialize">cdnjs</a>.</p>
           <pre><code class="language-markup">
   &lt;!-- Compiled and minified CSS -->
-  &lt;link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.4/css/materialize.min.css">
+  &lt;link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/css/materialize.min.css">
 
   &lt;!-- Compiled and minified JavaScript -->
-  &lt;script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.4/js/materialize.min.js">&lt;/script>
+  &lt;script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/js/materialize.min.js">&lt;/script>
           </code></pre>
         </div>
         <div class="col s12">

diff --git a/index.html b/index.html
@@ -113,7 +113,7 @@ <h4 class ="header col s12 light center">A modern responsive front-end framework
           <div class="row center">
             <a href="http://materializecss.com/getting-started.html" id="download-button" class="btn-large waves-effect waves-light">Get Started</a>
           </div>
-          <div class="row center"><a class="red-text text-lighten-4" href="https://github.com/Dogfalo/materialize">alpha release v0.97.4</a></div>
+          <div class="row center"><a class="red-text text-lighten-4" href="https://github.com/Dogfalo/materialize">alpha release v0.97.5</a></div>
 
           <div class="buysellads-header row center">
             <!-- CarbonAds Zone Code -->

diff --git a/jade/getting_started/getting_started_content.html b/jade/getting_started/getting_started_content.html
@@ -29,23 +29,23 @@ <h2 class="col s12 header">Download</h2>
         <div class="col s12 m6">
           <p class="promo-caption">Materialize</p>
           <p>This is the standard version that comes with both the minified and unminified CSS and JavaScript files. This option requires little to no setup. Use this if you are unfamiliar with Sass.</p>
-          <a id="download-source" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-v0.97.4.zip">Materialize<i class="material-icons right">file_download</i></a>
+          <a id="download-source" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-v0.97.5.zip">Materialize<i class="material-icons right">file_download</i></a>
         </div>
         <div class="col s12 m6">
           <p class="promo-caption">Sass</p>
           <p>This version contains the source SCSS files. By choosing this version you have more control over which components to include. You will need a Sass compiler if you choose this option.</p>
-          <a id="download-sass" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-src-v0.97.4.zip">Source<i class="material-icons right">file_download</i></a>
+          <a id="download-sass" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-src-v0.97.5.zip">Source<i class="material-icons right">file_download</i></a>
         </div>
         <div class="col s12">
           <br>
           <p class="promo-caption">CDN</p>
           <p>You can find all the versions of the CDN at <a href="https://cdnjs.com/libraries/materialize">cdnjs</a>.</p>
           <pre><code class="language-markup">
   &lt;!-- Compiled and minified CSS -->
-  &lt;link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.4/css/materialize.min.css">
+  &lt;link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/css/materialize.min.css">
 
   &lt;!-- Compiled and minified JavaScript -->
-  &lt;script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.4/js/materialize.min.js">&lt;/script>
+  &lt;script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/js/materialize.min.js">&lt;/script>
           </code></pre>
         </div>
         <div class="col s12">

diff --git a/jade/index/index_content.html b/jade/index/index_content.html
@@ -8,7 +8,7 @@ <h4 class ="header col s12 light center">A modern responsive front-end framework
           <div class="row center">
             <a href="http://materializecss.com/getting-started.html" id="download-button" class="btn-large waves-effect waves-light">Get Started</a>
           </div>
-          <div class="row center"><a class="red-text text-lighten-4" href="https://github.com/Dogfalo/materialize">alpha release v0.97.4</a></div>
+          <div class="row center"><a class="red-text text-lighten-4" href="https://github.com/Dogfalo/materialize">alpha release v0.97.5</a></div>
 
           <div class="buysellads-header row center">
             <!-- CarbonAds Zone Code -->

diff --git a/package.js b/package.js
@@ -3,7 +3,7 @@
 Package.describe({
   name: 'materialize:materialize',  // http://atmospherejs.com/materialize/materialize
   summary: 'Materialize (official): A modern responsive front-end framework based on Material Design',
-  version: '0.97.4',
+  version: '0.97.5',
   git: 'https://github.com/Dogfalo/materialize.git'
 });
 

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "Builds Materialize distribution packages",
   "author": "Alvin Wang, Alan Chang",
   "url": "http://materializecss.com/",
-  "version": "0.97.4",
+  "version": "0.97.5",
   "main": "bin/materialize.js",
   "license": "MIT",
   "repository": {

diff --git a/templates/parallax-template.zip b/templates/parallax-template.zip
diff --git a/templates/starter-template.zip b/templates/starter-template.zip