Merge remote-tracking branch 'origin/v4'

ResponsiveBP · Jan 7, 2015 · 7b84182 · 7b84182
2 parents afb5fe3 + 7db17df
commit 7b84182
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@ Browser support covers IE9+ as well as all other modern browsers.
 
 Several options are available for downloading Responsive:
 
-- [Download the latest release](https://github.com/ResponsiveBP/Responsive/releases/download/4.0.0/responsive.zip).
-- [Download the latest release source](https://github.com/ResponsiveBP/Responsive/archive/4.0.0.zip).
+- [Download the latest release](https://github.com/ResponsiveBP/Responsive/releases/download/4.0.1/responsive.zip).
+- [Download the latest release source](https://github.com/ResponsiveBP/Responsive/archive/4.0.1.zip).
 - Clone the repo: `git clone https://github.com/ResponsiveBP/Responsive.git`.
 - Install with [Bower](http://bower.io): `bower install responsive`.
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "responsive",
     "description": "A super lightweight HTML, Sass, CSS, and JavaScript framework for building responsive websites.",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "homepage": "http://responsivebp.com",
     "authors": [
         "James South"

diff --git a/build/responsive.css b/build/responsive.css
@@ -5,7 +5,7 @@
 	Copyright (c),  James South.
 	Licensed under the MIT License.
 	============================================================================== */
-/*! Responsive v4.0.0 | MIT License | responsivebp.com */
+/*! Responsive v4.0.1 | MIT License | responsivebp.com */
 /*! normalize.css v3.0.2 | MIT License | git.io/normalize */
 html {
   font-family: sans-serif;
@@ -4815,10 +4815,13 @@ table {
   padding: 0 .5rem;
   border-top: solid 1px silver; }
 
-.expand,
+.trans,
 .collapse {
   -webkit-transition: height .5s ease, width .5s ease;
-          transition: height .5s ease, width .5s ease;
+          transition: height .5s ease, width .5s ease; }
+
+.expand,
+.collapse {
   display: block;
   height: auto;
   margin-top: 0;

diff --git a/build/responsive.js b/build/responsive.js
@@ -6,7 +6,7 @@
     Licensed under the MIT License.
     ============================================================================== */
 
-/*! Responsive v4.0.0 | MIT License | responsivebp.com */
+/*! Responsive v4.0.1 | MIT License | responsivebp.com */
 
 /*
  * Responsive Core
@@ -1732,7 +1732,7 @@
                 var eventToTrigger = $.Event(completeEvent);
 
                 // Ensure the height/width is set to auto.
-                self.$target[self.options.dimension]("");
+                self.$target.removeClass("trans")[self.options.dimension]("");
 
                 self.transitioning = false;
 
@@ -1770,7 +1770,7 @@
 
         // Remove or add the expand classes.
         this.$target[method]("collapse");
-        this.$target[startEvent.type === "show" ? "addClass" : "removeClass"]("expand");
+        this.$target[startEvent.type === "show" ? "addClass" : "removeClass"]("expand trans");
 
         this.$target.onTransitionEnd(complete);
     };

diff --git a/build/responsive.min.css b/build/responsive.min.css
diff --git a/build/responsive.min.js b/build/responsive.min.js
diff --git a/dist/responsive.zip b/dist/responsive.zip
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "responsive",
     "description": "A super lightweight HTML, Sass, CSS, and JavaScript framework for building responsive websites.",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "keywords": [
         "html",
         "css",

diff --git a/src/js/responsive.core.js b/src/js/responsive.core.js
@@ -6,7 +6,7 @@
     Licensed under the MIT License.
     ============================================================================== */
 
-/*! Responsive v4.0.0 | MIT License | responsivebp.com */
+/*! Responsive v4.0.1 | MIT License | responsivebp.com */
 
 /*
  * Responsive Core

diff --git a/src/js/responsive.dropdown.js b/src/js/responsive.dropdown.js
@@ -168,7 +168,7 @@
                 var eventToTrigger = $.Event(completeEvent);
 
                 // Ensure the height/width is set to auto.
-                self.$target[self.options.dimension]("");
+                self.$target.removeClass("trans")[self.options.dimension]("");
 
                 self.transitioning = false;
 
@@ -206,7 +206,7 @@
 
         // Remove or add the expand classes.
         this.$target[method]("collapse");
-        this.$target[startEvent.type === "show" ? "addClass" : "removeClass"]("expand");
+        this.$target[startEvent.type === "show" ? "addClass" : "removeClass"]("expand trans");
 
         this.$target.onTransitionEnd(complete);
     };

diff --git a/src/sass/partials/_copyright.scss b/src/sass/partials/_copyright.scss
@@ -6,4 +6,4 @@
 	Licensed under the MIT License.
 	============================================================================== */
 
-/*! Responsive v4.0.0 | MIT License | responsivebp.com */
+/*! Responsive v4.0.1 | MIT License | responsivebp.com */
diff --git a/src/sass/partials/_dropdown.scss b/src/sass/partials/_dropdown.scss
@@ -19,9 +19,13 @@
 }
 
 // Animation styles
-.expand,
+.trans,
 .collapse {
     transition: height .5s ease, width .5s ease;
+}
+
+.expand,
+.collapse {
     display: block;
     height: auto;
     margin-top: 0;