uikit 3.14.4-dev.4bd89c5ca → 3.14.4-dev.6002e7046

package/src/less/components/navbar.less

@@ -10,6 +10,7 @@
 //                  `uk-navbar-center-left`
 //                  `uk-navbar-center-right`
 //                  `uk-navbar-nav`
+//                  `uk-navbar-parent-icon`
 //                  `uk-navbar-item`
 //                  `uk-navbar-toggle`
 //                  `uk-navbar-subtitle`
@@ -51,10 +52,7 @@
 @navbar-nav-item-onclick-color:                 @global-emphasis-color;
 @navbar-nav-item-active-color:                  @global-emphasis-color;
 
-@navbar-parent-icon-width:                      12px;
-@navbar-parent-icon-height:                     12px;
 @navbar-parent-icon-margin-left:                4px;
-@navbar-parent-icon-color:                      @navbar-nav-item-color;
 
 @navbar-item-padding-horizontal:                15px;
 @navbar-item-color:                             @global-color;
@@ -79,16 +77,16 @@
 @navbar-dropdown-large-shift-margin:            0;
 @navbar-dropdown-large-padding:                 40px;
 
-@navbar-dropdown-stretch-padding-top:           15px;
-@navbar-dropdown-stretch-padding-bottom:        @navbar-dropdown-stretch-padding-top;
-@navbar-dropdown-stretch-padding-horizontal:    15px;
-@navbar-dropdown-stretch-padding-horizontal-s:  @global-gutter;
-@navbar-dropdown-stretch-padding-horizontal-m:  @global-medium-gutter;
-@navbar-dropdown-stretch-background:            @navbar-dropdown-background;
-
+@navbar-dropdown-dropbar-shift-margin:          0;
 @navbar-dropdown-dropbar-padding-top:           @navbar-dropdown-padding;
 @navbar-dropdown-dropbar-padding-bottom:        @navbar-dropdown-dropbar-padding-top;
-@navbar-dropdown-dropbar-padding-horizontal:    @navbar-nav-item-padding-horizontal;
+@navbar-dropdown-dropbar-viewport-margin:       15px;
+@navbar-dropdown-dropbar-viewport-margin-s:     @global-gutter;
+@navbar-dropdown-dropbar-viewport-margin-m:     @global-medium-gutter;
+
+@navbar-dropdown-dropbar-large-shift-margin:    0;
+@navbar-dropdown-dropbar-large-padding-top:     @navbar-dropdown-large-padding;
+@navbar-dropdown-dropbar-large-padding-bottom:  @navbar-dropdown-dropbar-large-padding-top;
 
 @navbar-dropdown-nav-item-color:                @global-muted-color;
 @navbar-dropdown-nav-item-hover-color:          @global-color;
@@ -101,12 +99,8 @@
 @navbar-dropdown-nav-sublist-item-hover-color:  @global-color;
 @navbar-dropdown-nav-sublist-item-active-color: @global-emphasis-color;
 
-@navbar-dropbar-background:                     @navbar-dropdown-background;
 @navbar-dropbar-z-index:                        @global-z-index - 20;
 
-@internal-navbar-parent-close-image:            "../../images/backgrounds/navbar-parent-close.svg";
-@internal-navbar-parent-open-image:             "../../images/backgrounds/navbar-parent-open.svg";
-
 
 /* ========================================================================
    Component: Navbar
@@ -289,19 +283,9 @@
 /* Parent icon modifier
  ========================================================================== */
 
-.uk-navbar-parent-icon .uk-navbar-nav > .uk-parent > a::after {
-    content: "";
-    width: @navbar-parent-icon-width;
-    height: @navbar-parent-icon-height;
-    margin-left: @navbar-parent-icon-margin-left;
-    .svg-fill(@internal-navbar-parent-close-image, "#000", @navbar-parent-icon-color);
-    background-repeat: no-repeat;
-    background-position: 50% 50%;
-    .hook-nav-parent-icon();
-}
+.uk-navbar-parent-icon { margin-left: @navbar-parent-icon-margin-left; }
 
-.uk-navbar-parent-icon .uk-navbar-nav > .uk-parent:hover > a::after,
-.uk-navbar-parent-icon .uk-navbar-nav > .uk-parent > a[aria-expanded="true"]::after { .svg-fill(@internal-navbar-parent-open-image, "#000", @navbar-parent-icon-color); }
+.uk-navbar-nav > li > a[aria-expanded="true"] .uk-navbar-parent-icon { transform: rotate(180deg); }
 
 
 /* Item
@@ -410,7 +394,6 @@
     /* 3 */
     box-sizing: border-box;
     width: @navbar-dropdown-width;
-    max-width: 100vw;
     /* 4 */
     padding: @navbar-dropdown-padding;
     background: @navbar-dropdown-background;
@@ -421,6 +404,12 @@
 /* Show */
 .uk-navbar-dropdown.uk-open { display: block; }
 
+/*
+ * Remove margin from the last-child
+ */
+
+ .uk-navbar-dropdown > :last-child { margin-bottom: 0; }
+
 // Color Mode
 .uk-navbar-dropdown:extend(.uk-light all) when (@navbar-dropdown-color-mode = light) {}
 .uk-navbar-dropdown:extend(.uk-dark all) when (@navbar-dropdown-color-mode = dark) {}
@@ -456,63 +445,48 @@
 .uk-navbar-dropdown-large {
     --uk-position-shift-offset: @navbar-dropdown-large-shift-margin;
     padding: @navbar-dropdown-large-padding;
+    .hook-navbar-dropdown-large();
 }
 
 /*
- * Stretch modifier
- * 1. Allow scrolling
- * 2. Style
+ * Dropbar modifier
+ * 1. Reset dropdown width to prevent to early shifting
+ * 2. Reset style
+ * 3. Padding
  */
 
-.uk-navbar-dropdown-stretch {
-    --uk-position-offset: 0;
-    --uk-position-shift-offset: 0;
-    --uk-position-viewport-offset: 0;
+.uk-navbar-dropdown-dropbar {
     /* 1 */
-    overflow-y: auto;
-    -webkit-overflow-scrolling: touch;
+    width: auto;
     /* 2 */
-    padding: @navbar-dropdown-stretch-padding-top @navbar-dropdown-stretch-padding-horizontal @navbar-dropdown-stretch-padding-bottom @navbar-dropdown-stretch-padding-horizontal;
-    background: @navbar-dropdown-stretch-background;
-    .hook-navbar-dropdown-stretch();
+    background: transparent;
+    /* 3 */
+    padding: @navbar-dropdown-dropbar-padding-top 0 @navbar-dropdown-dropbar-padding-bottom 0;
+    --uk-position-offset: 0;
+    --uk-position-shift-offset: @navbar-dropdown-dropbar-shift-margin;
+    --uk-position-viewport-offset: @navbar-dropdown-dropbar-viewport-margin;
+    .hook-navbar-dropdown-dropbar();
 }
 
 /* Phone landscape and bigger */
 @media (min-width: @breakpoint-small) {
 
-    .uk-navbar-dropdown-stretch {
-        padding-left: @navbar-dropdown-stretch-padding-horizontal-s;
-        padding-right: @navbar-dropdown-stretch-padding-horizontal-s;
-    }
+    .uk-navbar-dropdown-dropbar { --uk-position-viewport-offset: @navbar-dropdown-dropbar-viewport-margin-s; }
 
 }
 
 /* Tablet landscape and bigger */
 @media (min-width: @breakpoint-medium) {
 
-    .uk-navbar-dropdown-stretch {
-        padding-left: @navbar-dropdown-stretch-padding-horizontal-m;
-        padding-right: @navbar-dropdown-stretch-padding-horizontal-m;
-    }
+    .uk-navbar-dropdown-dropbar { --uk-position-viewport-offset: @navbar-dropdown-dropbar-viewport-margin-m; }
 
 }
 
-/*
- * Dropbar modifier
- * 1. Reset dropdown width to prevent to early shifting
- * 2. Reset style
- * 3. Padding
- */
-
-.uk-navbar-dropdown-dropbar {
-    /* 1 */
-    width: auto;
-    /* 2 */
-    background: transparent;
-    /* 3 */
-    padding: @navbar-dropdown-dropbar-padding-top @navbar-dropdown-dropbar-padding-horizontal @navbar-dropdown-dropbar-padding-bottom @navbar-dropdown-dropbar-padding-horizontal;
-    --uk-position-shift-offset: 0;
-    .hook-navbar-dropdown-dropbar();
+.uk-navbar-dropdown-dropbar-large {
+    --uk-position-shift-offset: @navbar-dropdown-dropbar-large-shift-margin;
+    padding-top: @navbar-dropdown-dropbar-large-padding-top;
+    padding-bottom: @navbar-dropdown-dropbar-large-padding-bottom;
+    .hook-navbar-dropdown-dropbar-large();
 }
 
 
@@ -586,12 +560,19 @@
 /* Dropbar
  ========================================================================== */
 
+/*
+ * 1. Reset dropbar
+ * 2. Width
+ */
+
 .uk-navbar-dropbar {
-    position: absolute;
+    /* 1 */
+    display: block !important;
     z-index: @navbar-dropbar-z-index;
+    padding: 0;
+    /* 2 */
     left: 0;
     right: 0;
-    background: @navbar-dropbar-background;
     .hook-navbar-dropbar();
 }
 
@@ -617,8 +598,9 @@
 .hook-navbar-transparent() {}
 .hook-navbar-sticky() {}
 .hook-navbar-dropdown() {}
-.hook-navbar-dropdown-stretch() {}
+.hook-navbar-dropdown-large() {}
 .hook-navbar-dropdown-dropbar() {}
+.hook-navbar-dropdown-dropbar-large() {}
 .hook-navbar-dropdown-nav() {}
 .hook-navbar-dropdown-nav-item() {}
 .hook-navbar-dropdown-nav-item-hover() {}
@@ -637,7 +619,6 @@
 @inverse-navbar-nav-item-hover-color:          @inverse-global-color;
 @inverse-navbar-nav-item-onclick-color:        @inverse-global-emphasis-color;
 @inverse-navbar-nav-item-active-color:         @inverse-global-emphasis-color;
-@inverse-navbar-parent-icon-color:             @inverse-navbar-nav-item-color;
 @inverse-navbar-item-color:                    @inverse-global-color;
 @inverse-navbar-toggle-color:                  @inverse-global-muted-color;
 @inverse-navbar-toggle-hover-color:            @inverse-global-color;
@@ -669,18 +650,6 @@
         .hook-inverse-navbar-nav-item-active();
     }
 
-    //
-    // Parent icon modifier
-    //
-
-    .uk-navbar-parent-icon .uk-navbar-nav > .uk-parent > a::after {
-        .svg-fill(@internal-navbar-parent-close-image, "#000", @inverse-navbar-parent-icon-color);
-        .hook-inverse-nav-parent-icon();
-    }
-    
-    .uk-navbar-parent-icon .uk-navbar-nav > .uk-parent:hover > a::after,
-    .uk-navbar-parent-icon .uk-navbar-nav > .uk-parent > a[aria-expanded="true"]::after { .svg-fill(@internal-navbar-parent-open-image, "#000", @inverse-navbar-parent-icon-color); }
-
     //
     // Item
     //
@@ -711,7 +680,6 @@
 .hook-inverse-navbar-nav-item-hover() {}
 .hook-inverse-navbar-nav-item-onclick() {}
 .hook-inverse-navbar-nav-item-active() {}
-.hook-inverse-nav-parent-icon() {}
 .hook-inverse-navbar-item() {}
 .hook-inverse-navbar-toggle() {}
 .hook-inverse-navbar-toggle-hover() {}

package/src/less/components/utility.less

@@ -147,6 +147,13 @@
 .uk-overflow-auto > :last-child { margin-bottom: 0; }
 
 
+/* Box Sizing
+ ========================================================================== */
+
+.uk-box-sizing-content { box-sizing: content-box; }
+.uk-box-sizing-border { box-sizing: border-box; }
+
+
 /* Resize
  ========================================================================== */
 
@@ -413,7 +420,7 @@
     .hook-logo-hover();
 }
 
-.uk-logo > :where(img, svg, video) { display: block; }
+.uk-logo :where(img, svg, video) { display: block; }
 
 .uk-logo-inverse { display: none; }
 
@@ -525,7 +532,8 @@
         .hook-inverse-logo-hover();
     }
 
-    .uk-logo > :not(.uk-logo-inverse):not(:only-of-type) { display: none; }
+    .uk-logo > picture:not(:only-of-type) > :not(.uk-logo-inverse),
+    .uk-logo > :not(picture):not(.uk-logo-inverse):not(:only-of-type) { display: none; }
     .uk-logo-inverse { display: block; }
 
 }

package/src/less/theme/_import.less

@@ -39,6 +39,7 @@
 @import "accordion.less";
 @import "drop.less";
 @import "dropdown.less";
+@import "dropbar.less";
 @import "modal.less";
 @import "slider.less";
 @import "sticky.less";

package/src/less/theme/dropbar.less

@@ -0,0 +1,44 @@
+//
+// Component: Dropbar
+//
+// ========================================================================
+
+
+// Variables
+// ========================================================================
+
+@dropbar-padding-top:                           25px;
+@dropbar-background:                            @global-background;
+
+//
+// New
+//
+
+@dropbar-top-box-shadow:                        0 12px 7px -6px rgba(0, 0, 0, 0.05);
+@dropbar-bottom-box-shadow:                     0 -12px 7px -6px rgba(0, 0, 0, 0.05);
+@dropbar-left-box-shadow:                       12px 0 7px -6px rgba(0, 0, 0, 0.05);
+@dropbar-right-box-shadow:                      -12px 0 7px -6px rgba(0, 0, 0, 0.05);
+
+
+// Component
+// ========================================================================
+
+.hook-dropbar() {}
+
+
+// Direction modifier
+// ========================================================================
+
+.hook-dropbar-top() { box-shadow: @dropbar-top-box-shadow; }
+
+.hook-dropbar-bottom() { box-shadow: @dropbar-bottom-box-shadow; }
+
+.hook-dropbar-left() { box-shadow: @dropbar-left-box-shadow; }
+
+.hook-dropbar-right() { box-shadow: @dropbar-right-box-shadow; }
+
+
+// Miscellaneous
+// ========================================================================
+
+.hook-dropbar-misc() {}

package/src/less/theme/dropdown.less

@@ -20,8 +20,6 @@
 
 @dropdown-box-shadow:                           0 5px 12px rgba(0,0,0,0.15);
 
-@dropdown-stretch-background:                   @global-muted-background;
-
 
 // Component
 // ========================================================================
@@ -29,15 +27,6 @@
 .hook-dropdown() { box-shadow: @dropdown-box-shadow; }
 
 
-// Stretch modifier
-// ========================================================================
-
-.hook-dropdown-stretch() {
-    box-shadow: none;
-    background: @dropdown-stretch-background;
-}
-
-
 // Nav
 // ========================================================================
 

package/src/less/theme/nav.less

@@ -11,17 +11,21 @@
 
 @nav-default-subtitle-font-size:                12px;
 
+//
+// New
+//
 
-// Sublists
-// ========================================================================
-
-.hook-nav-sub() {}
+@nav-background-margin-top:                     0;
+@nav-background-item-padding-horizontal:        10px;
+@nav-background-item-padding-vertical:          10px;
+@nav-background-item-hover-background:          @global-muted-background;
+@nav-background-item-active-background:         @global-muted-background;
 
 
-// Parent icon modifier
+// Sublists
 // ========================================================================
 
-.hook-nav-parent-icon() {}
+.hook-nav-sub() {}
 
 
 // Header
@@ -72,6 +76,30 @@
 .hook-nav-primary-divider() {}
 
 
+// Secondary style modifier
+// ========================================================================
+
+.hook-nav-secondary() {
+    > :not(.uk-nav-divider) + :not(.uk-nav-header, .uk-nav-divider) {  margin-top: @nav-background-margin-top; }
+}
+
+.hook-nav-secondary-item() { padding: @nav-background-item-padding-vertical @nav-background-item-padding-horizontal; }
+
+.hook-nav-secondary-item-hover() { background-color: @nav-background-item-hover-background; }
+
+.hook-nav-secondary-item-active() { background-color: @nav-background-item-active-background; }
+
+.hook-nav-secondary-subtitle() {}
+
+.hook-nav-secondary-subtitle-hover() {}
+
+.hook-nav-secondary-subtitle-active() {}
+
+.hook-nav-secondary-header() {}
+
+.hook-nav-secondary-divider() {}
+
+
 // Style modifier
 // ========================================================================
 
@@ -87,7 +115,8 @@
 // Inverse
 // ========================================================================
 
-.hook-inverse-nav-parent-icon() {}
+@inverse-nav-background-item-hover-background:  @inverse-global-muted-background;
+@inverse-nav-background-item-active-background: @inverse-global-muted-background;
 
 .hook-inverse-nav-default-item() {}
 .hook-inverse-nav-default-item-hover() {}
@@ -101,4 +130,13 @@
 .hook-inverse-nav-primary-header() {}
 .hook-inverse-nav-primary-divider() {}
 
+.hook-inverse-nav-secondary-item() {}
+.hook-inverse-nav-secondary-item-hover() { background-color: @inverse-nav-background-item-hover-background; }
+.hook-inverse-nav-secondary-item-active() { background-color: @inverse-nav-background-item-active-background; }
+.hook-inverse-nav-secondary-subtitle() {}
+.hook-inverse-nav-secondary-subtitle-hover() {}
+.hook-inverse-nav-secondary-subtitle-active() {}
+.hook-inverse-nav-secondary-header() {}
+.hook-inverse-nav-secondary-divider() {}
+
 .hook-inverse-nav-dividers() {}

package/src/less/theme/navbar.less

@@ -20,7 +20,6 @@
 @navbar-dropdown-margin:                        15px;
 @navbar-dropdown-padding:                       25px;
 @navbar-dropdown-background:                    @global-background;
-@navbar-dropdown-grid-gutter-horizontal:        (@navbar-dropdown-padding * 2);
 
 @navbar-dropdown-nav-subtitle-font-size:        12px;
 
@@ -34,11 +33,6 @@
 
 @navbar-dropdown-box-shadow:                    0 5px 12px rgba(0,0,0,0.15);
 
-@navbar-dropbar-box-shadow:                     0 5px 7px rgba(0, 0, 0, 0.05);
-
-@navbar-dropdown-grid-divider-border-width:     @global-border-width;
-@navbar-dropdown-grid-divider-border:           @navbar-dropdown-nav-divider-border;
-
 
 // Component
 // ========================================================================
@@ -68,12 +62,6 @@
 .hook-navbar-nav-item-active() {}
 
 
-// Parent icon modifier
-// ========================================================================
-
-.hook-nav-parent-icon() {}
-
-
 // Item
 // ========================================================================
 
@@ -113,10 +101,12 @@
 
 .hook-navbar-dropdown() { box-shadow: @navbar-dropdown-box-shadow; }
 
-.hook-navbar-dropdown-stretch() { box-shadow: none; }
+.hook-navbar-dropdown-large() {}
 
 .hook-navbar-dropdown-dropbar() { box-shadow: none; }
 
+.hook-navbar-dropdown-dropbar-large() {}
+
 
 // Dropdown nav
 // ========================================================================
@@ -137,40 +127,13 @@
 // Dropbar
 // ========================================================================
 
-.hook-navbar-dropbar() { box-shadow: @navbar-dropbar-box-shadow; }
+.hook-navbar-dropbar() {}
 
 
 // Miscellaneous
 // ========================================================================
 
-.hook-navbar-misc() {
-
-    /*
-     * Grid Divider
-     */
-
-    .uk-navbar-dropdown-grid > * { position: relative; }
-
-    .uk-navbar-dropdown-grid > :not(.uk-first-column)::before {
-        content: "";
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: (@navbar-dropdown-grid-gutter-horizontal / 2);
-        border-left: @navbar-dropdown-grid-divider-border-width solid @navbar-dropdown-grid-divider-border;
-    }
-
-    /* Vertical */
-    .uk-navbar-dropdown-grid.uk-grid-stack > .uk-grid-margin::before {
-        content: "";
-        position: absolute;
-        top: -(@navbar-dropdown-grid-gutter-vertical / 2);
-        left: @navbar-dropdown-grid-gutter-horizontal;
-        right: 0;
-        border-top: @navbar-dropdown-grid-divider-border-width solid @navbar-dropdown-grid-divider-border;
-    }
-
-}
+.hook-navbar-misc() {}
 
 
 // Inverse
@@ -181,8 +144,6 @@
 .hook-inverse-navbar-nav-item-onclick() {}
 .hook-inverse-navbar-nav-item-active() {}
 
-.hook-inverse-nav-parent-icon() {}
-
 .hook-inverse-navbar-item() {}
 
 .hook-inverse-navbar-toggle() {}

package/src/scss/components/_import.scss

@@ -40,6 +40,7 @@
 @import "accordion.scss";
 @import "drop.scss"; // After: Card
 @import "dropdown.scss"; // After: Card
+@import "dropbar.scss";
 @import "modal.scss"; // After: Close
 @import "slideshow.scss";
 @import "slider.scss";

package/src/scss/components/drop.scss

@@ -3,8 +3,7 @@
 //
 // Component:       `uk-drop`
 //
-// Modifiers:       `uk-drop-stretch`
-//                  `uk-drop-stack`
+// Modifiers:       `uk-drop-stack`
 //                  `uk-drop-grid`
 //
 // States:          `uk-open`
@@ -50,22 +49,6 @@ $drop-width:                                 300px !default;
 .uk-drop.uk-open { display: block; }
 
 
-/* Stretch modifier
- ========================================================================== */
-
-/*
- * 1. Allow scrolling
- */
-
-.uk-drop-stretch {
-    --uk-position-offset: 0;
-    --uk-position-viewport-offset: 0;
-    /* 1 */
-    overflow-y: auto;
-    -webkit-overflow-scrolling: touch;
-}
-
-
 /* Grid modifiers
  ========================================================================== */