From 42c23cc62d812c29c431977934af7b0f2a24b04b Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 03 May 2026 22:12:18 +0000
Subject: [PATCH] =mergin conflict?
---
forms.css | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/forms.css b/forms.css
index 48db02c..0b5625d 100644
--- a/forms.css
+++ b/forms.css
@@ -150,7 +150,10 @@
}
.field {
- margin: 2rem 0;
+ padding: 2rem 0;
+ border: 2px solid var(--base);
+ border-left: 0;
+ border-right: 0;
position: relative;
}
@@ -390,8 +393,16 @@
color: var(--contrast-200);
opacity: .8;
}
+<<<<<<< HEAD
-.radio-options.status label {
+.field.radio.status label {
+=======
+.radio-options[data-field="post_status"] fieldset {
+ display: flex;
+ width: 100%;
+}
+.radio-options[data-field="post_status"] label {
+>>>>>>> 75ac79b1e67a6bb4a195a86f55e5429cf2b4c3de
padding: 0 .5rem;
}
@@ -419,15 +430,15 @@
flex: unset!important;
}
-.radio-options {
+.field.radio {
--gap: .125rem .5rem;
}
-.radio-options input:not(.ch) + label::before {
+.field.radio input:not(.ch) + label::before {
display: none!important;
}
-.radio-options input:not(.ch) + label {
+.field.radio input:not(.ch) + label {
flex: unset!important;
padding: .25rem!important;
border-radius: 4px;
@@ -437,8 +448,8 @@
text-align: center;
}
-.radio-options input:not(.ch) + label:hover,
-.radio-options input:not(.ch):checked + label {
+.field.radio input:not(.ch) + label:hover,
+.field.radio input:not(.ch):checked + label {
border-color: var(--action-0);
color: var(--action-0);
}
@@ -1292,6 +1303,22 @@
margin-left: auto;
}
+.repeater .field-input-wrapper {
+ flex-direction: column;
+}
+.repeater .repeater-items {
+ width: 100%;
+
+}
+
+.remove-row,
+.add-repeater-row {
+ margin-left: auto;
+ min-height: 0;
+ height: var(--chipchip);
+ background-color: var(--action-0);
+}
+
/*******************************************************
UPLOADER
@@ -2356,21 +2383,21 @@
Tag Field
*/
/* Tag List Field */
-.field.tag-list .tag-input-row {
- display: flex;
- gap: 0.5rem;
- align-items: flex-start;
+.field.tag-list .field-input-wrapper {
+ flex-direction: column;
+}
+.field.tag-list .row {
margin-bottom: 1rem;
- flex-wrap: wrap;
+ --align: flex-end;
}
-.field.tag-list .tag-input-row .field {
+.field.tag-list .row .field {
flex: 1;
min-width: 150px;
margin: 0;
}
-.field.tag-list .tag-input-row .add-tag-item {
+.field.tag-list .tag .add-tag-item {
flex-shrink: 0;
white-space: nowrap;
margin-top: calc(var(--txt-medium) + 1rem);
@@ -2419,12 +2446,12 @@
}
@media (max-width: 768px) {
- .field.tag-list .tag-input-row {
+ .field.tag-list .tag {
flex-direction: column;
align-items: stretch;
}
- .field.tag-list .tag-input-row .field {
+ .field.tag-list .tag .field {
min-width: 100%;
}
}
@@ -2455,4 +2482,8 @@
opacity: 1;
transform: translateY(0); /* End at its normal position */
}
+}
+
+.field.radio fieldset {
+ display:flex;
}
\ No newline at end of file
--
Gitblit v1.10.0