uikit 3.14.2-dev.92611d66f → 3.14.2-dev.abf300d01

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;
@@ -56,7 +58,9 @@ $navbar-toggle-hover-color:                      $global-color !default;
 $navbar-subtitle-font-size:                      $global-small-font-size !default;
 
 $navbar-dropdown-z-index:                        $global-z-index + 20 !default;
-$navbar-dropdown-margin:                         0px !default;
+$navbar-dropdown-margin:                         0 !default;
+$navbar-dropdown-shift-margin:                   0 !default;
+$navbar-dropdown-viewport-margin:                15px !default;
 $navbar-dropdown-width:                          200px !default;
 $navbar-dropdown-padding:                        15px !default;
 $navbar-dropdown-background:                     $global-muted-background !default;
@@ -93,6 +97,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 +132,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 +174,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 +198,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 +280,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,7 +376,8 @@ $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-viewport-offset: 10;
+    --uk-position-shift-offset: #{$navbar-dropdown-shift-margin};
+    --uk-position-viewport-offset: #{$navbar-dropdown-viewport-margin};
     /* 3 */
     box-sizing: border-box;
     width: $navbar-dropdown-width;
@@ -403,20 +418,23 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
 
 /*
  * Dropbar modifier
- * 1. Set position
- * 2. Bottom padding for dropbar
- * 3. Horizontal padding
+ * 1. Reset dropdown width to prevent to early shifting
+ * 2. Set position
+ * 3. Bottom padding for dropbar
+ * 4. Horizontal padding
  */
 
 .uk-navbar-dropdown-dropbar {
     /* 1 */
-    --uk-position-offset: #{$navbar-dropdown-dropbar-margin-top};
-    --uk-position-viewport-offset: 0;
+    width: auto;
     /* 2 */
-    margin-bottom: $navbar-dropdown-dropbar-margin-bottom;
+    --uk-position-offset: #{$navbar-dropdown-dropbar-margin-top};
     /* 3 */
+    margin-bottom: $navbar-dropdown-dropbar-margin-bottom;
+    /* 4 */
     padding-left: $navbar-dropdown-dropbar-padding-horizontal;
     padding-right: $navbar-dropdown-dropbar-padding-horizontal;
+    --uk-position-shift-offset: 0;
     @if(mixin-exists(hook-navbar-dropdown-dropbar)) {@include hook-navbar-dropdown-dropbar();}
 }
 

package/src/scss/components/offcanvas.scss

@@ -26,19 +26,19 @@
 $offcanvas-z-index:                              $global-z-index !default;
 
 $offcanvas-bar-width:                            270px !default;
-$offcanvas-bar-padding-vertical:                 $global-margin !default;
-$offcanvas-bar-padding-horizontal:               $global-margin !default;
+$offcanvas-bar-padding-vertical:                 20px !default;
+$offcanvas-bar-padding-horizontal:               20px !default;
 $offcanvas-bar-background:                       $global-secondary-background !default;
 $offcanvas-bar-color-mode:                       light !default;
 
-$offcanvas-bar-width-m:                          350px !default;
-$offcanvas-bar-padding-vertical-m:               $global-medium-gutter !default;
-$offcanvas-bar-padding-horizontal-m:             $global-medium-gutter !default;
+$offcanvas-bar-width-s:                          350px !default;
+$offcanvas-bar-padding-vertical-s:               $global-gutter !default;
+$offcanvas-bar-padding-horizontal-s:             $global-gutter !default;
 
 $offcanvas-close-position:                       5px !default;
 $offcanvas-close-padding:                        5px !default;
 
-$offcanvas-close-position-m:                     20px !default;
+$offcanvas-close-position-s:                     10px !default;
 
 $offcanvas-overlay-background:                   rgba(0,0,0,0.1) !default;
 
@@ -99,13 +99,13 @@ $offcanvas-overlay-background:                   rgba(0,0,0,0.1) !default;
     @if(mixin-exists(hook-offcanvas-bar)) {@include hook-offcanvas-bar();}
 }
 
-/* Tablet landscape and bigger */
-@media (min-width: $breakpoint-medium) {
+/* Phone landscape and bigger */
+@media (min-width: $breakpoint-small) {
 
     .uk-offcanvas-bar {
-        left: (-$offcanvas-bar-width-m);
-        width: $offcanvas-bar-width-m;
-        padding: $offcanvas-bar-padding-vertical-m $offcanvas-bar-padding-horizontal-m;
+        left: (-$offcanvas-bar-width-s);
+        width: $offcanvas-bar-width-s;
+        padding: $offcanvas-bar-padding-vertical-s $offcanvas-bar-padding-horizontal-s;
     }
 
 }
@@ -121,9 +121,9 @@ $offcanvas-overlay-background:                   rgba(0,0,0,0.1) !default;
 }
 
 /* Tablet landscape and bigger */
-@media (min-width: $breakpoint-medium) {
+@media (min-width: $breakpoint-small) {
 
-    .uk-offcanvas-flip .uk-offcanvas-bar { right: (-$offcanvas-bar-width-m); }
+    .uk-offcanvas-flip .uk-offcanvas-bar { right: (-$offcanvas-bar-width-s); }
 
 }
 
@@ -179,9 +179,9 @@ $offcanvas-overlay-background:                   rgba(0,0,0,0.1) !default;
 .uk-open > .uk-offcanvas-reveal { width: $offcanvas-bar-width; }
 
 /* Tablet landscape and bigger */
-@media (min-width: $breakpoint-medium) {
+@media (min-width: $breakpoint-small) {
 
-    .uk-open > .uk-offcanvas-reveal { width: $offcanvas-bar-width-m; }
+    .uk-open > .uk-offcanvas-reveal { width: $offcanvas-bar-width-s; }
 
 }
 
@@ -209,11 +209,11 @@ $offcanvas-overlay-background:                   rgba(0,0,0,0.1) !default;
 }
 
 /* Tablet landscape and bigger */
-@media (min-width: $breakpoint-medium) {
+@media (min-width: $breakpoint-small) {
 
     .uk-offcanvas-close {
-        top: $offcanvas-close-position-m;
-        right: $offcanvas-close-position-m;
+        top: $offcanvas-close-position-s;
+        right: $offcanvas-close-position-s;
     }
 
 }
@@ -304,11 +304,11 @@ $offcanvas-overlay-background:                   rgba(0,0,0,0.1) !default;
 .uk-offcanvas-flip.uk-offcanvas-container-animation { left: (-$offcanvas-bar-width); }
 
 /* Tablet landscape and bigger */
-@media (min-width: $breakpoint-medium) {
+@media (min-width: $breakpoint-small) {
 
-    :not(.uk-offcanvas-flip).uk-offcanvas-container-animation { left: $offcanvas-bar-width-m; }
+    :not(.uk-offcanvas-flip).uk-offcanvas-container-animation { left: $offcanvas-bar-width-s; }
 
-    .uk-offcanvas-flip.uk-offcanvas-container-animation { left: (-$offcanvas-bar-width-m); }
+    .uk-offcanvas-flip.uk-offcanvas-container-animation { left: (-$offcanvas-bar-width-s); }
 
 }
 

package/src/scss/components/utility.scss

@@ -405,7 +405,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: block; }
+.uk-logo > :where(img, svg, video) { display: inline-block; }
 
 .uk-logo-inverse { display: none; }
 

package/src/scss/mixins-theme.scss

@@ -1761,16 +1761,6 @@
 @mixin hook-navbar-dropbar(){ box-shadow: $navbar-dropbar-box-shadow; }
 @mixin hook-navbar-misc(){
 
-    /*
-     * Navbar
-     */
-
-    .uk-navbar-container > .uk-container .uk-navbar-left {
-        margin-left: (-$navbar-nav-item-padding-horizontal);
-        margin-right: (-$navbar-nav-item-padding-horizontal);
-    }
-    .uk-navbar-container > .uk-container .uk-navbar-right { 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

@@ -367,9 +367,11 @@ $inverse-dotnav-item-active-background: rgba($inverse-global-color, 0.9) !defaul
 $global-z-index: 1000 !default;
 $drop-z-index: $global-z-index + 20 !default;
 $drop-margin: $global-margin !default;
+$drop-viewport-margin: 15px !default;
 $drop-width: 300px !default;
 $dropdown-z-index: $global-z-index + 20 !default;
 $dropdown-margin: $global-small-margin !default;
+$dropdown-viewport-margin: 15px !default;
 $dropdown-min-width: 200px !default;
 $dropdown-padding: 25px !default;
 $dropdown-background: $global-background !default;
@@ -650,13 +652,19 @@ $modal-padding-vertical-s: 50px !default;
 $modal-dialog-width: 600px !default;
 $modal-dialog-background: $global-background !default;
 $modal-container-width: 1200px !default;
-$modal-body-padding-horizontal: $global-gutter !default;
-$modal-body-padding-vertical: $global-gutter !default;
-$modal-header-padding-horizontal: $global-gutter !default;
+$modal-body-padding-horizontal: 20px !default;
+$modal-body-padding-vertical: 20px !default;
+$modal-body-padding-horizontal-s: $global-gutter !default;
+$modal-body-padding-vertical-s: $global-gutter !default;
+$modal-header-padding-horizontal: 20px !default;
 $modal-header-padding-vertical: ($modal-header-padding-horizontal * 0.5) !default;
+$modal-header-padding-horizontal-s: $global-gutter !default;
+$modal-header-padding-vertical-s: ($modal-header-padding-horizontal-s * 0.5) !default;
 $modal-header-background: $modal-dialog-background !default;
-$modal-footer-padding-horizontal: $global-gutter !default;
+$modal-footer-padding-horizontal: 20px !default;
 $modal-footer-padding-vertical: ($modal-footer-padding-horizontal * 0.5) !default;
+$modal-footer-padding-horizontal-s: $global-gutter !default;
+$modal-footer-padding-vertical-s: ($modal-footer-padding-horizontal-s * 0.5) !default;
 $modal-footer-background: $modal-dialog-background !default;
 $modal-title-font-size: $global-xlarge-font-size !default;
 $modal-title-line-height: 1.3 !default;
@@ -730,19 +738,23 @@ $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;
 $navbar-subtitle-font-size: $global-small-font-size !default;
 $navbar-dropdown-z-index: $global-z-index + 20 !default;
 $navbar-dropdown-margin: 15px !default;
+$navbar-dropdown-shift-margin: 0 !default;
+$navbar-dropdown-viewport-margin: 15px !default;
 $navbar-dropdown-width: 200px !default;
 $navbar-dropdown-padding: 25px !default;
 $navbar-dropdown-background: $global-background !default;
@@ -788,16 +800,16 @@ $notification-message-warning-color: $global-warning-background !default;
 $notification-message-danger-color: $global-danger-background !default;
 $offcanvas-z-index: $global-z-index !default;
 $offcanvas-bar-width: 270px !default;
-$offcanvas-bar-padding-vertical: $global-margin !default;
-$offcanvas-bar-padding-horizontal: $global-margin !default;
+$offcanvas-bar-padding-vertical: 20px !default;
+$offcanvas-bar-padding-horizontal: 20px !default;
 $offcanvas-bar-background: $global-secondary-background !default;
 $offcanvas-bar-color-mode: light !default;
-$offcanvas-bar-width-m: 350px !default;
-$offcanvas-bar-padding-vertical-m: $global-medium-gutter !default;
-$offcanvas-bar-padding-horizontal-m: $global-medium-gutter !default;
+$offcanvas-bar-width-s: 350px !default;
+$offcanvas-bar-padding-vertical-s: $global-gutter !default;
+$offcanvas-bar-padding-horizontal-s: $global-gutter !default;
 $offcanvas-close-position: 5px !default;
 $offcanvas-close-padding: 5px !default;
-$offcanvas-close-position-m: 20px !default;
+$offcanvas-close-position-s: 10px !default;
 $offcanvas-overlay-background: rgba(0,0,0,0.1) !default;
 $overlay-padding-horizontal: $global-gutter !default;
 $overlay-padding-vertical: $global-gutter !default;

package/src/scss/variables.scss

@@ -366,9 +366,11 @@ $inverse-dotnav-item-active-background: rgba($inverse-global-color, 0.9) !defaul
 $global-z-index: 1000 !default;
 $drop-z-index: $global-z-index + 20 !default;
 $drop-margin: $global-margin !default;
+$drop-viewport-margin: 15px !default;
 $drop-width: 300px !default;
 $dropdown-z-index: $global-z-index + 20 !default;
 $dropdown-margin: $global-small-margin !default;
+$dropdown-viewport-margin: 15px !default;
 $dropdown-min-width: 200px !default;
 $dropdown-padding: 15px !default;
 $dropdown-background: $global-muted-background !default;
@@ -648,13 +650,19 @@ $modal-padding-vertical-s: 50px !default;
 $modal-dialog-width: 600px !default;
 $modal-dialog-background: $global-background !default;
 $modal-container-width: 1200px !default;
-$modal-body-padding-horizontal: $global-gutter !default;
-$modal-body-padding-vertical: $global-gutter !default;
-$modal-header-padding-horizontal: $global-gutter !default;
+$modal-body-padding-horizontal: 20px !default;
+$modal-body-padding-vertical: 20px !default;
+$modal-body-padding-horizontal-s: $global-gutter !default;
+$modal-body-padding-vertical-s: $global-gutter !default;
+$modal-header-padding-horizontal: 20px !default;
 $modal-header-padding-vertical: ($modal-header-padding-horizontal * 0.5) !default;
+$modal-header-padding-horizontal-s: $global-gutter !default;
+$modal-header-padding-vertical-s: ($modal-header-padding-horizontal-s * 0.5) !default;
 $modal-header-background: $global-muted-background !default;
-$modal-footer-padding-horizontal: $global-gutter !default;
+$modal-footer-padding-horizontal: 20px !default;
 $modal-footer-padding-vertical: ($modal-footer-padding-horizontal * 0.5) !default;
+$modal-footer-padding-horizontal-s: $global-gutter !default;
+$modal-footer-padding-vertical-s: ($modal-footer-padding-horizontal-s * 0.5) !default;
 $modal-footer-background: $global-muted-background !default;
 $modal-title-font-size: $global-xlarge-font-size !default;
 $modal-title-line-height: 1.3 !default;
@@ -728,6 +736,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,12 +744,15 @@ $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;
 $navbar-subtitle-font-size: $global-small-font-size !default;
 $navbar-dropdown-z-index: $global-z-index + 20 !default;
-$navbar-dropdown-margin: 0px !default;
+$navbar-dropdown-margin: 0 !default;
+$navbar-dropdown-shift-margin: 0 !default;
+$navbar-dropdown-viewport-margin: 15px !default;
 $navbar-dropdown-width: 200px !default;
 $navbar-dropdown-padding: 15px !default;
 $navbar-dropdown-background: $global-muted-background !default;
@@ -786,16 +798,16 @@ $notification-message-warning-color: $global-warning-background !default;
 $notification-message-danger-color: $global-danger-background !default;
 $offcanvas-z-index: $global-z-index !default;
 $offcanvas-bar-width: 270px !default;
-$offcanvas-bar-padding-vertical: $global-margin !default;
-$offcanvas-bar-padding-horizontal: $global-margin !default;
+$offcanvas-bar-padding-vertical: 20px !default;
+$offcanvas-bar-padding-horizontal: 20px !default;
 $offcanvas-bar-background: $global-secondary-background !default;
 $offcanvas-bar-color-mode: light !default;
-$offcanvas-bar-width-m: 350px !default;
-$offcanvas-bar-padding-vertical-m: $global-medium-gutter !default;
-$offcanvas-bar-padding-horizontal-m: $global-medium-gutter !default;
+$offcanvas-bar-width-s: 350px !default;
+$offcanvas-bar-padding-vertical-s: $global-gutter !default;
+$offcanvas-bar-padding-horizontal-s: $global-gutter !default;
 $offcanvas-close-position: 5px !default;
 $offcanvas-close-padding: 5px !default;
-$offcanvas-close-position-m: 20px !default;
+$offcanvas-close-position-s: 10px !default;
 $offcanvas-overlay-background: rgba(0,0,0,0.1) !default;
 $overlay-padding-horizontal: $global-gutter !default;
 $overlay-padding-vertical: $global-gutter !default;

package/tests/navbar.html

@@ -1400,33 +1400,25 @@
 
                     <nav class="uk-navbar uk-navbar-container uk-margin">
                         <div class="uk-navbar-left">
-                            <div>
-                                <a class="uk-navbar-item uk-logo" href="#">Logo</a>
-                                <div class="uk-navbar-dropdown" uk-drop="mode: click; cls-drop: uk-navbar-dropdown; boundary: !nav; flip: x">Dropdown</div>
-                            </div>
+                            <a class="uk-navbar-item uk-logo" href="#">Logo</a>
+                            <div class="uk-navbar-dropdown" uk-drop="mode: click; cls-drop: uk-navbar-dropdown; boundary: !nav; flip: x">Dropdown</div>
                         </div>
                         <div class="uk-navbar-right">
-                            <div>
-                                <a class="uk-navbar-toggle" href="#" uk-navbar-toggle-icon></a>
-                                <div class="uk-navbar-dropdown" uk-drop="mode: click; cls-drop: uk-navbar-dropdown; boundary: !nav; flip: x">Dropdown</div>
-                            </div>
+                            <a class="uk-navbar-toggle" href="#" uk-navbar-toggle-icon></a>
+                            <div class="uk-navbar-dropdown" uk-drop="mode: click; cls-drop: uk-navbar-dropdown; boundary: !nav; flip: x">Dropdown</div>
                         </div>
                     </nav>
 
                     <nav class="uk-navbar uk-navbar-container uk-margin">
                         <div class="uk-navbar-left">
-                            <div>
-                                <a class="uk-navbar-toggle" href="#">Menu</a>
-                                <div class="uk-navbar-dropdown" uk-drop="mode: click; cls-drop: uk-navbar-dropdown; boundary: !nav; flip: x">Dropdown</div>
-                            </div>
+                            <a class="uk-navbar-toggle" href="#">Menu</a>
+                            <div class="uk-navbar-dropdown" uk-drop="mode: click; cls-drop: uk-navbar-dropdown; boundary: !nav; flip: x">Dropdown</div>
                         </div>
                         <div class="uk-navbar-right">
-                            <div>
-                                <a class="uk-navbar-toggle" href="#">
-                                    <span class="uk-margin-small-right">Menu</span> <span uk-navbar-toggle-icon></span>
-                                </a>
-                                <div class="uk-navbar-dropdown" uk-drop="mode: click; cls-drop: uk-navbar-dropdown; boundary: !nav; flip: x">Dropdown</div>
-                            </div>
+                            <a class="uk-navbar-toggle" href="#">
+                                <span class="uk-margin-small-right">Menu</span> <span uk-navbar-toggle-icon></span>
+                            </a>
+                            <div class="uk-navbar-dropdown" uk-drop="mode: click; cls-drop: uk-navbar-dropdown; boundary: !nav; flip: x">Dropdown</div>
                         </div>
                     </nav>
 
@@ -1767,8 +1759,6 @@
                 <div class="uk-navbar">
                     <div class="uk-navbar-left">
 
-                        <a class="uk-navbar-item uk-logo" href="#">Logo</a>
-
                         <ul class="uk-navbar-nav">
                             <li class="uk-active"><a href="#">Active</a></li>
                             <li><a href="#">Parent</a></li>
@@ -1818,6 +1808,8 @@
                             </ul>
                         </div>
 
+                        <a class="uk-navbar-toggle" uk-navbar-toggle-icon href="#"></a>
+
                     </div>
                 </div>
             </div>
@@ -1843,19 +1835,7 @@
                     </div>
                     <div class="uk-navbar-right">
 
-                        <div class="uk-navbar-item">
-                            <ul class="uk-grid-small" uk-grid>
-                                <li>
-                                    <a class="uk-icon-button" href="#" uk-icon="icon: trash"></a>
-                                </li>
-                                <li>
-                                    <a class="uk-icon-button" href="#" uk-icon="icon: trash"></a>
-                                </li>
-                                <li>
-                                    <a class="uk-icon-button" href="#" uk-icon="icon: trash"></a>
-                                </li>
-                            </ul>
-                        </div>
+                        <a class="uk-navbar-toggle" uk-navbar-toggle-icon href="#"></a>
 
                     </div>
                 </div>
@@ -1906,19 +1886,7 @@
                             <li><a href="#">Item</a></li>
                         </ul>
 
-                        <div class="uk-navbar-item">
-                            <ul class="uk-grid-small" uk-grid>
-                                <li>
-                                    <a class="uk-icon-button" href="#" uk-icon="icon: trash"></a>
-                                </li>
-                                <li>
-                                    <a class="uk-icon-button" href="#" uk-icon="icon: trash"></a>
-                                </li>
-                                <li>
-                                    <a class="uk-icon-button" href="#" uk-icon="icon: trash"></a>
-                                </li>
-                            </ul>
-                        </div>
+                        <a class="uk-navbar-toggle" uk-navbar-toggle-icon href="#"></a>
 
                     </div>
                 </div>
@@ -1945,19 +1913,7 @@
                     </div>
                     <div class="uk-navbar-right">
 
-                        <div class="uk-navbar-item">
-                            <ul class="uk-grid-small" uk-grid>
-                                <li>
-                                    <a class="uk-icon-button" href="#" uk-icon="icon: trash"></a>
-                                </li>
-                                <li>
-                                    <a class="uk-icon-button" href="#" uk-icon="icon: trash"></a>
-                                </li>
-                                <li>
-                                    <a class="uk-icon-button" href="#" uk-icon="icon: trash"></a>
-                                </li>
-                            </ul>
-                        </div>
+                        <a class="uk-navbar-toggle" uk-navbar-toggle-icon href="#"></a>
 
                     </div>
                 </div>

package/tests/offcanvas.html

@@ -140,7 +140,7 @@
             <div id="offcanvas-slide" uk-offcanvas>
                 <div class="uk-offcanvas-bar uk-flex uk-flex-column uk-text-center">
 
-                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close></button>
+                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close uk-toggle="cls: uk-close-large; mode: media; media: @s"></button>
 
                     <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical uk-nav-parent-icon" uk-nav>
                         <li class="uk-active"><a href="#">Active</a></li>
@@ -187,7 +187,7 @@
             <div id="offcanvas-reveal" uk-offcanvas="mode: reveal">
                 <div class="uk-offcanvas-bar uk-flex uk-flex-column uk-text-center">
 
-                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close></button>
+                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close uk-toggle="cls: uk-close-large; mode: media; media: @s"></button>
 
                     <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical uk-nav-parent-icon" uk-nav>
                         <li class="uk-active"><a href="#">Active</a></li>
@@ -234,7 +234,7 @@
             <div id="offcanvas-push" uk-offcanvas="mode: push">
                 <div class="uk-offcanvas-bar uk-flex uk-flex-column uk-text-center">
 
-                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close></button>
+                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close uk-toggle="cls: uk-close-large; mode: media; media: @s"></button>
 
                     <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical uk-nav-parent-icon" uk-nav>
                         <li class="uk-active"><a href="#">Active</a></li>
@@ -281,7 +281,7 @@
             <div id="offcanvas-none" uk-offcanvas="mode: none">
                 <div class="uk-offcanvas-bar uk-flex uk-flex-column uk-text-center">
 
-                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close></button>
+                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close uk-toggle="cls: uk-close-large; mode: media; media: @s"></button>
 
                     <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical uk-nav-parent-icon" uk-nav>
                         <li class="uk-active"><a href="#">Active</a></li>
@@ -328,7 +328,7 @@
             <div id="offcanvas-flip-slide" uk-offcanvas="flip: true">
                 <div class="uk-offcanvas-bar uk-flex uk-flex-column uk-text-center">
 
-                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close></button>
+                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close uk-toggle="cls: uk-close-large; mode: media; media: @s"></button>
 
                     <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical uk-nav-parent-icon" uk-nav>
                         <li class="uk-active"><a href="#">Active</a></li>
@@ -375,7 +375,7 @@
             <div id="offcanvas-flip-reveal" uk-offcanvas="mode: reveal; flip: true">
                 <div class="uk-offcanvas-bar uk-flex uk-flex-column uk-text-center">
 
-                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close></button>
+                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close uk-toggle="cls: uk-close-large; mode: media; media: @s"></button>
 
                     <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical uk-nav-parent-icon" uk-nav>
                         <li class="uk-active"><a href="#">Active</a></li>
@@ -422,7 +422,7 @@
             <div id="offcanvas-flip-push" uk-offcanvas="mode: push; flip: true">
                 <div class="uk-offcanvas-bar uk-flex uk-flex-column uk-text-center">
 
-                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close></button>
+                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close uk-toggle="cls: uk-close-large; mode: media; media: @s"></button>
 
                     <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical uk-nav-parent-icon" uk-nav>
                         <li class="uk-active"><a href="#">Active</a></li>
@@ -469,7 +469,7 @@
             <div id="offcanvas-flip-none" uk-offcanvas="mode: none; flip: true">
                 <div class="uk-offcanvas-bar uk-flex uk-flex-column uk-text-center">
 
-                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close></button>
+                    <button class="uk-offcanvas-close uk-close-large" type="button" uk-close uk-toggle="cls: uk-close-large; mode: media; media: @s"></button>
 
                     <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical uk-nav-parent-icon" uk-nav>
                         <li class="uk-active"><a href="#">Active</a></li>