uikit 3.14.4-dev.cd89debeb → 3.14.4-dev.ce706e326

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.4-dev.cd89debeb",
+    "version": "3.14.4-dev.ce706e326",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [

package/src/js/core/height-viewport.js

@@ -56,14 +56,18 @@ export default {
                     0
                 );
             } else {
+                const isScrollingElement = document.scrollingElement === scrollElement;
+
                 // on mobile devices (iOS and Android) window.innerHeight !== 100vh
-                minHeight = `calc(${
-                    document.scrollingElement === scrollElement ? '100vh' : `${viewportHeight}px`
-                }`;
+                minHeight = `calc(${isScrollingElement ? '100vh' : `${viewportHeight}px`}`;
 
                 if (this.offsetTop) {
-                    const top = offsetPosition(this.$el)[0] - offsetPosition(scrollElement)[0];
-                    minHeight += top > 0 && top < viewportHeight / 2 ? ` - ${top}px` : '';
+                    if (isScrollingElement) {
+                        const top = offsetPosition(this.$el)[0] - offsetPosition(scrollElement)[0];
+                        minHeight += top > 0 && top < viewportHeight / 2 ? ` - ${top}px` : '';
+                    } else {
+                        minHeight += ` - ${css(scrollElement, 'paddingTop')}`;
+                    }
                 }
 
                 if (this.offsetBottom === true) {

package/src/js/util/dimensions.js

@@ -94,13 +94,13 @@ export function position(element) {
 }
 
 export function offsetPosition(element) {
-    const offset = [0, 0];
-
     element = toNode(element);
 
-    do {
-        offset[0] += element.offsetTop;
-        offset[1] += element.offsetLeft;
+    const offset = [element.offsetTop, element.offsetLeft];
+
+    while ((element = element.offsetParent)) {
+        offset[0] += element.offsetTop + toFloat(css(element, `borderTopWidth`));
+        offset[1] += element.offsetLeft + toFloat(css(element, `borderLeftWidth`));
 
         if (css(element, 'position') === 'fixed') {
             const win = toWindow(element);
@@ -108,7 +108,7 @@ export function offsetPosition(element) {
             offset[1] += win.scrollX;
             return offset;
         }
-    } while ((element = element.offsetParent));
+    }
 
     return offset;
 }

package/src/less/components/nav.less

@@ -46,6 +46,8 @@
 @nav-divider-margin-vertical:                   5px;
 @nav-divider-margin-horizontal:                 0;
 
+@nav-default-font-size:                         @global-font-size;
+@nav-default-line-height:                       @global-line-height;
 @nav-default-item-color:                        @global-muted-color;
 @nav-default-item-hover-color:                  @global-color;
 @nav-default-item-active-color:                 @global-emphasis-color;
@@ -53,12 +55,14 @@
 @nav-default-header-color:                      @global-emphasis-color;
 @nav-default-divider-border-width:              @global-border-width;
 @nav-default-divider-border:                    @global-border;
+@nav-default-sublist-font-size:                 @nav-default-font-size;
+@nav-default-sublist-line-height:               @nav-default-line-height;
 @nav-default-sublist-item-color:                @global-muted-color;
 @nav-default-sublist-item-hover-color:          @global-color;
 @nav-default-sublist-item-active-color:         @global-emphasis-color;
 
-@nav-primary-item-font-size:                    @global-large-font-size;
-@nav-primary-item-line-height:                  @global-line-height;
+@nav-primary-font-size:                         @global-large-font-size;
+@nav-primary-line-height:                       @global-line-height;
 @nav-primary-item-color:                        @global-muted-color;
 @nav-primary-item-hover-color:                  @global-color;
 @nav-primary-item-active-color:                 @global-emphasis-color;
@@ -66,6 +70,8 @@
 @nav-primary-header-color:                      @global-emphasis-color;
 @nav-primary-divider-border-width:              @global-border-width;
 @nav-primary-divider-border:                    @global-border;
+@nav-primary-sublist-font-size:                 @global-medium-font-size;
+@nav-primary-sublist-line-height:               @global-line-height;
 @nav-primary-sublist-item-color:                @global-muted-color;
 @nav-primary-sublist-item-hover-color:          @global-color;
 @nav-primary-sublist-item-active-color:         @global-emphasis-color;
@@ -186,6 +192,8 @@ ul.uk-nav-sub {
  ========================================================================== */
 
 .uk-nav-default {
+    font-size: @nav-default-font-size;
+    line-height: @nav-default-line-height;
     .hook-nav-default();
 }
 
@@ -241,6 +249,11 @@ ul.uk-nav-sub {
  * Sublists
  */
 
+.uk-nav-default .uk-nav-sub {
+    font-size: @nav-default-sublist-font-size;
+    line-height: @nav-default-sublist-line-height;
+}
+
 .uk-nav-default .uk-nav-sub a { color: @nav-default-sublist-item-color; }
 
 .uk-nav-default .uk-nav-sub a:hover { color: @nav-default-sublist-item-hover-color; }
@@ -252,6 +265,8 @@ ul.uk-nav-sub {
  ========================================================================== */
 
 .uk-nav-primary {
+    font-size: @nav-primary-font-size;
+    line-height: @nav-primary-line-height;
     .hook-nav-primary();
 }
 
@@ -260,8 +275,6 @@ ul.uk-nav-sub {
  */
 
 .uk-nav-primary > li > a {
-    font-size: @nav-primary-item-font-size;
-    line-height: @nav-primary-item-line-height;
     color: @nav-primary-item-color;
     .hook-nav-primary-item();
 }
@@ -309,6 +322,11 @@ ul.uk-nav-sub {
  * Sublists
  */
 
+.uk-nav-primary .uk-nav-sub {
+    font-size: @nav-primary-sublist-font-size;
+    line-height: @nav-primary-sublist-line-height;
+}
+
 .uk-nav-primary .uk-nav-sub a { color: @nav-primary-sublist-item-color; }
 
 .uk-nav-primary .uk-nav-sub a:hover { color: @nav-primary-sublist-item-hover-color; }

package/src/less/components/navbar.less

@@ -440,7 +440,6 @@
     width: auto;
     /* 2 */
     --uk-position-offset: @navbar-dropdown-dropbar-margin-top;
-    --uk-position-viewport-offset: 0;
     /* 3 */
     margin-bottom: @navbar-dropdown-dropbar-margin-bottom;
     /* 4 */

package/src/less/components/utility.less

@@ -384,18 +384,27 @@
  ========================================================================== */
 
 /*
- * 1. Required for `a`
+ * 1. Style
+ * 2. Required for `a`
+ * 3. Behave like image but can be overridden through flex utility classes
  */
 
 .uk-logo {
+    /* 1 */
     font-size: @logo-font-size;
     font-family: @logo-font-family;
     color: @logo-color;
-    /* 1 */
+    /* 2 */
     text-decoration: none;
     .hook-logo();
 }
 
+/* 3 */
+:where(.uk-logo) {
+    display: inline-block;
+    vertical-align: middle;
+}
+
 /* Hover */
 .uk-logo:hover {
     color: @logo-hover-color;
@@ -404,7 +413,7 @@
     .hook-logo-hover();
 }
 
-.uk-logo > :where(img, svg, video) { display: inline-block; }
+.uk-logo > :where(img, svg, video) { display: block; }
 
 .uk-logo-inverse { display: none; }
 

package/src/less/theme/nav.less

@@ -7,14 +7,10 @@
 // Variables
 // ========================================================================
 
-@nav-default-subtitle-font-size:                12px;
-
-//
-// New
-//
-
 @nav-default-font-size:                         @global-small-font-size;
 
+@nav-default-subtitle-font-size:                12px;
+
 
 // Sublists
 // ========================================================================
@@ -43,7 +39,7 @@
 // Default style modifier
 // ========================================================================
 
-.hook-nav-default() { font-size: @nav-default-font-size; }
+.hook-nav-default() {}
 
 .hook-nav-default-item() {}
 

package/src/scss/components/nav.scss

@@ -46,6 +46,8 @@ $nav-header-margin-top:                          $global-margin !default;
 $nav-divider-margin-vertical:                    5px !default;
 $nav-divider-margin-horizontal:                  0 !default;
 
+$nav-default-font-size:                          $global-font-size !default;
+$nav-default-line-height:                        $global-line-height !default;
 $nav-default-item-color:                         $global-muted-color !default;
 $nav-default-item-hover-color:                   $global-color !default;
 $nav-default-item-active-color:                  $global-emphasis-color !default;
@@ -53,12 +55,14 @@ $nav-default-subtitle-font-size:                 $global-small-font-size !defaul
 $nav-default-header-color:                       $global-emphasis-color !default;
 $nav-default-divider-border-width:               $global-border-width !default;
 $nav-default-divider-border:                     $global-border !default;
+$nav-default-sublist-font-size:                  $nav-default-font-size !default;
+$nav-default-sublist-line-height:                $nav-default-line-height !default;
 $nav-default-sublist-item-color:                 $global-muted-color !default;
 $nav-default-sublist-item-hover-color:           $global-color !default;
 $nav-default-sublist-item-active-color:          $global-emphasis-color !default;
 
-$nav-primary-item-font-size:                     $global-large-font-size !default;
-$nav-primary-item-line-height:                   $global-line-height !default;
+$nav-primary-font-size:                          $global-large-font-size !default;
+$nav-primary-line-height:                        $global-line-height !default;
 $nav-primary-item-color:                         $global-muted-color !default;
 $nav-primary-item-hover-color:                   $global-color !default;
 $nav-primary-item-active-color:                  $global-emphasis-color !default;
@@ -66,6 +70,8 @@ $nav-primary-subtitle-font-size:                 $global-medium-font-size !defau
 $nav-primary-header-color:                       $global-emphasis-color !default;
 $nav-primary-divider-border-width:               $global-border-width !default;
 $nav-primary-divider-border:                     $global-border !default;
+$nav-primary-sublist-font-size:                  $global-medium-font-size !default;
+$nav-primary-sublist-line-height:                $global-line-height !default;
 $nav-primary-sublist-item-color:                 $global-muted-color !default;
 $nav-primary-sublist-item-hover-color:           $global-color !default;
 $nav-primary-sublist-item-active-color:          $global-emphasis-color !default;
@@ -186,6 +192,8 @@ ul.uk-nav-sub {
  ========================================================================== */
 
 .uk-nav-default {
+    font-size: $nav-default-font-size;
+    line-height: $nav-default-line-height;
     @if(mixin-exists(hook-nav-default)) {@include hook-nav-default();}
 }
 
@@ -241,6 +249,11 @@ ul.uk-nav-sub {
  * Sublists
  */
 
+.uk-nav-default .uk-nav-sub {
+    font-size: $nav-default-sublist-font-size;
+    line-height: $nav-default-sublist-line-height;
+}
+
 .uk-nav-default .uk-nav-sub a { color: $nav-default-sublist-item-color; }
 
 .uk-nav-default .uk-nav-sub a:hover { color: $nav-default-sublist-item-hover-color; }
@@ -252,6 +265,8 @@ ul.uk-nav-sub {
  ========================================================================== */
 
 .uk-nav-primary {
+    font-size: $nav-primary-font-size;
+    line-height: $nav-primary-line-height;
     @if(mixin-exists(hook-nav-primary)) {@include hook-nav-primary();}
 }
 
@@ -260,8 +275,6 @@ ul.uk-nav-sub {
  */
 
 .uk-nav-primary > li > a {
-    font-size: $nav-primary-item-font-size;
-    line-height: $nav-primary-item-line-height;
     color: $nav-primary-item-color;
     @if(mixin-exists(hook-nav-primary-item)) {@include hook-nav-primary-item();}
 }
@@ -309,6 +322,11 @@ ul.uk-nav-sub {
  * Sublists
  */
 
+.uk-nav-primary .uk-nav-sub {
+    font-size: $nav-primary-sublist-font-size;
+    line-height: $nav-primary-sublist-line-height;
+}
+
 .uk-nav-primary .uk-nav-sub a { color: $nav-primary-sublist-item-color; }
 
 .uk-nav-primary .uk-nav-sub a:hover { color: $nav-primary-sublist-item-hover-color; }

package/src/scss/components/navbar.scss

@@ -440,7 +440,6 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
     width: auto;
     /* 2 */
     --uk-position-offset: #{$navbar-dropdown-dropbar-margin-top};
-    --uk-position-viewport-offset: 0;
     /* 3 */
     margin-bottom: $navbar-dropdown-dropbar-margin-bottom;
     /* 4 */

package/src/scss/components/utility.scss

@@ -384,18 +384,27 @@ $dragover-box-shadow:                            0 0 20px rgba(100,100,100,0.3)
  ========================================================================== */
 
 /*
- * 1. Required for `a`
+ * 1. Style
+ * 2. Required for `a`
+ * 3. Behave like image but can be overridden through flex utility classes
  */
 
 .uk-logo {
+    /* 1 */
     font-size: $logo-font-size;
     font-family: $logo-font-family;
     color: $logo-color;
-    /* 1 */
+    /* 2 */
     text-decoration: none;
     @if(mixin-exists(hook-logo)) {@include hook-logo();}
 }
 
+/* 3 */
+:where(.uk-logo) {
+    display: inline-block;
+    vertical-align: middle;
+}
+
 /* Hover */
 .uk-logo:hover {
     color: $logo-hover-color;
@@ -404,7 +413,7 @@ $dragover-box-shadow:                            0 0 20px rgba(100,100,100,0.3)
     @if(mixin-exists(hook-logo-hover)) {@include hook-logo-hover();}
 }
 
-.uk-logo > :where(img, svg, video) { display: inline-block; }
+.uk-logo > :where(img, svg, video) { display: block; }
 
 .uk-logo-inverse { display: none; }
 

package/src/scss/mixins-theme.scss

@@ -1707,7 +1707,7 @@
 @mixin hook-nav-parent-icon(){}
 @mixin hook-nav-header(){}
 @mixin hook-nav-divider(){}
-@mixin hook-nav-default(){ font-size: $nav-default-font-size; }
+@mixin hook-nav-default(){}
 @mixin hook-nav-default-item(){}
 @mixin hook-nav-default-item-hover(){}
 @mixin hook-nav-default-item-active(){}

package/src/scss/theme/nav.scss

@@ -7,14 +7,10 @@
 // Variables
 // ========================================================================
 
-$nav-default-subtitle-font-size:                 12px !default;
-
-//
-// New
-//
-
 $nav-default-font-size:                          $global-small-font-size !default;
 
+$nav-default-subtitle-font-size:                 12px !default;
+
 
 // Sublists
 // ========================================================================
@@ -43,7 +39,7 @@ $nav-default-font-size:                          $global-small-font-size !defaul
 // Default style modifier
 // ========================================================================
 
-
+// @mixin hook-nav-default(){}
 
 // @mixin hook-nav-default-item(){}
 

package/src/scss/variables-theme.scss

@@ -690,6 +690,8 @@ $nav-header-text-transform: uppercase !default;
 $nav-header-margin-top: $global-margin !default;
 $nav-divider-margin-vertical: 5px !default;
 $nav-divider-margin-horizontal: 0 !default;
+$nav-default-font-size: $global-small-font-size !default;
+$nav-default-line-height: $global-line-height !default;
 $nav-default-item-color: $global-muted-color !default;
 $nav-default-item-hover-color: $global-color !default;
 $nav-default-item-active-color: $global-emphasis-color !default;
@@ -697,11 +699,13 @@ $nav-default-subtitle-font-size: 12px !default;
 $nav-default-header-color: $global-emphasis-color !default;
 $nav-default-divider-border-width: $global-border-width !default;
 $nav-default-divider-border: $global-border !default;
+$nav-default-sublist-font-size: $nav-default-font-size !default;
+$nav-default-sublist-line-height: $nav-default-line-height !default;
 $nav-default-sublist-item-color: $global-muted-color !default;
 $nav-default-sublist-item-hover-color: $global-color !default;
 $nav-default-sublist-item-active-color: $global-emphasis-color !default;
-$nav-primary-item-font-size: $global-large-font-size !default;
-$nav-primary-item-line-height: $global-line-height !default;
+$nav-primary-font-size: $global-large-font-size !default;
+$nav-primary-line-height: $global-line-height !default;
 $nav-primary-item-color: $global-muted-color !default;
 $nav-primary-item-hover-color: $global-color !default;
 $nav-primary-item-active-color: $global-emphasis-color !default;
@@ -709,6 +713,8 @@ $nav-primary-subtitle-font-size: $global-medium-font-size !default;
 $nav-primary-header-color: $global-emphasis-color !default;
 $nav-primary-divider-border-width: $global-border-width !default;
 $nav-primary-divider-border: $global-border !default;
+$nav-primary-sublist-font-size: $global-medium-font-size !default;
+$nav-primary-sublist-line-height: $global-line-height !default;
 $nav-primary-sublist-item-color: $global-muted-color !default;
 $nav-primary-sublist-item-hover-color: $global-color !default;
 $nav-primary-sublist-item-active-color: $global-emphasis-color !default;
@@ -1173,7 +1179,6 @@ $modal-footer-border-width: $global-border-width !default;
 $modal-footer-border: $global-border !default;
 $modal-close-full-padding: $global-margin !default;
 $modal-close-full-background: $modal-dialog-background !default;
-$nav-default-font-size: $global-small-font-size !default;
 $navbar-nav-item-text-transform: uppercase !default;
 $navbar-dropdown-nav-font-size: $global-small-font-size !default;
 $navbar-dropdown-box-shadow: 0 5px 12px rgba(0,0,0,0.15) !default;

package/src/scss/variables.scss

@@ -688,6 +688,8 @@ $nav-header-text-transform: uppercase !default;
 $nav-header-margin-top: $global-margin !default;
 $nav-divider-margin-vertical: 5px !default;
 $nav-divider-margin-horizontal: 0 !default;
+$nav-default-font-size: $global-font-size !default;
+$nav-default-line-height: $global-line-height !default;
 $nav-default-item-color: $global-muted-color !default;
 $nav-default-item-hover-color: $global-color !default;
 $nav-default-item-active-color: $global-emphasis-color !default;
@@ -695,11 +697,13 @@ $nav-default-subtitle-font-size: $global-small-font-size !default;
 $nav-default-header-color: $global-emphasis-color !default;
 $nav-default-divider-border-width: $global-border-width !default;
 $nav-default-divider-border: $global-border !default;
+$nav-default-sublist-font-size: $nav-default-font-size !default;
+$nav-default-sublist-line-height: $nav-default-line-height !default;
 $nav-default-sublist-item-color: $global-muted-color !default;
 $nav-default-sublist-item-hover-color: $global-color !default;
 $nav-default-sublist-item-active-color: $global-emphasis-color !default;
-$nav-primary-item-font-size: $global-large-font-size !default;
-$nav-primary-item-line-height: $global-line-height !default;
+$nav-primary-font-size: $global-large-font-size !default;
+$nav-primary-line-height: $global-line-height !default;
 $nav-primary-item-color: $global-muted-color !default;
 $nav-primary-item-hover-color: $global-color !default;
 $nav-primary-item-active-color: $global-emphasis-color !default;
@@ -707,6 +711,8 @@ $nav-primary-subtitle-font-size: $global-medium-font-size !default;
 $nav-primary-header-color: $global-emphasis-color !default;
 $nav-primary-divider-border-width: $global-border-width !default;
 $nav-primary-divider-border: $global-border !default;
+$nav-primary-sublist-font-size: $global-medium-font-size !default;
+$nav-primary-sublist-line-height: $global-line-height !default;
 $nav-primary-sublist-item-color: $global-muted-color !default;
 $nav-primary-sublist-item-hover-color: $global-color !default;
 $nav-primary-sublist-item-active-color: $global-emphasis-color !default;