Update version

vodkabears · Mar 31, 2014 · e168134 · e168134
1 parent 95425ec
commit e168134
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 85 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "remodal",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "homepage": "http://vodkabears.github.io/remodal/",
     "authors": [
         "Ilya Makarov <[email protected]>"

diff --git a/dist/jquery.remodal.css b/dist/jquery.remodal.css
@@ -1,115 +1,122 @@
-/*! Remodal - v0.1.2 - 2014-03-05
+/*! Remodal - v0.1.3 - 2014-03-31
  * https://github.com/VodkaBears/remodal
  * Copyright (c) 2014 VodkaBears; */
 
-/* Fonts */
-@import url(http://fonts.googleapis.com/css?family=Exo+2:700,400&subset=latin,cyrillic);
+/* ==========================================================================
+   Remodal necessary styles
+   ========================================================================== */
+
+/* Hide scroll bar */
 
-/* Lock screen(begin) */
 html.remodal_lock, body.remodal_lock {
     overflow: hidden;
 }
 
-/* Lock screen(end) */
-
-/* Background for effects(begin) */
-.remodal-bg {
-    -webkit-transition: -webkit-filter 0.2s linear;
-    -moz-transition: -moz-filter 0.2s linear;
-    -o-transition: -o-filter 0.2s linear;
-    transition: filter 0.2s linear;
-}
+/* Anti FOUC */
 
-body.remodal_active .remodal-bg {
-    -webkit-filter: blur(3px);
-    -moz-filter: blur(3px);
-    -o-filter: blur(3px);
-    -ms-filter: blur(3px);
-    filter: blur(3px);
-}
-
-/* Background for effects(end) */
-
-/* Anti FOUC(begin) */
 .remodal, [data-remodal-id] {
     visibility: hidden;
 }
 
-/* Anti FOUC(end)*/
+/* Overlay necessary styles */
 
-/* Remodal overlay(begin) */
 .remodal-overlay {
-    display: none;
-    overflow: auto;
-    -webkit-overflow-scrolling: touch;
-
     position: fixed;
     top: 0;
     left: 0;
     right: 0;
     bottom: 0;
     z-index: 10000;
 
-    text-align: center;
-
-    opacity: 0;
-    background: rgba(33, 36, 46, 0.95);
-    /* IE6–IE8 */
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#EE21242E, endColorstr=#EE21242E);
-    zoom: 1;
-    -webkit-transition: opacity 0.2s linear;
-    -moz-transition: opacity 0.2s linear;
-    -o-transition: opacity 0.2s linear;
-    transition: opacity 0.2s linear;
-}
+    display: none;
+    overflow: auto;
+    -webkit-overflow-scrolling: touch;
 
-.remodal-overlay > * {
-    -webkit-transform: translateZ(0px);
+    text-align: center;
 }
 
 .remodal-overlay:after {
     display: inline-block;
-
     height: 100%;
     margin-left: -0.05em;
 
     content: '';
-    vertical-align: middle;
 }
 
-body.remodal_active .remodal-overlay {
-    opacity: 1;
+/* Fix iPad, iPhone glitches */
+
+.remodal-overlay > * {
+    -webkit-transform: translateZ(0px);
 }
 
-/* Remodal overlay(end) */
+/* Modal dialog necessary styles */
+
+.remodal {
+    position: relative;
+
+    display: inline-block;
+}
+
+/* ==========================================================================
+   Remodal default theme
+   ========================================================================== */
+
+/* Default theme font */
+
+@import url(http://fonts.googleapis.com/css?family=Exo+2:700,400&subset=latin,cyrillic);
 
-/* Remodal window(begin) */
 .remodal, .remodal * {
     font-family: 'Exo 2', sans-serif;
 }
 
-.remodal {
-    font-size: 16px;
+/* Background for effects */
 
-    position: relative;
+.remodal-bg {
+    -webkit-transition: -webkit-filter 0.2s linear;
+    -moz-transition: -moz-filter 0.2s linear;
+    -o-transition: -o-filter 0.2s linear;
+    transition: filter 0.2s linear;
+}
 
-    display: inline-block;
+body.remodal_active .remodal-bg {
+    -webkit-filter: blur(3px);
+    -moz-filter: blur(3px);
+    -o-filter: blur(3px);
+    -ms-filter: blur(3px);
+    filter: blur(3px);
+}
+
+/* Overlay default theme styles */
+
+.remodal-overlay {
+    opacity: 0;
+    background: rgba(33, 36, 46, 0.95);
+    -webkit-transition: opacity 0.2s linear;
+    -moz-transition: opacity 0.2s linear;
+    -o-transition: opacity 0.2s linear;
+    transition: opacity 0.2s linear;
+}
 
+body.remodal_active .remodal-overlay {
+    opacity: 1;
+}
+
+/* Modal dialog default theme styles */
+
+.remodal {
     width: 100%;
     min-height: 100%;
     padding: 35px;
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     box-sizing: border-box;
 
-    vertical-align: middle;
-
+    font-size: 16px;
     background: #f4f4f4;
     background-clip: padding-box;
     color: #182a3c;
     -webkit-box-shadow: 0px 0px 8px #171a24;
     box-shadow: 0px 0px 8px #171a24;
-
     -webkit-transform: scale(0.95);
     -moz-transform: scale(0.95);
     -ms-transform: scale(0.95);
@@ -129,9 +136,14 @@ body.remodal_active .remodal {
     transform: scale(1);
 }
 
-/* Remodal window(end) */
+/* Modal dialog vertical align  */
+
+.remodal, .remodal-overlay:after {
+    vertical-align: middle;
+}
+
+/* Close button */
 
-/* Remodal window close button(begin) */
 .remodal-close {
     position: absolute;
     top: 5px;
@@ -141,7 +153,6 @@ body.remodal_active .remodal {
     height: 28px;
 
     text-decoration: none;
-
     -webkit-border-radius: 50%;
     border-radius: 50%;
     border: 2px solid #3e5368;
@@ -153,16 +164,14 @@ body.remodal_active .remodal {
 
 .remodal-close:after {
     display: block;
+
     font-size: 28px;
     font-family: Arial, 'Helvetica CY', 'Nimbus Sans L', sans-serif !important;
-
     content: "×";
     line-height: 28px;
     cursor: pointer;
     text-decoration: none;
-
     color: #3e5368;
-
     -webkit-transition: all 0.2s linear;
     -moz-transition: all 0.2s linear;
     -o-transition: all 0.2s linear;
@@ -177,25 +186,21 @@ body.remodal_active .remodal {
     color: #f4f4f4;
 }
 
-/* Remodal window close button(end) */
+/* Dialog buttons */
 
-/* Remodal buttons(begin) */
 .remodal-confirm, .remodal-cancel {
-    font-size: 10pt;
-
     display: inline-block;
-
     width: 120px;
     padding: 9px 0;
     margin: 0 0 5px 0;
-    background-clip: padding-box;
 
+    font-size: 10pt;
     cursor: pointer;
     text-decoration: none;
     text-align: center;
-
     -webkit-border-radius: 50px;
     border-radius: 50px;
+    background-clip: padding-box;
     -webkit-transition: all 0.2s linear;
     -moz-transition: all 0.2s linear;
     -o-transition: all 0.2s linear;
@@ -224,9 +229,8 @@ body.remodal_active .remodal {
     color: #f4f4f4;
 }
 
-/* Remodal buttons(end) */
-
-/************** Media queries **************/
+/* Media queries
+   ========================================================================== */
 
 @media only screen and (min-width: 40.063em) /* min-width 641px */ {
     .remodal {

diff --git a/dist/jquery.remodal.js b/dist/jquery.remodal.js
@@ -1,4 +1,4 @@
-/*! Remodal - v0.1.2 - 2014-03-05
+/*! Remodal - v0.1.3 - 2014-03-31
  * https://github.com/VodkaBears/remodal
  * Copyright (c) 2014 VodkaBears; */
 ;(function ($) {
@@ -20,10 +20,8 @@
         lookup: []
     };
 
-    /**
-     * Current modal
-     */
-    var current;
+    var current, // current modal
+        scrollTop; // scroll position
 
     /**
      * Get transition duration in ms
@@ -179,6 +177,7 @@
 
         var id = this.modal.attr("data-" + pluginName + "-id");
         if (id && this.settings.hashTracking) {
+            scrollTop = $(window).scrollTop();
             location.hash = id;
         }
 
@@ -214,8 +213,8 @@
 
         if (this.settings.hashTracking &&
             this.modal.attr("data-" + pluginName + "-id") === location.hash.substr(1)) {
-            // save current scroll position
             location.hash = "";
+            $(window).scrollTop(scrollTop);
         }
 
         this.body.removeClass(pluginName + "_active");

diff --git a/dist/jquery.remodal.min.js b/dist/jquery.remodal.min.js
diff --git a/remodal.jquery.json b/remodal.jquery.json
@@ -14,7 +14,7 @@
         "ui",
         "zepto"
     ],
-    "version": "0.1.2",
+    "version": "0.1.3",
     "author": {
         "name": "Ilya Makarov",
         "email": "[email protected]",

diff --git a/src/jquery.remodal.css b/src/jquery.remodal.css
@@ -1,4 +1,4 @@
-/*! Remodal - v0.1.2 - 2014-03-05
+/*! Remodal - v0.1.3 - 2014-03-31
  * https://github.com/VodkaBears/remodal
  * Copyright (c) 2014 VodkaBears; */
 

diff --git a/src/jquery.remodal.js b/src/jquery.remodal.js
@@ -1,4 +1,4 @@
-/*! Remodal - v0.1.2 - 2014-03-05
+/*! Remodal - v0.1.3 - 2014-03-31
  * https://github.com/VodkaBears/remodal
  * Copyright (c) 2014 VodkaBears; */
 ;(function ($) {