v0.96.1 Release

Dogfalo · Apr 6, 2015 · b3698e6 · b3698e6
1 parent 1e2cde9
commit b3698e6
Show file tree

Hide file tree

Showing 16 changed files with 164 additions and 130 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/Dogfalo/materialize?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 Materialize, a CSS Framework based on material design
 
-### Current Version : v0.96.0
+### Current Version : v0.96.1
 
 ## Sass Requirements:
 - Ruby Sass 3.3+, LibSass 0.6+

diff --git a/bin/materialize-src-v0.96.0.zip → bin/materialize-src-v0.96.1.zip b/bin/materialize-src-v0.96.0.zip → bin/materialize-src-v0.96.1.zip
diff --git a/bin/materialize-v0.96.0.zip → bin/materialize-v0.96.1.zip b/bin/materialize-v0.96.0.zip → bin/materialize-v0.96.1.zip
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Materialize",
-  "version": "0.96.0",
+  "version": "0.96.1",
   "description": "A modern responsive front-end framework based on Material Design",
   "keywords": [
     "css",

diff --git a/dist/css/materialize.css b/dist/css/materialize.css
@@ -1,5 +1,5 @@
 /*!
- * Materialize v0.96.0 (http://materializecss.com)
+ * Materialize v0.96.1 (http://materializecss.com)
  * Copyright 2014-2015 Materialize
  * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
  */
@@ -2102,17 +2102,6 @@ img.responsive-img, video.responsive-video {
     transform: translate3d(0, 0, 0);
     transform: translateX(-50%); }
 
-@media only screen and (max-width : 600px) {
-  .parallax-container {
-    height: auto; }
-    .parallax-container .parallax {
-      position: relative; }
-      .parallax-container .parallax img {
-        position: relative;
-        min-height: 0;
-        min-width: 0;
-        width: 100%; } }
-
 .pin-top, .pin-bottom {
   position: relative; }
 
@@ -2363,6 +2352,8 @@ span.badge {
   padding-top: 30px;
   height: 0;
   overflow: hidden; }
+  .video-container.no-controls {
+    padding-top: 0; }
   .video-container iframe, .video-container object, .video-container embed {
     position: absolute;
     top: 0;
@@ -5689,9 +5680,6 @@ button.btn-floating {
   .btn-large i {
     font-size: 1.6rem; }
 
-.dropdown-button {
-  position: relative; }
-
 .dropdown-content {
   background-color: #FFFFFF;
   margin: 0;
@@ -6114,6 +6102,29 @@ input[type=text], input[type=password], input[type=email], input[type=url], inpu
       width: 80%;
       width: calc(100% - 3rem); } }
 
+.input-field input[type=search] {
+  display: block;
+  line-height: inherit;
+  padding-left: 4rem;
+  width: calc(100% - 4rem); }
+  .input-field input[type=search]:focus {
+    background-color: #FFF;
+    border: 0;
+    box-shadow: none;
+    color: #444; }
+    .input-field input[type=search]:focus + label i, .input-field input[type=search]:focus ~ .mdi-navigation-close {
+      color: #444; }
+  .input-field input[type=search] + label {
+    left: 1rem; }
+  .input-field input[type=search] ~ .mdi-navigation-close {
+    position: absolute;
+    top: 0;
+    right: 1rem;
+    color: transparent;
+    cursor: pointer;
+    font-size: 2rem;
+    transition: .3s color; }
+
 textarea {
   width: 100%;
   height: 3rem;
@@ -6471,8 +6482,7 @@ input[type=checkbox]:not(:disabled) ~ .lever:active:after {
   position: absolute; }
 
 .select-wrapper {
-  position: relative;
-  margin-top: 15px; }
+  position: relative; }
   .select-wrapper input.select-dropdown {
     position: relative;
     cursor: pointer;
@@ -6495,6 +6505,10 @@ input[type=checkbox]:not(:disabled) ~ .lever:active:after {
     font-size: 23px; }
     .select-wrapper .mdi-navigation-arrow-drop-down.disabled {
       color: rgba(0, 0, 0, 0.26); }
+  .select-wrapper + label {
+    position: absolute;
+    top: -14px;
+    font-size: 0.8rem; }
 
 select {
   display: none; }
@@ -6507,15 +6521,21 @@ select:disabled {
 
 .select-wrapper input.select-dropdown:disabled {
   color: rgba(0, 0, 0, 0.3);
+  cursor: default;
+  -webkit-user-select: none;
+  /* webkit (safari, chrome) browsers */
+  -moz-user-select: none;
+  /* mozilla browsers */
+  -ms-user-select: none;
+  /* IE10+ */
   border-bottom: 1px solid rgba(0, 0, 0, 0.3); }
 
 .select-wrapper i {
   color: rgba(0, 0, 0, 0.3); }
 
 .select-dropdown li.disabled {
-  color: rgba(0, 0, 0, 0.3); }
-  .select-dropdown li.disabled:hover {
-    background-color: transparent; }
+  color: rgba(0, 0, 0, 0.3);
+  background-color: transparent; }
 
 /*********************
       File Input

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,5 +1,5 @@
 /*!
- * Materialize v0.96.0 (http://materializecss.com)
+ * Materialize v0.96.1 (http://materializecss.com)
  * Copyright 2014-2015 Materialize
  * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
  */
@@ -252,7 +252,7 @@ jQuery.extend( jQuery.easing,
         };
     })(Hammer.Manager.prototype.emit);
 }));
-;var Materialize = {};
+;Materialize = {};
 
 // Unique ID
 Materialize.guid = (function() {
@@ -354,16 +354,44 @@ if ($) { Vel = $.Velocity } else { Vel = Velocity};
         }
       }
 
+      /**
+       * Check if object is children of panel header
+       * @param  {Object}  object Jquery object
+       * @return {Boolean} true if it is children
+       */
+      function isChildrenOfPanelHeader(object) {
+
+        var panelHeader = getPanelHeader(object);
+
+        return panelHeader.length > 0;
+      }
+
+      /**
+       * Get panel header from a children element
+       * @param  {Object} object Jquery object
+       * @return {Object} panel header object
+       */
+      function getPanelHeader(object) {
+
+        return object.closest('li > .collapsible-header');
+      }
+
       /*****  End Helper Functions  *****/
 
 
 
       if (options.accordion || collapsible_type == "accordion" || collapsible_type == undefined) { // Handle Accordion
         // Add click handler to only direct collapsible header children
-        $this.find('> li > .collapsible-header').on('click.collapse', function (e) {
-            var header = $(e.target);
-            header.toggleClass('active');
-          accordionOpen(header);
+        $panel_headers = $this.find('> li > .collapsible-header');
+        $panel_headers.on('click.collapse', function (e) {
+          var element = $(e.target);
+
+          if (isChildrenOfPanelHeader(element)) {
+            element = getPanelHeader(element);
+          }
+
+          element.toggleClass('active');
+          accordionOpen(element);
         });
         // Open first active
         accordionOpen($panel_headers.filter('.active').first());
@@ -372,9 +400,12 @@ if ($) { Vel = $.Velocity } else { Vel = Velocity};
         $panel_headers.each(function () {
           // Add click handler to only direct collapsible header children
           $(this).on('click.collapse', function (e) {
-            var header = $(e.target);
-            header.toggleClass('active');
-            expandableOpen(header);
+            var element = $(e.target);
+            if (isChildrenOfPanelHeader(element)) {
+              element = getPanelHeader(element);
+            }
+            element.toggleClass('active');
+            expandableOpen(element);
           });
           // Open any bodies that have the active class
           if ($(this).hasClass('active')) {
@@ -434,15 +465,7 @@ if ($) { Vel = $.Velocity } else { Vel = Velocity};
     updateOptions();
 
     // Attach dropdown to its activator
-    if (origin.hasClass('select-dropdown')) {
-      origin.after(activates)
-    }
-    else {
-      origin.append(activates);
-    }
-
-
-
+    origin.after(activates);
 
     /*
       Helper function to position and resize dropdown.
@@ -452,6 +475,9 @@ if ($) { Vel = $.Velocity } else { Vel = Velocity};
       // Check html data attributes
       updateOptions();
 
+      // Set Dropdown state
+      activates.addClass('active');
+
       // Constrain width
       if (options.constrain_width == true) {
         activates.css('width', origin.outerWidth());
@@ -463,7 +489,6 @@ if ($) { Vel = $.Velocity } else { Vel = Velocity};
 
       // Handle edge alignment
       var offsetLeft = origin.offset().left;
-
       var width_difference = 0;
       var gutter_spacing = options.gutter;
 
@@ -472,23 +497,15 @@ if ($) { Vel = $.Velocity } else { Vel = Velocity};
         width_difference = origin.innerWidth() - activates.innerWidth();
         gutter_spacing = gutter_spacing * -1;
       }
-      // If fixed placement
-      if (Materialize.elementOrParentIsFixed(origin[0])) {
-        activates.css({
-          top: 0 + offset,
-          left: 0 + width_difference + gutter_spacing
-        });
-      }
-      // If relative placement
-      else {
 
-        activates.css({
-          position: 'absolute',
-          top: 0 + offset,
-          left: 0 + width_difference + gutter_spacing
-        });
+      // Position dropdown
+      activates.css({
+        position: 'absolute',
+        top: origin.position().top + offset,
+        left: origin.position().left + width_difference + gutter_spacing
+      });
+
 
-      }
 
       // Show dropdown
       activates.stop(true, true).css('opacity', 0)
@@ -501,59 +518,62 @@ if ($) { Vel = $.Velocity } else { Vel = Velocity};
         }
       })
         .animate( {opacity: 1}, {queue: false, duration: options.inDuration, easing: 'easeOutSine'});
-
-
     }
 
-
     function hideDropdown() {
       activates.fadeOut(options.outDuration);
+      activates.removeClass('active');
     }
 
-    activates.on('hover', function(e) {
-      e.stopPropagation();
-    });
-
     // Hover
     if (options.hover) {
+      var open = false;
       origin.unbind('click.' + origin.attr('id'));
       // Hover handler to show dropdown
       origin.on('mouseenter', function(e){ // Mouse over
-        placeDropdown();
+        if (open === false) {
+          placeDropdown();
+          open = true
+        }
+      });
+      origin.on('mouseleave', function(e){
+        // If hover on origin then to something other than dropdown content, then close
+        if(!$(e.toElement).closest('.dropdown-content').is(activates)) {
+          activates.stop(true, true);
+          hideDropdown();
+          open = false;
+        }
       });
 
-      origin.on('mouseleave', function(e){ // Mouse out
-        activates.stop(true, true);
-        hideDropdown();
+      activates.on('mouseleave', function(e){ // Mouse out
+        if(!$(e.toElement).closest('.dropdown-button').is(origin)) {
+          activates.stop(true, true);
+          hideDropdown();
+          open = false;
+        }
       });
 
     // Click
     } else {
-      var open = false;
 
       // Click handler to show dropdown
       origin.unbind('click.' + origin.attr('id'));
       origin.bind('click.'+origin.attr('id'), function(e){
-        // Handles case for select plugin
-        if (origin.hasClass('select-dropdown')) {
-          return false;
-        }
+
         if ( origin[0] == e.currentTarget && ($(e.target).closest('.dropdown-content').length === 0) ) {
           e.preventDefault(); // Prevents button click from moving window
           placeDropdown();
-          open = true;
 
         }
         // If origin is clicked and menu is open, close menu
         else {
-          if (open === true) {
+          if (origin.hasClass('active')) {
             hideDropdown();
             $(document).unbind('click.' + activates.attr('id'));
-            open = false;
           }
         }
         // If menu open, add click close handler to document
-        if (open === true) {
+        if (activates.hasClass('active')) {
           $(document).bind('click.'+ activates.attr('id'), function (e) {
             if (!activates.is(e.target) && !origin.is(e.target) && (!origin.find(e.target).length > 0) ) {
               hideDropdown();
@@ -2295,7 +2315,7 @@ $(document).ready(function(){
 
 //          offset - 200 allows elements near bottom of page to scroll
 
-	    	$('html, body').animate({ scrollTop: offset - 200 }, {duration: 400, easing: 'easeOutCubic'});
+	    	$('html, body').animate({ scrollTop: offset - 200 }, {duration: 400, queue: false, easing: 'easeOutCubic'});
 
 		  });
 		});

diff --git a/dist/js/materialize.min.js b/dist/js/materialize.min.js