Skip to content

Commit adc2c80

Browse files
committed
https://github.com/elmsln/issues/issues/1975
1 parent 014b7a8 commit adc2c80

File tree

3 files changed

+28
-866
lines changed

3 files changed

+28
-866
lines changed

elements/d-d-d/lib/DDDStyles.js

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,9 @@ export const ApplicationAttributeData = {
464464
lg: "Large",
465465
},
466466
"border-radius": {
467-
xs: "X-Small",
468-
md: "Medium",
469-
xl: "X-Large",
467+
xs: "Rounded",
468+
md: "Rounder",
469+
xl: "Roundest",
470470
},
471471
"box-shadow": {
472472
sm: "Drop shadow",
@@ -511,11 +511,17 @@ export function HAXOptionSampleFactory(type) {
511511
return Object.keys(ApplicationAttributeData[type]).map((key) => {
512512
return {
513513
value: key,
514-
html: html`<d-d-d-sample type="${type}" option="${key}"></d-d-d-sample>`,
514+
html: ["primary","accent"].includes(type) ? html`<d-d-d-sample @click="${updatePreviewColorVar}" type="${type}" option="${key}"></d-d-d-sample>` : html`<d-d-d-sample type="${type}" option="${key}"></d-d-d-sample>`,
515515
};
516516
});
517517
}
518518

519+
function updatePreviewColorVar(e) {
520+
let target = e.target;
521+
globalThis.document.body.style.setProperty(`--ddd-sample-theme-${target.type}`, `var(--ddd-${target.type}-${target.option})`);
522+
}
523+
524+
519525
// attributes need to be driven from a cannonical list
520526
// @note this may need ways of overriding it in the future but at least
521527
// we've consolidated everything into one place for these small design mods
@@ -1250,22 +1256,27 @@ export const DDDDataAttributes = [
12501256
font-size: var(--ddd-font-size-type1-l);
12511257
}
12521258
/* padding spacing */
1259+
[data-design-treatment="bg"][data-padding="xs"],
12531260
[data-accent][data-padding="xs"],
12541261
[data-padding="xs"] {
12551262
padding: var(--ddd-spacing-2);
12561263
}
1264+
[data-design-treatment="bg"][data-padding="s"],
12571265
[data-accent][data-padding="s"],
12581266
[data-padding="s"] {
12591267
padding: var(--ddd-spacing-4);
12601268
}
1269+
[data-design-treatment="bg"][data-padding="m"],
12611270
[data-accent][data-padding="m"],
12621271
[data-padding="m"] {
12631272
padding: var(--ddd-spacing-8);
12641273
}
1274+
[data-design-treatment="bg"][data-padding="l"],
12651275
[data-accent][data-padding="l"],
12661276
[data-padding="l"] {
12671277
padding: var(--ddd-spacing-12);
12681278
}
1279+
[data-design-treatment="bg"][data-padding="xl"],
12691280
[data-accent][data-padding="xl"],
12701281
[data-padding="xl"] {
12711282
padding: var(--ddd-spacing-16);

elements/d-d-d/lib/d-d-d-sample.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ export class DDDSample extends DDDSuper(LitElement) {
4141
:host([type="border"]) .sample,
4242
:host([type="border-radius"]) .sample,
4343
:host([type="box-shadow"]) .sample {
44-
--ddd-theme-primary: var(--ddd-primary-16);
45-
background-color: var(--ddd-theme-primary);
46-
border-color: black;
44+
--ddd-theme-primary: var(--ddd-sample-theme-primary, black);
45+
--ddd-theme-accent: var(--ddd-sample-theme-accent, var(--ddd-accent-3));
46+
background-color: var(--ddd-theme-accent);
47+
border-color: var(--ddd-theme-primary);
4748
height: var(--ddd-spacing-4);
4849
width: var(--ddd-spacing-8);
4950
display: inline-block;
@@ -56,7 +57,7 @@ export class DDDSample extends DDDSuper(LitElement) {
5657
border: var(--ddd-border-lg);
5758
height: var(--ddd-spacing-8);
5859
width: var(--ddd-spacing-8);
59-
border-color: black;
60+
border-color: var(--ddd-theme-primary);
6061
clip-path: polygon(50% 0, 0 50%, 0 0, 0 0);
6162
transform: scale(4);
6263
padding: 0;
@@ -65,7 +66,7 @@ export class DDDSample extends DDDSuper(LitElement) {
6566
}
6667
:host([type="box-shadow"]) .sample {
6768
border: var(--ddd-border-sm);
68-
border-color: black;
69+
border-color: var(--ddd-theme-primary);
6970
margin: 0 12px 12px 12px;
7071
}
7172
@@ -119,13 +120,18 @@ export class DDDSample extends DDDSuper(LitElement) {
119120
:host([type="design-treatment"]) .label {
120121
display: block;
121122
font-weight: bold;
122-
--ddd-theme-primary: var(--ddd-primary-16);
123+
--ddd-theme-primary: var(--ddd-sample-theme-primary, var(--ddd-primary-16));
123124
min-height: calc(
124125
(var(--initialLetter) / 3 * var(--ddd-theme-body-font-size) * 1.5) +
125126
20px
126127
);
127128
}
128129
130+
/** TODO this needs to be set via some kind of similar ddd-samples global in order to work for the bg option */
131+
:host([type="design-treatment"][option="bg"]) .label {
132+
color: var(--ddd-theme-bgContrast);
133+
}
134+
129135
:host([type="font-weight"]) .label,
130136
:host([type="font-family"]) .label {
131137
font-size: var(--ddd-font-size-s);

0 commit comments

Comments
 (0)