@cube-drone/marquee-css 0.4.0 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/marquee.css +44 -0
- package/package.json +1 -1
package/marquee.css
CHANGED
|
@@ -168,6 +168,50 @@
|
|
|
168
168
|
padding: 0.5rem;
|
|
169
169
|
}
|
|
170
170
|
|
|
171
|
+
/* ---- conflict / variant: a versioned-document merge conflict, shown inside
|
|
172
|
+
the body (the editor is the merge tool). Synthesized by the embedder at read
|
|
173
|
+
time, never authored. Stacked variants, each with an advisory label/when
|
|
174
|
+
line; the common ancestor (role=base) is de-emphasized, never hidden -
|
|
175
|
+
losing words is the one thing a conflict must not do. ---- */
|
|
176
|
+
.mq-conflict {
|
|
177
|
+
/* A light red wash: enough to say "resolve me", not enough to alarm. Low
|
|
178
|
+
alpha so it tints correctly over a light or a dark page. */
|
|
179
|
+
border: 1px solid rgba(200, 70, 70, 0.5);
|
|
180
|
+
border-radius: 0.375rem;
|
|
181
|
+
margin: 1rem 0;
|
|
182
|
+
background: rgba(200, 70, 70, 0.07);
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
.mq-variant {
|
|
186
|
+
padding: 0.5rem 0.75rem;
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
.mq-variant + .mq-variant {
|
|
190
|
+
border-top: 1px solid rgba(200, 70, 70, 0.25);
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
.mq-variant-head {
|
|
194
|
+
display: flex;
|
|
195
|
+
gap: 0.5rem;
|
|
196
|
+
align-items: baseline;
|
|
197
|
+
margin-bottom: 0.25rem;
|
|
198
|
+
font-size: 0.85em;
|
|
199
|
+
opacity: 0.75;
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
.mq-variant-label {
|
|
203
|
+
font-weight: 600;
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
.mq-variant-when {
|
|
207
|
+
opacity: 0.7;
|
|
208
|
+
font-variant-numeric: tabular-nums;
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
.mq-variant-base {
|
|
212
|
+
opacity: 0.6;
|
|
213
|
+
}
|
|
214
|
+
|
|
171
215
|
/* ---- the color slot: validated author values, property mapping ours ---- */
|
|
172
216
|
|
|
173
217
|
.mq-color {
|