uikit 3.25.18-dev.9fa57fb → 3.25.18-dev.f49c4ef

package/src/scss/components/grid.scss

@@ -21,6 +21,7 @@
 // Sub-modifier:    `uk-grid-item-match`
 //
 // States:          `uk-first-column`
+//                  `uk-first-row`
 //
 // ========================================================================
 
@@ -68,32 +69,32 @@
 .uk-grid > * > :last-child { margin-bottom: 0; }
 
 
-/* Gutter
+/* Gap
  ========================================================================== */
 
 /*
  * Default
  */
 
-/* Horizontal */
 .uk-grid { margin-left: (-$grid-gutter-horizontal); }
 .uk-grid > * { padding-left: $grid-gutter-horizontal; }
 
-/* Vertical */
-.uk-grid + .uk-grid,
-.uk-grid > .uk-grid-margin,
+.uk-grid { row-gap: $grid-gutter-vertical; }
+
+/* Margin */
+.uk-grid + :where(.uk-grid),
 * + .uk-grid-margin { margin-top: $grid-gutter-vertical; }
 
 /* Desktop and bigger */
 @media (min-width: $breakpoint-large) {
 
-    /* Horizontal */
     .uk-grid { margin-left: (-$grid-gutter-horizontal-l); }
     .uk-grid > * { padding-left: $grid-gutter-horizontal-l; }
 
-    /* Vertical */
-    .uk-grid + .uk-grid,
-    .uk-grid > .uk-grid-margin,
+    .uk-grid { row-gap: $grid-gutter-vertical-l; }
+
+    /* Margin */
+    .uk-grid + :where(.uk-grid),
     * + .uk-grid-margin { margin-top: $grid-gutter-vertical-l; }
 
 }
@@ -102,67 +103,63 @@
  * Small
  */
 
-/* Horizontal */
 .uk-grid-small,
 .uk-grid-column-small { margin-left: (-$grid-small-gutter-horizontal); }
 .uk-grid-small > *,
 .uk-grid-column-small > * { padding-left: $grid-small-gutter-horizontal; }
 
-/* Vertical */
-.uk-grid + .uk-grid-small,
-.uk-grid + .uk-grid-row-small,
-.uk-grid-small > .uk-grid-margin,
-.uk-grid-row-small > .uk-grid-margin,
+.uk-grid-small,
+.uk-grid-row-small { row-gap: $grid-small-gutter-vertical; }
+
+/* Margin */
+.uk-grid + :where(.uk-grid-small, .uk-grid-row-small),
 * + .uk-grid-margin-small { margin-top: $grid-small-gutter-vertical; }
 
 /*
  * Medium
  */
 
-/* Horizontal */
 .uk-grid-medium,
 .uk-grid-column-medium { margin-left: (-$grid-medium-gutter-horizontal); }
 .uk-grid-medium > *,
 .uk-grid-column-medium > * { padding-left: $grid-medium-gutter-horizontal; }
 
-/* Vertical */
-.uk-grid + .uk-grid-medium,
-.uk-grid + .uk-grid-row-medium,
-.uk-grid-medium > .uk-grid-margin,
-.uk-grid-row-medium > .uk-grid-margin,
+.uk-grid-medium,
+.uk-grid-row-medium { row-gap: $grid-medium-gutter-vertical; }
+
+/* Margin */
+.uk-grid + :where(.uk-grid-medium, .uk-grid-row-medium),
 * + .uk-grid-margin-medium { margin-top: $grid-medium-gutter-vertical; }
 
 /*
  * Large
  */
 
-/* Horizontal */
 .uk-grid-large,
 .uk-grid-column-large { margin-left: (-$grid-large-gutter-horizontal); }
 .uk-grid-large > *,
 .uk-grid-column-large > * { padding-left: $grid-large-gutter-horizontal; }
 
-/* Vertical */
-.uk-grid + .uk-grid-large,
-.uk-grid + .uk-grid-row-large,
-.uk-grid-large > .uk-grid-margin,
-.uk-grid-row-large > .uk-grid-margin,
+.uk-grid-large,
+.uk-grid-row-large { row-gap: $grid-large-gutter-vertical; }
+
+/* Margin */
+.uk-grid + :where(.uk-grid-large, .uk-grid-row-large),
 * + .uk-grid-margin-large { margin-top: $grid-large-gutter-vertical; }
 
 /* Desktop and bigger */
 @media (min-width: $breakpoint-large) {
 
-    /* Horizontal */
     .uk-grid-large,
     .uk-grid-column-large { margin-left: (-$grid-large-gutter-horizontal-l); }
     .uk-grid-large > *,
     .uk-grid-column-large > * { padding-left: $grid-large-gutter-horizontal-l; }
 
-    /* Vertical */
-    .uk-grid + .uk-grid-large,
-    .uk-grid + .uk-grid-row-large,
-    .uk-grid-large > .uk-grid-margin,
-    .uk-grid-row-large > .uk-grid-margin,
+    .uk-grid-large,
+    .uk-grid-row-large { row-gap: $grid-large-gutter-vertical-l; }
+
+    /* Margin */
+    .uk-grid + :where(.uk-grid-large, .uk-grid-row-large),
     * + .uk-grid-margin-large { margin-top: $grid-large-gutter-vertical-l; }
 
 }
@@ -171,17 +168,16 @@
  * Collapse
  */
 
-/* Horizontal */
 .uk-grid-collapse,
 .uk-grid-column-collapse { margin-left: 0; }
 .uk-grid-collapse > *,
 .uk-grid-column-collapse > * { padding-left: 0; }
 
-/* Vertical */
-.uk-grid + .uk-grid-collapse,
-.uk-grid + .uk-grid-row-collapse,
-.uk-grid-collapse > .uk-grid-margin,
-.uk-grid-row-collapse > .uk-grid-margin { margin-top: 0; }
+.uk-grid-collapse,
+.uk-grid-row-collapse { row-gap: 0; }
+
+/* Margin */
+.uk-grid + :where(.uk-grid-collapse, .uk-grid-row-collapse) { margin-top: 0; }
 
 
 /* Divider
@@ -189,6 +185,7 @@
 
 .uk-grid-divider > * { position: relative; }
 
+/* Horizontal */
 .uk-grid-divider > :not(.uk-first-column)::before {
     content: "";
     position: absolute;
@@ -199,7 +196,7 @@
 }
 
 /* Vertical */
-.uk-grid-divider.uk-grid-stack > .uk-grid-margin::before {
+.uk-grid-divider.uk-grid-stack > :not(.uk-first-row)::before {
     content: "";
     position: absolute;
     left: 0;
@@ -219,9 +216,9 @@
 .uk-grid-divider > :not(.uk-first-column)::before { left: $grid-gutter-horizontal; }
 
 /* Vertical */
-.uk-grid-divider.uk-grid-stack > .uk-grid-margin { margin-top: ($grid-gutter-vertical * 2); }
+.uk-grid-divider.uk-grid-stack { row-gap: ($grid-gutter-vertical * 2); }
 
-.uk-grid-divider.uk-grid-stack > .uk-grid-margin::before {
+.uk-grid-divider.uk-grid-stack > :not(.uk-first-row)::before {
     top: (-$grid-gutter-vertical);
     left: ($grid-gutter-horizontal * 2);
 }
@@ -236,9 +233,9 @@
     .uk-grid-divider > :not(.uk-first-column)::before { left: $grid-gutter-horizontal-l; }
 
     /* Vertical */
-    .uk-grid-divider.uk-grid-stack > .uk-grid-margin { margin-top: ($grid-gutter-vertical-l * 2); }
+    .uk-grid-divider.uk-grid-stack { row-gap: ($grid-gutter-vertical-l * 2); }
 
-    .uk-grid-divider.uk-grid-stack > .uk-grid-margin::before {
+    .uk-grid-divider.uk-grid-stack > :not(.uk-first-row)::before {
         top: (-$grid-gutter-vertical-l);
         left: ($grid-gutter-horizontal-l * 2);
     }
@@ -259,16 +256,15 @@
 .uk-grid-divider.uk-grid-column-small > :not(.uk-first-column)::before { left: $grid-small-gutter-horizontal; }
 
 /* Vertical */
-.uk-grid-divider.uk-grid-small.uk-grid-stack > .uk-grid-margin,
-.uk-grid-divider.uk-grid-row-small.uk-grid-stack > .uk-grid-margin { margin-top: ($grid-small-gutter-vertical * 2); }
+.uk-grid-divider.uk-grid-stack:where(.uk-grid-small, .uk-grid-row-small) { row-gap: ($grid-small-gutter-vertical * 2); }
 
-.uk-grid-divider.uk-grid-small.uk-grid-stack > .uk-grid-margin::before {
+.uk-grid-divider.uk-grid-stack.uk-grid-small > :not(.uk-first-row)::before {
     top: (-$grid-small-gutter-vertical);
     left: ($grid-small-gutter-horizontal * 2);
 }
 
-.uk-grid-divider.uk-grid-row-small.uk-grid-stack > .uk-grid-margin::before { top: (-$grid-small-gutter-vertical); }
-.uk-grid-divider.uk-grid-column-small.uk-grid-stack > .uk-grid-margin::before { left: ($grid-small-gutter-horizontal * 2); }
+.uk-grid-divider.uk-grid-stack.uk-grid-row-small > :not(.uk-first-row)::before { top: (-$grid-small-gutter-vertical); }
+.uk-grid-divider.uk-grid-stack.uk-grid-column-small > :not(.uk-first-row)::before { left: ($grid-small-gutter-horizontal * 2); }
 
 /*
  * Medium
@@ -284,16 +280,15 @@
 .uk-grid-divider.uk-grid-column-medium > :not(.uk-first-column)::before { left: $grid-medium-gutter-horizontal; }
 
 /* Vertical */
-.uk-grid-divider.uk-grid-medium.uk-grid-stack > .uk-grid-margin,
-.uk-grid-divider.uk-grid-row-medium.uk-grid-stack > .uk-grid-margin { margin-top: ($grid-medium-gutter-vertical * 2); }
+.uk-grid-divider.uk-grid-stack:where(.uk-grid-medium, .uk-grid-row-medium) { row-gap: ($grid-medium-gutter-vertical * 2); }
 
-.uk-grid-divider.uk-grid-medium.uk-grid-stack > .uk-grid-margin::before {
+.uk-grid-divider.uk-grid-stack.uk-grid-medium > :not(.uk-first-row)::before {
     top: (-$grid-medium-gutter-vertical);
     left: ($grid-medium-gutter-horizontal * 2);
 }
 
-.uk-grid-divider.uk-grid-row-medium.uk-grid-stack > .uk-grid-margin::before { top: (-$grid-medium-gutter-vertical); }
-.uk-grid-divider.uk-grid-column-medium.uk-grid-stack > .uk-grid-margin::before { left: ($grid-medium-gutter-horizontal * 2); }
+.uk-grid-divider.uk-grid-stack.uk-grid-row-medium > :not(.uk-first-row)::before { top: (-$grid-medium-gutter-vertical); }
+.uk-grid-divider.uk-grid-stack.uk-grid-column-medium > :not(.uk-first-row)::before { left: ($grid-medium-gutter-horizontal * 2); }
 
 /*
  * Large
@@ -309,16 +304,15 @@
 .uk-grid-divider.uk-grid-column-large > :not(.uk-first-column)::before { left: $grid-large-gutter-horizontal; }
 
 /* Vertical */
-.uk-grid-divider.uk-grid-large.uk-grid-stack > .uk-grid-margin,
-.uk-grid-divider.uk-grid-row-large.uk-grid-stack > .uk-grid-margin { margin-top: ($grid-large-gutter-vertical * 2); }
+.uk-grid-divider.uk-grid-stack:where(.uk-grid-large, .uk-grid-row-large) { row-gap: ($grid-large-gutter-vertical * 2); }
 
-.uk-grid-divider.uk-grid-large.uk-grid-stack > .uk-grid-margin::before {
+.uk-grid-divider.uk-grid-stack.uk-grid-large > :not(.uk-first-row)::before {
     top: (-$grid-large-gutter-vertical);
     left: ($grid-large-gutter-horizontal * 2);
 }
 
-.uk-grid-divider.uk-grid-row-large.uk-grid-stack > .uk-grid-margin::before { top: (-$grid-large-gutter-vertical); }
-.uk-grid-divider.uk-grid-column-large.uk-grid-stack > .uk-grid-margin::before { left: ($grid-large-gutter-horizontal * 2); }
+.uk-grid-divider.uk-grid-stack.uk-grid-row-large > :not(.uk-first-row)::before { top: (-$grid-large-gutter-vertical); }
+.uk-grid-divider.uk-grid-stack.uk-grid-column-large > :not(.uk-first-row)::before { left: ($grid-large-gutter-horizontal * 2); }
 
 /* Desktop and bigger */
 @media (min-width: $breakpoint-large) {
@@ -333,16 +327,15 @@
     .uk-grid-divider.uk-grid-column-large > :not(.uk-first-column)::before { left: $grid-large-gutter-horizontal-l; }
 
     /* Vertical */
-    .uk-grid-divider.uk-grid-large.uk-grid-stack > .uk-grid-margin,
-    .uk-grid-divider.uk-grid-row-large.uk-grid-stack > .uk-grid-margin { margin-top: ($grid-large-gutter-vertical-l * 2); }
+    .uk-grid-divider.uk-grid-stack:where(.uk-grid-large, .uk-grid-row-large) { row-gap: ($grid-large-gutter-vertical-l * 2); }
 
-    .uk-grid-divider.uk-grid-large.uk-grid-stack > .uk-grid-margin::before {
+    .uk-grid-divider.uk-grid-stack.uk-grid-large > :not(.uk-first-row)::before {
         top: (-$grid-large-gutter-vertical-l);
         left: ($grid-large-gutter-horizontal-l * 2);
     }
 
-    .uk-grid-divider.uk-grid-row-large.uk-grid-stack > .uk-grid-margin::before { top: (-$grid-large-gutter-vertical-l); }
-    .uk-grid-divider.uk-grid-column-large.uk-grid-stack > .uk-grid-margin::before { left: ($grid-large-gutter-horizontal-l * 2); }
+    .uk-grid-divider.uk-grid-stack.uk-grid-row-large > :not(.uk-first-row)::before { top: (-$grid-large-gutter-vertical-l); }
+    .uk-grid-divider.uk-grid-stack.uk-grid-column-large > :not(.uk-first-row)::before { left: ($grid-large-gutter-horizontal-l * 2); }
 
 }
 

package/src/scss/components/logo.scss

@@ -0,0 +1,75 @@
+@use "sass:meta";
+
+// Name:            Logo
+// Description:     Style for the logo
+//
+// Component:       `uk-logo`
+//
+// ========================================================================
+
+
+// Variables
+// ========================================================================
+
+
+/* ========================================================================
+   Component: Logo
+ ========================================================================== */
+
+/*
+ * 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;
+    /* 2 */
+    text-decoration: none;
+    @if(meta.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;
+    /* 2 */
+    text-decoration: none;
+    @if(meta.mixin-exists(hook-logo-hover)) {@include hook-logo-hover();}
+}
+
+.uk-logo :where(img:not([uk-svg]), svg, video) { display: block; }
+
+.uk-logo-inverse:where(:not([uk-svg])) { display: none; }
+
+
+// Misc
+// ========================================================================
+
+@if(meta.mixin-exists(hook-logo-misc)) {@include hook-logo-misc();}
+
+
+// Hooks
+// ========================================================================
+
+// @mixin hook-logo(){}
+// @mixin hook-logo-hover(){}
+// @mixin hook-logo-misc(){}
+
+
+// Inverse
+// ========================================================================
+
+
+
+
+// @mixin hook-inverse-logo(){}
+// @mixin hook-inverse-logo-hover(){}