uikit 3.14.2-dev.404bdcedf → 3.14.2-dev.7f1f28069

package/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.14.2-dev.404bdcedf",
+    "version": "3.14.2-dev.7f1f28069",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [

package/src/js/mixin/position.js

@@ -22,22 +22,12 @@ export default {
         positionAt(element, target, boundary) {
             const [dir, align] = this.pos;
 
-            const mainAxisOffset =
-                toPx(
-                    this.offset === false ? getCssVar('position-offset', element) : this.offset,
-                    this.axis === 'x' ? 'width' : 'height',
-                    element
-                ) * (includes(['left', 'top'], dir) ? -1 : 1);
-
-            const crossAxisOffset = includes(['center', 'justify'], align)
-                ? 0
-                : toPx(
-                      getCssVar('position-shift-offset', element),
-                      this.axis === 'y' ? 'width' : 'height',
-                      element
-                  ) * (includes(['left', 'top'], align) ? 1 : -1);
-
-            let offset = [mainAxisOffset, crossAxisOffset];
+            let offset = toPx(
+                this.offset === false ? getCssVar('position-offset', element) : this.offset,
+                this.axis === 'x' ? 'width' : 'height',
+                element
+            );
+            offset = [includes(['left', 'top'], dir) ? -offset : +offset, 0];
 
             const attach = {
                 element: [flipPosition(dir), align],

package/src/js/util/position.js

@@ -143,21 +143,19 @@ function attachToWithFlip(element, target, options) {
                     return false;
                 }
 
-                if (flip === true || includes(flip, dirs[1 - i][1])) {
-                    const newPos = attachToWithFlip(element, target, {
-                        ...options,
-                        attach: {
-                            element: elAttach.map(flipDir).reverse(),
-                            target: targetAttach.map(flipDir).reverse(),
-                        },
-                        offset: elOffset.reverse(),
-                        flip: flip === true ? flip : [...flip, dirs[1 - i][1]],
-                        recursion: true,
-                    });
-
-                    if (newPos && isInScrollArea(newPos, scrollElement, 1 - i)) {
-                        return newPos;
-                    }
+                const newPos = attachToWithFlip(element, target, {
+                    ...options,
+                    attach: {
+                        element: elAttach.map(flipDir).reverse(),
+                        target: targetAttach.map(flipDir).reverse(),
+                    },
+                    offset: elOffset.reverse(),
+                    flip: flip === true ? flip : [...flip, dirs[1 - i][1]],
+                    recursion: true,
+                });
+
+                if (newPos && isInScrollArea(newPos, scrollElement, 1 - i)) {
+                    return newPos;
                 }
             }
 

package/src/less/components/navbar.less

@@ -374,7 +374,6 @@
     position: absolute;
     z-index: @navbar-dropdown-z-index;
     --uk-position-offset: @navbar-dropdown-margin;
-    --uk-position-shift-offset: 0;
     --uk-position-viewport-offset: 10;
     /* 3 */
     box-sizing: border-box;
@@ -424,6 +423,7 @@
 .uk-navbar-dropdown-dropbar {
     /* 1 */
     --uk-position-offset: @navbar-dropdown-dropbar-margin-top;
+    --uk-position-viewport-offset: 0;
     /* 2 */
     margin-bottom: @navbar-dropdown-dropbar-margin-bottom;
     /* 3 */

package/src/scss/components/navbar.scss

@@ -374,7 +374,6 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
     position: absolute;
     z-index: $navbar-dropdown-z-index;
     --uk-position-offset: #{$navbar-dropdown-margin};
-    --uk-position-shift-offset: 0;
     --uk-position-viewport-offset: 10;
     /* 3 */
     box-sizing: border-box;
@@ -424,6 +423,7 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
 .uk-navbar-dropdown-dropbar {
     /* 1 */
     --uk-position-offset: #{$navbar-dropdown-dropbar-margin-top};
+    --uk-position-viewport-offset: 0;
     /* 2 */
     margin-bottom: $navbar-dropdown-dropbar-margin-bottom;
     /* 3 */