@7365admin1/layer-common 3.2.2-staging.110 → 3.2.2-staging.111
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.
|
@@ -286,13 +286,16 @@
|
|
|
286
286
|
filter: none;
|
|
287
287
|
}
|
|
288
288
|
|
|
289
|
+
/* The design draws the ghost at the SAME size as the primary it stands next to
|
|
290
|
+
- Bulk Upload beside Add Unit, Scan QR Code beside Add Visitor are both
|
|
291
|
+
`height:40px; padding:0 16px; font-size:13.5px`, and only the fill, the
|
|
292
|
+
border and the weight differ. 38px / 0 14px / 13px was a smaller button than
|
|
293
|
+
the handoff asks for, and the 2px mismatch shows on every screen that draws
|
|
294
|
+
the pair. Height, padding and type therefore come from `.app-btn`. */
|
|
289
295
|
.app-btn--ghost {
|
|
290
|
-
height: 38px;
|
|
291
|
-
padding: 0 14px;
|
|
292
296
|
border: 1px solid var(--border);
|
|
293
297
|
background: var(--card);
|
|
294
298
|
color: var(--text2);
|
|
295
|
-
font-size: var(--fs-nav);
|
|
296
299
|
font-weight: var(--fw-btn);
|
|
297
300
|
}
|
|
298
301
|
|
package/assets/css/screens.css
CHANGED
|
@@ -242,9 +242,24 @@
|
|
|
242
242
|
font-size: var(--fs-cell);
|
|
243
243
|
}
|
|
244
244
|
|
|
245
|
-
|
|
246
|
-
.
|
|
247
|
-
|
|
245
|
+
/**
|
|
246
|
+
* The design's two buttons, for the dialogs and toolbars that draw their own.
|
|
247
|
+
*
|
|
248
|
+
* `.v-btn` is named on every selector below for SPECIFICITY, not decoration.
|
|
249
|
+
* Vuetify sizes its button from `--v-btn-height` (36px, set on
|
|
250
|
+
* `.v-btn--size-default`) and applies it at `.v-btn.v-btn--density-default` -
|
|
251
|
+
* two classes, which outrank a bare `.screen-btn-*`. So `height: var(--btn-h)`
|
|
252
|
+
* never reached the glass and EVERY one of these buttons drew at 36px against
|
|
253
|
+
* the design's 40. `min-width` lost the same argument at 64px.
|
|
254
|
+
*
|
|
255
|
+
* Beaten by specificity, not `!important` - the same way the central font
|
|
256
|
+
* re-point beat Vuetify's own font declarations. And the fix FEEDS
|
|
257
|
+
* `--v-btn-height` rather than overwriting `height`, so Vuetify's density
|
|
258
|
+
* arithmetic (including the icon button's `+12px`) keeps working off our number.
|
|
259
|
+
*/
|
|
260
|
+
.v-btn.screen-btn-primary {
|
|
261
|
+
--v-btn-height: var(--btn-h);
|
|
262
|
+
min-width: 0;
|
|
248
263
|
border-radius: var(--r-inner);
|
|
249
264
|
padding: 0 16px;
|
|
250
265
|
font-family: var(--font-sans);
|
|
@@ -269,10 +284,12 @@
|
|
|
269
284
|
* the input next to it - the same button Phase 2 gave the top bar - not a
|
|
270
285
|
* tinted pill.
|
|
271
286
|
*/
|
|
272
|
-
.screen-icon-btn {
|
|
287
|
+
.v-btn.screen-icon-btn {
|
|
288
|
+
--v-btn-height: var(--btn-h);
|
|
273
289
|
height: var(--btn-h);
|
|
274
290
|
width: var(--btn-h);
|
|
275
291
|
min-width: var(--btn-h);
|
|
292
|
+
padding: 0;
|
|
276
293
|
border-radius: var(--r-inner);
|
|
277
294
|
border: 1px solid var(--border);
|
|
278
295
|
background: var(--card);
|
|
@@ -283,8 +300,9 @@
|
|
|
283
300
|
opacity: 0;
|
|
284
301
|
}
|
|
285
302
|
|
|
286
|
-
.screen-btn-ghost {
|
|
287
|
-
height: var(--btn-h);
|
|
303
|
+
.v-btn.screen-btn-ghost {
|
|
304
|
+
--v-btn-height: var(--btn-h);
|
|
305
|
+
min-width: 0;
|
|
288
306
|
border-radius: var(--r-inner);
|
|
289
307
|
padding: 0 16px;
|
|
290
308
|
font-family: var(--font-sans);
|
package/components/AppButton.vue
CHANGED
|
@@ -9,7 +9,8 @@
|
|
|
9
9
|
|
|
10
10
|
Variants, straight from the handoff:
|
|
11
11
|
primary 40px pill-radius accent fill, 13.5px/800, white label
|
|
12
|
-
ghost
|
|
12
|
+
ghost 40px, 1px border, card fill, 13.5px/700 in `--text2` - the SAME
|
|
13
|
+
box as primary; the handoff differs only in fill, border and weight
|
|
13
14
|
icon 32px transparent square, 8px radius
|
|
14
15
|
row 30px bordered square - the `more_vert` at the end of a table row
|
|
15
16
|
-->
|