Merge branch 'release/v0.22.4'

holtwick · Aug 12, 2024 · 11b3f3a · 11b3f3a
2 parents 70ea7b0 + 0d09aea
commit 11b3f3a
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 5 deletions.
diff --git a/lib/notification/oui-notification-activator.vue b/lib/notification/oui-notification-activator.vue
@@ -17,7 +17,7 @@ const ok = useSingleton('oui-notification')
             <div
               class="oui-notification"
               :class="{
-                '-has-action': n?.onCancel == null,
+                _has_action: n?.onCancel == null,
                 [`oui-notification-${n?.mode}`]: n?.mode,
               }"
               @click.stop="n?.onCancel == null && n.action()"

diff --git a/lib/notification/oui-notification.styl b/lib/notification/oui-notification.styl
@@ -66,7 +66,7 @@
     gap: px(8);
     cursor: default;
 
-    &.-has-action {
+    &._has_action {
       cursor: unquote("pointer");
 
       &:hover {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "oui-kit",
   "type": "module",
-  "version": "0.22.3",
+  "version": "0.22.4",
   "author": {
     "email": "dirk.holtwick@gmail.com",
     "name": "Dirk Holtwick",

diff --git a/src/css-form.styl b/src/css-form.styl
@@ -1,6 +1,7 @@
 @require "../stylus/index";
 
 oui-preset-layout();
+oui-preset-layout-attrs2();
 
 ._form {
   &_section {

diff --git a/src/css-layout.styl b/src/css-layout.styl
@@ -13,4 +13,5 @@
   background: -red-500;
 }
 
-oui-preset-layout();
+oui-preset-layout();
+oui-preset-layout-attrs2();
diff --git a/stylus/default-app.styl b/stylus/default-app.styl
@@ -48,5 +48,6 @@ body {
 }
 */
 oui-preset-layout-attrs();
+oui-preset-layout-attrs2();
 
 @import "../lib/index.styl";
diff --git a/stylus/default-page.styl b/stylus/default-page.styl
@@ -21,5 +21,6 @@ body {
 }
 
 oui-preset-layout-attrs();
+oui-preset-layout-attrs2();
 
 @import "../lib/index.styl";
diff --git a/stylus/preset/debug.styl b/stylus/preset/debug.styl
@@ -20,7 +20,7 @@ oui-debug() {
       padding: 1rem;
     }
 
-    &:hover, &:active, &.-show {
+    &:hover, &:active, &:_active, &.-show {
       border-radius: 4px;
       padding: 1rem;
       width: auto;

diff --git a/stylus/preset/layout.styl b/stylus/preset/layout.styl
@@ -97,3 +97,44 @@ oui-preset-layout-attrs() {
     }
   }
 }
+
+oui-preset-layout-attrs2() {
+  if __oui_once("layoutattrs2") {
+    .-x {
+      use: stack-x;
+    }
+
+    .-y {
+      use: stack-y;
+    }
+
+    .-center {
+      use: stack-item-center;
+    }
+
+    .-scroll {
+      use: stack-item-scroll;
+      contain: content;
+    }
+
+    .-grow {
+      flex: auto;
+    }
+
+    .-fix {
+      flex: 0;
+    }
+
+    .-gap {
+      gap: var(--space-s, px(8));
+    }
+
+    .-sep {
+      width: var(--space-s, px(8));
+    }
+
+    .-dots {
+      use: ellipsis;
+    }
+  }
+}