Merge branch 'release/v3.0.0-rc.16'

uikit · Sep 12, 2018 · b2e1ef1 · b2e1ef1
2 parents dfdb5b9 + 53b3fb2
commit b2e1ef1
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 38 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -15,7 +15,7 @@ Also try to search for your issue. It may have already been answered or even fix
 <!-- BUG REPORT TEMPLATE -->
 ### UIkit version
 <!-- Check if the issue is reproducible with the latest stable version. -->
-3.0.0-rc.15
+3.0.0-rc.16
 
 ### Browser
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.0.0 rc 16 (September 12, 2018)
+
+### Fixed
+
+- Fix regression in Overflow Auto component
+
 ## 3.0.0 rc 15 (September 11, 2018)
 
 ### Changed

diff --git a/dist/css/uikit-rtl.css b/dist/css/uikit-rtl.css
@@ -1,4 +1,4 @@
-/*! UIkit 3.0.0-rc.15 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
+/*! UIkit 3.0.0-rc.16 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
 /* ========================================================================
    Component: Base
  ========================================================================== */

diff --git a/dist/css/uikit-rtl.min.css b/dist/css/uikit-rtl.min.css
diff --git a/dist/css/uikit.css b/dist/css/uikit.css
@@ -1,4 +1,4 @@
-/*! UIkit 3.0.0-rc.15 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
+/*! UIkit 3.0.0-rc.16 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
 /* ========================================================================
    Component: Base
  ========================================================================== */

diff --git a/dist/css/uikit.min.css b/dist/css/uikit.min.css
diff --git a/dist/js/uikit-icons.js b/dist/js/uikit-icons.js
diff --git a/dist/js/uikit-icons.min.js b/dist/js/uikit-icons.min.js
diff --git a/dist/js/uikit.js b/dist/js/uikit.js
@@ -1,4 +1,4 @@
-/*! UIkit 3.0.0-rc.15 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
+/*! UIkit 3.0.0-rc.16 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
 
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -6936,7 +6936,7 @@
         },
 
         data: {
-            selContainer: '.uk-container',
+            selContainer: '.uk-modal',
             selContent: '.uk-modal-dialog',
         },
 
@@ -8043,7 +8043,7 @@
 
     }
 
-    UIkit.version = '3.0.0-rc.15';
+    UIkit.version = '3.0.0-rc.16';
 
     core(UIkit);
 

diff --git a/dist/js/uikit.min.js b/dist/js/uikit.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "uikit",
   "title": "UIkit",
   "description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
-  "version": "3.0.0-rc.15",
+  "version": "3.0.0-rc.16",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "scripts": {

diff --git a/src/js/core/overflow-auto.js b/src/js/core/overflow-auto.js
@@ -11,7 +11,7 @@ export default {
     },
 
     data: {
-        selContainer: '.uk-container',
+        selContainer: '.uk-modal',
         selContent: '.uk-modal-dialog',
     },
 

diff --git a/src/scss/variables-theme.scss b/src/scss/variables-theme.scss
@@ -958,18 +958,6 @@ $transition-scale: 1.1 !default;
 $transition-slide-small-translate: 10px !default;
 $transition-slide-medium-translate: 50px !default;
 $transition-slow-duration: 0.7s !default;
-$breakpoint-small: 640px !default;
-$breakpoint-medium: 960px !default;
-$breakpoint-large: 1200px !default;
-$breakpoint-xlarge: 1600px !default;
-$breakpoint-xsmall-max: ($breakpoint-small - 1) !default;
-$breakpoint-small-max: ($breakpoint-medium - 1) !default;
-$breakpoint-medium-max: ($breakpoint-large - 1) !default;
-$breakpoint-large-max: ($breakpoint-xlarge - 1) !default;
-$global-small-box-shadow: 0 2px 8px rgba(0,0,0,0.08) !default;
-$global-medium-box-shadow: 0 5px 15px rgba(0,0,0,0.08) !default;
-$global-large-box-shadow: 0 14px 25px rgba(0,0,0,0.16) !default;
-$global-xlarge-box-shadow: 0 28px 50px rgba(0,0,0,0.16) !default;
 $panel-scrollable-height: 170px !default;
 $panel-scrollable-padding: 10px !default;
 $panel-scrollable-border-width: $global-border-width !default;
@@ -989,6 +977,18 @@ $logo-hover-color: $global-color !default;
 $dragover-box-shadow: 0 0 20px rgba(100,100,100,0.3) !default;
 $inverse-logo-color: $inverse-global-color !default;
 $inverse-logo-hover-color: $inverse-global-color !default;
+$breakpoint-small: 640px !default;
+$breakpoint-medium: 960px !default;
+$breakpoint-large: 1200px !default;
+$breakpoint-xlarge: 1600px !default;
+$breakpoint-xsmall-max: ($breakpoint-small - 1) !default;
+$breakpoint-small-max: ($breakpoint-medium - 1) !default;
+$breakpoint-medium-max: ($breakpoint-large - 1) !default;
+$breakpoint-large-max: ($breakpoint-xlarge - 1) !default;
+$global-small-box-shadow: 0 2px 8px rgba(0,0,0,0.08) !default;
+$global-medium-box-shadow: 0 5px 15px rgba(0,0,0,0.08) !default;
+$global-large-box-shadow: 0 14px 25px rgba(0,0,0,0.16) !default;
+$global-xlarge-box-shadow: 0 28px 50px rgba(0,0,0,0.16) !default;
 $width-small-width: 150px !default;
 $width-medium-width: 300px !default;
 $width-large-width: 450px !default;

diff --git a/src/scss/variables.scss b/src/scss/variables.scss
@@ -956,18 +956,6 @@ $transition-scale: 1.1 !default;
 $transition-slide-small-translate: 10px !default;
 $transition-slide-medium-translate: 50px !default;
 $transition-slow-duration: 0.7s !default;
-$breakpoint-small: 640px !default;
-$breakpoint-medium: 960px !default;
-$breakpoint-large: 1200px !default;
-$breakpoint-xlarge: 1600px !default;
-$breakpoint-xsmall-max: ($breakpoint-small - 1) !default;
-$breakpoint-small-max: ($breakpoint-medium - 1) !default;
-$breakpoint-medium-max: ($breakpoint-large - 1) !default;
-$breakpoint-large-max: ($breakpoint-xlarge - 1) !default;
-$global-small-box-shadow: 0 2px 8px rgba(0,0,0,0.08) !default;
-$global-medium-box-shadow: 0 5px 15px rgba(0,0,0,0.08) !default;
-$global-large-box-shadow: 0 14px 25px rgba(0,0,0,0.16) !default;
-$global-xlarge-box-shadow: 0 28px 50px rgba(0,0,0,0.16) !default;
 $panel-scrollable-height: 170px !default;
 $panel-scrollable-padding: 10px !default;
 $panel-scrollable-border-width: $global-border-width !default;
@@ -987,6 +975,18 @@ $logo-hover-color: $global-color !default;
 $dragover-box-shadow: 0 0 20px rgba(100,100,100,0.3) !default;
 $inverse-logo-color: $inverse-global-color !default;
 $inverse-logo-hover-color: $inverse-global-color !default;
+$breakpoint-small: 640px !default;
+$breakpoint-medium: 960px !default;
+$breakpoint-large: 1200px !default;
+$breakpoint-xlarge: 1600px !default;
+$breakpoint-xsmall-max: ($breakpoint-small - 1) !default;
+$breakpoint-small-max: ($breakpoint-medium - 1) !default;
+$breakpoint-medium-max: ($breakpoint-large - 1) !default;
+$breakpoint-large-max: ($breakpoint-xlarge - 1) !default;
+$global-small-box-shadow: 0 2px 8px rgba(0,0,0,0.08) !default;
+$global-medium-box-shadow: 0 5px 15px rgba(0,0,0,0.08) !default;
+$global-large-box-shadow: 0 14px 25px rgba(0,0,0,0.16) !default;
+$global-xlarge-box-shadow: 0 28px 50px rgba(0,0,0,0.16) !default;
 $width-small-width: 150px !default;
 $width-medium-width: 300px !default;
 $width-large-width: 450px !default;