Merge pull request #1 from Dogfalo/master

pulling latest to resolve conflicts on my PR

CHANGELOG.md

@@ -1,3 +1,41 @@
+## v0.97.3 (Nov 15, 2015)
+- Meteor font issues fixed
+- Select rendering issue fixed
+- Added Push and Pull to grid
+- Dynamic accordion appends fixed
+
+## v0.97.2 (Nov 8, 2015)
+- Image support inside select
+- Optgroup supported in select
+- Multiple select added
+- Card styling fixes
+- Breadcrumbs added
+- Scrollable tabs
+- Tooltips and dropdowns position themselves more intelligently inside the window
+- FAB menu is click-toggleable
+- Horizontal FAB support added
+
+## v0.97.1 (Sep 13, 2015)
+- Added new range slider with uses noUiSlider to provide powerful options
+- Added CSS for Chips
+- Toasts support adding of html elements
+- Fixed select destroy/creation bug
+- Bugfixes for dropdown, badges, collections, scrollfire
+- Added default preloader color variable
+- File input now supports multiple files and dynamically loaded elements
+
+## v0.97.0 (June 21, 2015)
+- **Documentation changed to use Official Google Icon web font**
+- **Input errors added**
+- Flicker on Firefox on dropdowns fixed
+- Pagination made more responsive
+- Modal now prevents scrolling
+- Modal animation added
+- Support for multiple modals added
+- Programmatic control of FAB to open/close added
+- Programmatic control of slider to play/pause added
+- Plus many more bug fixes
+
 ## v0.96.0 (April 1, 2015)
 - Toasts, transitions, scrollfire added under Materialize namespace
 - Dropdown is now created as a child of its parent

README.md

@@ -5,7 +5,7 @@
 
 [Materialize](http://materializecss.com/), a CSS Framework based on material design
 
-### Current Version : v0.97.6
+### Current Version : v0.97.7
 
 ## Sass Requirements:
 - Ruby Sass 3.3+, LibSass 0.6+
@@ -14,6 +14,13 @@
 Chrome 35+, Firefox 31+, Safari 7+, IE 10+
 
 ## Changelog
+- v0.97.7 (July 23rd)
+  - Basic horizontal cards
+  - Carousel bug fixes and new features
+  - Updated sidenav styles and new component
+  - Meteor package now supports Sass
+  - Autocomplete form component
+  - Chips jQuery plugin
 - v0.97.6 (April 1st)
   - **Removed deprecated material icons from project**
   - **Changed /font directory to /fonts**
@@ -31,40 +38,7 @@ Chrome 35+, Firefox 31+, Safari 7+, IE 10+
   - Grid Offset bugfix
   - Dropdown overflow bugfix
   - Range slider error bugfix
-- v0.97.3 (Nov 15, 2015)
-  - Meteor font issues fixed
-  - Select rendering issue fixed
-  - Added Push and Pull to grid
-  - Dynamic accordion appends fixed
-- v0.97.2 (Nov 8, 2015)
-  - Image support inside select
-  - Optgroup supported in select
-  - Multiple select added
-  - Card styling fixes
-  - Breadcrumbs added
-  - Scrollable tabs
-  - Tooltips and dropdowns position themselves more intelligently inside the window
-  - FAB menu is click-toggleable
-  - Horizontal FAB support added
-- v0.97.1 (Sep 13, 2015)
-  - Added new range slider with uses noUiSlider to provide powerful options
-  - Added CSS for Chips
-  - Toasts support adding of html elements
-  - Fixed select destroy/creation bug
-  - Bugfixes for dropdown, badges, collections, scrollfire
-  - Added default preloader color variable
-  - File input now supports multiple files and dynamically loaded elements
-- v0.97.0 (June 21, 2015)
-  - **Documentation changed to use Official Google Icon web font**
-  - **Input errors added**
-  - Flicker on Firefox on dropdowns fixed
-  - Pagination made more responsive
-  - Modal now prevents scrolling
-  - Modal animation added
-  - Support for multiple modals added
-  - Programmatic control of FAB to open/close added
-  - Programmatic control of slider to play/pause added
-  - Plus many more bug fixes
+
 
 
 ## Contributing

bin/materialize.css

@@ -2657,27 +2657,27 @@ a {
 }
 
 .z-depth-1, nav, .card-panel, .card, .toast, .btn, .btn-large, .btn-floating, .dropdown-content, .collapsible, .side-nav {
-  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
 }
 
 .z-depth-1-half, .btn:hover, .btn-large:hover, .btn-floating:hover {
-  box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.18), 0 4px 15px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 7px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -1px rgba(0, 0, 0, 0.2);
 }
 
 .z-depth-2 {
-  box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+  box-shadow: 0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12), 0 2px 4px -1px rgba(0, 0, 0, 0.3);
 }
 
 .z-depth-3 {
-  box-shadow: 0 12px 15px 0 rgba(0, 0, 0, 0.24), 0 17px 50px 0 rgba(0, 0, 0, 0.19);
+  box-shadow: 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12), 0 3px 5px -1px rgba(0, 0, 0, 0.3);
 }
 
 .z-depth-4, .modal {
-  box-shadow: 0 16px 28px 0 rgba(0, 0, 0, 0.22), 0 25px 55px 0 rgba(0, 0, 0, 0.21);
+  box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.3);
 }
 
 .z-depth-5 {
-  box-shadow: 0 27px 24px 0 rgba(0, 0, 0, 0.2), 0 40px 77px 0 rgba(0, 0, 0, 0.22);
+  box-shadow: 0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.3);
 }
 
 .hoverable {
@@ -6882,6 +6882,7 @@ input[type=range]:focus::-ms-fill-upper {
 .side-nav li > a > [class^="mdi-"], .side-nav li > a > [class*="mdi-"],
 .side-nav li > a > i.material-icons {
   float: left;
+  height: 48px;
   line-height: 48px;
   margin: 0 32px 0 0;
   width: 24px;
@@ -7015,7 +7016,7 @@ input[type=range]:focus::-ms-fill-upper {
   right: 0;
   height: 120vh;
   background-color: rgba(0, 0, 0, 0.5);
-  z-index: 997;
+  z-index: 998;
   will-change: opacity;
 }
 
@@ -7675,6 +7676,7 @@ input[type=range]:focus::-ms-fill-upper {
 }
 
 .carousel .carousel-item {
+  display: none;
   width: 200px;
   height: 400px;
   position: absolute;

carousel.html

@@ -182,6 +182,10 @@ <h4>jQuery Plugin Options</h4>
               <td>indicators</td>
               <td>Set to true to show indicators. (Default: false)</td>
             </tr>
+            <tr>
+              <td>no_wrap</td>
+              <td>Don't wrap around and cycle through items. (Default: false)</td>
+            </tr>
           </tbody>
         </table>
         <br>

collapsible.html

@@ -186,9 +186,7 @@ <h4>Initialization</h4>
         <p>Collapsible elements only need initialization if they are added dynamically. You can also pass in options inside the initialization, however this can be done in the HTML markup as well.</p>
         <pre><code class="language-javascript">
   $(document).ready(function(){
-    $('.collapsible').collapsible({
-      accordion : false // A setting that changes the collapsible behavior to expandable instead of the default accordion style
-    });
+    $('.collapsible').collapsible();
   });
         </code></pre>
 
@@ -214,8 +212,20 @@ <h5>Preselected Section</h5>
         </code></pre>
       </div>
 
-      <div id="options" class="section scrollspy">
+      <div id="options" class="scrollspy section">
         <h4>Options</h4>
+        <p>You can customize the behavior of each collapsible using these options. For example, you can call a custom function to run when a collapsbile is opened or closed. The function passes the <span class="language-markup">li</span> element that was opened or closed as an argument.</p>
+        <pre><code class="language-javascript">
+  $('.collapsible').collapsible({
+      accordion: false, // A setting that changes the collapsible behavior to expandable instead of the default accordion style
+      onOpen: function(el) { alert('Open'); }, // Callback for Collapsible open
+      onClose: function(el) { alert('Closed'); } // Callback for Collapsible close
+    }
+  );
+        </code></pre>
+        <br><br>
+
+        <h4>Collapsible Types</h4>
         <p>There are two ways a collapsible can behave. It can either allow multiple sections to stay open, or it can only allow one section to stay open at a time, which is called an accordion. See below for a demo of each type</p>
       </div>
       <div id="accordion" class="section scrollspy">
@@ -288,6 +298,7 @@ <h4>Options</h4>
             <li><a href="#popout">Popout</a></li>
             <li><a href="#structure">Structure</a></li>
             <li><a href="#intialization">Initialization</a></li>
+            <li><a href="#options">Options</a></li>
             <li><a href="#accordion">Accordion</a></li>
             <li><a href="#expandable">Expandable</a></li>
           </ul>