uikit 3.14.2-dev.1d34cc58b → 3.14.2-dev.404bdcedf

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

package/src/js/mixin/position.js

@@ -22,12 +22,22 @@ export default {
         positionAt(element, target, boundary) {
             const [dir, align] = this.pos;
 
-            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 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];
 
             const attach = {
                 element: [flipPosition(dir), align],

package/src/js/util/position.js

@@ -143,19 +143,21 @@ function attachToWithFlip(element, target, options) {
                     return false;
                 }
 
-                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;
+                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;
+                    }
                 }
             }
 

package/src/less/components/navbar.less

@@ -40,6 +40,7 @@
 @navbar-color-mode:                             none;
 
 @navbar-nav-item-height:                        80px;
+@navbar-nav-item-gap:                           0;
 @navbar-nav-item-padding-horizontal:            15px;
 @navbar-nav-item-color:                         @global-muted-color;
 @navbar-nav-item-font-size:                     @global-font-size;
@@ -48,6 +49,7 @@
 @navbar-nav-item-onclick-color:                 @global-emphasis-color;
 @navbar-nav-item-active-color:                  @global-emphasis-color;
 
+@navbar-item-padding-horizontal:                @navbar-nav-item-padding-horizontal;
 @navbar-item-color:                             @global-color;
 
 @navbar-toggle-color:                           @global-muted-color;
@@ -93,6 +95,7 @@
 
 .uk-navbar {
     display: flex;
+    --uk-navbar-nav-item-gap: @navbar-nav-item-gap;
     /* 1 */
     position: relative;
     .hook-navbar();
@@ -127,6 +130,7 @@
 .uk-navbar-center-left > *,
 .uk-navbar-center-right > * {
     display: flex;
+    gap: var(--uk-navbar-nav-item-gap);
     /* 1 */
     align-items: center;
 }
@@ -168,8 +172,14 @@
    top: 0;
 }
 
-.uk-navbar-center-left { right: 100%; }
-.uk-navbar-center-right { left: 100%; }
+.uk-navbar-center-left {
+    right: 100%; // Fallback if gap is 0
+    right:  ~'calc(100% + var(--uk-navbar-nav-item-gap))';
+}
+.uk-navbar-center-right {
+    left: 100%; // Fallback if gap is 0
+    left: ~'calc(100% + var(--uk-navbar-nav-item-gap))';
+}
 
 [class*='uk-navbar-center-'] {
     width: max-content;
@@ -186,6 +196,7 @@
 
 .uk-navbar-nav {
     display: flex;
+    gap: var(--uk-navbar-nav-item-gap);
     /* 1 */
     margin: 0;
     padding: 0;
@@ -267,6 +278,7 @@
  ========================================================================== */
 
 .uk-navbar-item {
+    padding: 0 @navbar-item-padding-horizontal;
     color: @navbar-item-color;
     .hook-navbar-item();
 }
@@ -362,6 +374,7 @@
     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;
@@ -411,7 +424,6 @@
 .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/less/theme/navbar.less

@@ -7,6 +7,9 @@
 // Variables
 // ========================================================================
 
+@navbar-nav-item-gap:                           30px;
+@navbar-nav-item-padding-horizontal:            0;
+
 @navbar-nav-item-font-size:                     @global-small-font-size;
 
 @navbar-dropdown-margin:                        15px;
@@ -129,18 +132,6 @@
 
 .hook-navbar-misc() {
 
-    /*
-     * Navbar
-     */
-
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-nav:first-child,
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-item:first-child,
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-toggle:first-child { margin-left: -@navbar-nav-item-padding-horizontal; }
-
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-nav:last-child,
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-item:last-child,
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-toggle:last-child { margin-right: -@navbar-nav-item-padding-horizontal; }
-
     /*
      * Grid Divider
      */

package/src/scss/components/navbar.scss

@@ -40,6 +40,7 @@ $navbar-background:                              $global-muted-background !defau
 $navbar-color-mode:                              none !default;
 
 $navbar-nav-item-height:                         80px !default;
+$navbar-nav-item-gap:                            0 !default;
 $navbar-nav-item-padding-horizontal:             15px !default;
 $navbar-nav-item-color:                          $global-muted-color !default;
 $navbar-nav-item-font-size:                      $global-font-size !default;
@@ -48,6 +49,7 @@ $navbar-nav-item-hover-color:                    $global-color !default;
 $navbar-nav-item-onclick-color:                  $global-emphasis-color !default;
 $navbar-nav-item-active-color:                   $global-emphasis-color !default;
 
+$navbar-item-padding-horizontal:                 $navbar-nav-item-padding-horizontal !default;
 $navbar-item-color:                              $global-color !default;
 
 $navbar-toggle-color:                            $global-muted-color !default;
@@ -93,6 +95,7 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
 
 .uk-navbar {
     display: flex;
+    --uk-navbar-nav-item-gap: #{$navbar-nav-item-gap};
     /* 1 */
     position: relative;
     @if(mixin-exists(hook-navbar)) {@include hook-navbar();}
@@ -127,6 +130,7 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
 .uk-navbar-center-left > *,
 .uk-navbar-center-right > * {
     display: flex;
+    gap: var(--uk-navbar-nav-item-gap);
     /* 1 */
     align-items: center;
 }
@@ -168,8 +172,14 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
    top: 0;
 }
 
-.uk-navbar-center-left { right: 100%; }
-.uk-navbar-center-right { left: 100%; }
+.uk-navbar-center-left {
+    right: 100%; // Fallback if gap is 0
+    right:  unquote('calc(100% + var(--uk-navbar-nav-item-gap))');
+}
+.uk-navbar-center-right {
+    left: 100%; // Fallback if gap is 0
+    left: unquote('calc(100% + var(--uk-navbar-nav-item-gap))');
+}
 
 [class*='uk-navbar-center-'] {
     width: max-content;
@@ -186,6 +196,7 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
 
 .uk-navbar-nav {
     display: flex;
+    gap: var(--uk-navbar-nav-item-gap);
     /* 1 */
     margin: 0;
     padding: 0;
@@ -267,6 +278,7 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
  ========================================================================== */
 
 .uk-navbar-item {
+    padding: 0 $navbar-item-padding-horizontal;
     color: $navbar-item-color;
     @if(mixin-exists(hook-navbar-item)) {@include hook-navbar-item();}
 }
@@ -362,6 +374,7 @@ $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;
@@ -411,7 +424,6 @@ $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 */

package/src/scss/mixins-theme.scss

@@ -1761,18 +1761,6 @@
 @mixin hook-navbar-dropbar(){ box-shadow: $navbar-dropbar-box-shadow; }
 @mixin hook-navbar-misc(){
 
-    /*
-     * Navbar
-     */
-
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-nav:first-child,
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-item:first-child,
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-toggle:first-child { margin-left: (-$navbar-nav-item-padding-horizontal); }
-
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-nav:last-child,
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-item:last-child,
-    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-toggle:last-child { margin-right: (-$navbar-nav-item-padding-horizontal); }
-
     /*
      * Grid Divider
      */

package/src/scss/theme/navbar.scss

@@ -7,6 +7,9 @@
 // Variables
 // ========================================================================
 
+$navbar-nav-item-gap:                            30px !default;
+$navbar-nav-item-padding-horizontal:             0 !default;
+
 $navbar-nav-item-font-size:                      $global-small-font-size !default;
 
 $navbar-dropdown-margin:                         15px !default;

package/src/scss/variables-theme.scss

@@ -730,13 +730,15 @@ $inverse-nav-dividers-border: $inverse-global-border !default;
 $navbar-background: $global-muted-background !default;
 $navbar-color-mode: none !default;
 $navbar-nav-item-height: 80px !default;
-$navbar-nav-item-padding-horizontal: 15px !default;
+$navbar-nav-item-gap: 30px !default;
+$navbar-nav-item-padding-horizontal: 0 !default;
 $navbar-nav-item-color: $global-muted-color !default;
 $navbar-nav-item-font-size: $global-small-font-size !default;
 $navbar-nav-item-font-family: $global-font-family !default;
 $navbar-nav-item-hover-color: $global-color !default;
 $navbar-nav-item-onclick-color: $global-emphasis-color !default;
 $navbar-nav-item-active-color: $global-emphasis-color !default;
+$navbar-item-padding-horizontal: $navbar-nav-item-padding-horizontal !default;
 $navbar-item-color: $global-color !default;
 $navbar-toggle-color: $global-muted-color !default;
 $navbar-toggle-hover-color: $global-color !default;

package/src/scss/variables.scss

@@ -728,6 +728,7 @@ $inverse-nav-dividers-border: $inverse-global-border !default;
 $navbar-background: $global-muted-background !default;
 $navbar-color-mode: none !default;
 $navbar-nav-item-height: 80px !default;
+$navbar-nav-item-gap: 0 !default;
 $navbar-nav-item-padding-horizontal: 15px !default;
 $navbar-nav-item-color: $global-muted-color !default;
 $navbar-nav-item-font-size: $global-font-size !default;
@@ -735,6 +736,7 @@ $navbar-nav-item-font-family: $global-font-family !default;
 $navbar-nav-item-hover-color: $global-color !default;
 $navbar-nav-item-onclick-color: $global-emphasis-color !default;
 $navbar-nav-item-active-color: $global-emphasis-color !default;
+$navbar-item-padding-horizontal: $navbar-nav-item-padding-horizontal !default;
 $navbar-item-color: $global-color !default;
 $navbar-toggle-color: $global-muted-color !default;
 $navbar-toggle-hover-color: $global-color !default;