Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
219 changes: 99 additions & 120 deletions components/colors/colors.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,128 +3,107 @@ if (globalThis.document !== undefined && !globalThis.document.head.querySelector
style.id = 'd2l-colors';

const lightPalette = `
--d2l-sem-background-color-base: #ffffff;
--d2l-sem-background-color-elevated: var(--d2l-sem-background-color-base);
--d2l-sem-background-color-floating: var(--d2l-sem-background-color-base);
--d2l-sem-background-color-interactive-faint-default: var(--d2l-color-regolith);
--d2l-sem-background-color-interactive-faint-hover: var(--d2l-color-sylvite);
--d2l-sem-background-color-interactive-highlighted: var(--d2l-sem-brand-color-highlight);
--d2l-sem-background-color-interactive-primary-default: var(--d2l-sem-brand-color-primary-default);
--d2l-sem-background-color-interactive-primary-hover: var(--d2l-sem-brand-color-primary-hover);
--d2l-sem-background-color-interactive-secondary-default: var(--d2l-color-gypsum);
--d2l-sem-background-color-interactive-secondary-hover: var(--d2l-color-mica);
--d2l-sem-background-color-interactive-tertiary-default: #ffffff;
--d2l-sem-background-color-interactive-tertiary-hover: var(--d2l-sem-background-color-interactive-secondary-default);
--d2l-sem-background-color-interactive-translucent-default: #000000;
--d2l-sem-background-color-interactive-translucent-hover: var(--d2l-sem-brand-color-primary-default);
--d2l-sem-background-color-sunken: #f6f7f8;
--d2l-sem-border-color-emphasized: var(--d2l-color-galena);
--d2l-sem-border-color-focus: var(--d2l-color-celestine);
--d2l-sem-border-color-standard: var(--d2l-color-mica);
--d2l-sem-border-color-subtle: var(--d2l-color-gypsum);
--d2l-sem-brand-color-highlight: var(--d2l-color-celestine-plus-2);
--d2l-sem-brand-color-primary-default: var(--d2l-color-celestine);
--d2l-sem-brand-color-primary-hover: var(--d2l-color-celestine-minus-1);
--d2l-sem-icon-color-faint: var(--d2l-sem-border-color-standard);
--d2l-sem-icon-color-inverted: #ffffff;
--d2l-sem-icon-color-standard: var(--d2l-color-tungsten);
--d2l-sem-status-color-default: var(--d2l-color-celestine);
--d2l-sem-status-color-error: var(--d2l-color-cinnabar);
--d2l-sem-status-color-success-text: var(--d2l-color-olivine-minus-1);
--d2l-sem-status-color-success: var(--d2l-color-olivine);
--d2l-sem-status-color-warning-text: var(--d2l-color-carnelian-minus-1);
--d2l-sem-status-color-warning: var(--d2l-color-carnelian);
--d2l-sem-text-color-interactive-default: var(--d2l-sem-brand-color-primary-default);
--d2l-sem-text-color-interactive-hover: var(--d2l-sem-brand-color-primary-hover);
--d2l-sem-text-color-static-faint: var(--d2l-color-galena);
--d2l-sem-text-color-static-inverted: #ffffff;
--d2l-sem-text-color-static-standard: var(--d2l-color-ferrite);
--d2l-sem-text-color-static-subtle: var(--d2l-color-tungsten);

--d2l-sem-opacity-disabled-control: 0.5;
--d2l-sem-opacity-disabled-link: 0.74;
--d2l-sem-opacity-disabled-linkicon: 0.64;

--d2l-sem-shadow-attached-color: rgba(0, 0, 0, 0.03);
--d2l-sem-shadow-attached-offset-x: 0;
--d2l-sem-shadow-attached-offset-y: 2px;
--d2l-sem-shadow-attached-blur: 4px;
--d2l-sem-shadow-attached-spread: 0;
--d2l-sem-shadow-attached: var(--d2l-shadow-attached-offset-x) var(--d2l-shadow-attached-offset-y) var(--d2l-shadow-attached-blur) var(--d2l-shadow-attached-spread) var(--d2l-shadow-attached-color);
--d2l-sem-shadow-floating-color: rgba(0, 0, 0, 0.15);
--d2l-sem-shadow-floating-offset-x: 0;
--d2l-sem-shadow-floating-offset-y: 2px;
--d2l-sem-shadow-floating-blur: 12px;
--d2l-sem-shadow-floating-spread: 0;
--d2l-sem-shadow-floating: var(--d2l-shadow-floating-offset-x) var(--d2l-shadow-floating-offset-y) var(--d2l-shadow-floating-blur) var(--d2l-shadow-floating-spread) var(--d2l-shadow-floating-color);
--d2l-sem-shadow-inset-color: rgba(177, 185, 190, 0.2); /* corundum */
--d2l-sem-shadow-inset-offset-x: 0;
--d2l-sem-shadow-inset-offset-y: 2px;
--d2l-sem-shadow-inset-blur: 0;
--d2l-sem-shadow-inset-spread: 0;
--d2l-sem-shadow-inset: inset var(--d2l-shadow-inset-offset-x) var(--d2l-shadow-inset-offset-y) var(--d2l-shadow-inset-blur) var(--d2l-shadow-inset-spread) var(--d2l-shadow-inset-color);
--d2l-theme-background-color-base: #ffffff;
--d2l-theme-background-color-elevated: var(--d2l-theme-background-color-base);
--d2l-theme-background-color-floating: var(--d2l-theme-background-color-base);
--d2l-theme-background-color-interactive-faint-default: var(--d2l-color-regolith);
--d2l-theme-background-color-interactive-faint-hover: var(--d2l-color-sylvite);
--d2l-theme-background-color-interactive-highlighted: var(--d2l-theme-brand-color-highlight);
--d2l-theme-background-color-interactive-primary-default: var(--d2l-theme-brand-color-primary-default);
--d2l-theme-background-color-interactive-primary-hover: var(--d2l-theme-brand-color-primary-hover);
--d2l-theme-background-color-interactive-secondary-default: var(--d2l-color-gypsum);
--d2l-theme-background-color-interactive-secondary-hover: var(--d2l-color-mica);
--d2l-theme-background-color-interactive-tertiary-default: transparent;
--d2l-theme-background-color-interactive-tertiary-hover: var(--d2l-theme-background-color-interactive-secondary-default);
--d2l-theme-background-color-interactive-translucent-default: #00000080;
--d2l-theme-background-color-interactive-translucent-hover: var(--d2l-theme-brand-color-primary-default);
--d2l-theme-background-color-sunken: #f6f7f8;
--d2l-theme-border-color-emphasized: var(--d2l-color-galena);
--d2l-theme-border-color-focus: var(--d2l-color-celestine);
--d2l-theme-border-color-standard: var(--d2l-color-mica);
--d2l-theme-border-color-subtle: var(--d2l-color-gypsum);
--d2l-theme-brand-color-highlight: var(--d2l-color-celestine-plus-2);
--d2l-theme-brand-color-primary-default: var(--d2l-color-celestine);
--d2l-theme-brand-color-primary-hover: var(--d2l-color-celestine-minus-1);
--d2l-theme-icon-color-faint: var(--d2l-theme-border-color-standard);
--d2l-theme-icon-color-inverted: #ffffff;
--d2l-theme-icon-color-standard: var(--d2l-color-tungsten);
--d2l-theme-shadow-attached-color: #00000008;
--d2l-theme-shadow-floating-color: #00000026;
--d2l-theme-status-color-default: var(--d2l-color-celestine);
--d2l-theme-status-color-error: var(--d2l-color-cinnabar);
--d2l-theme-status-color-success-text: var(--d2l-color-olivine-minus-1);
--d2l-theme-status-color-success: var(--d2l-color-olivine);
--d2l-theme-status-color-warning-text: var(--d2l-color-carnelian-minus-1);
--d2l-theme-status-color-warning: var(--d2l-color-carnelian);
--d2l-theme-text-color-interactive-default: var(--d2l-theme-brand-color-primary-default);
--d2l-theme-text-color-interactive-hover: var(--d2l-theme-brand-color-primary-hover);
--d2l-theme-text-color-static-faint: var(--d2l-color-galena);
--d2l-theme-text-color-static-inverted: #ffffff;
--d2l-theme-text-color-static-standard: var(--d2l-color-ferrite);
--d2l-theme-text-color-static-subtle: var(--d2l-color-tungsten);

--d2l-theme-opacity-disabled-control: 0.5;
--d2l-theme-opacity-disabled-link: 0.74;
--d2l-theme-opacity-disabled-linkicon: 0.64;

--d2l-theme-shadow-attached: 0 2px 4px 0 rgba(0, 0, 0, 0.03);
--d2l-theme-shadow-attached-block-start: 0 2px 4px 0 rgba(0, 0, 0, 0.03);
--d2l-theme-shadow-attached-block-end: 0 -2px 4px 0 rgba(0, 0, 0, 0.03);
--d2l-theme-shadow-floating: 0 2px 12px 0 rgba(0, 0, 0, 0.15);
--d2l-theme-shadow-inset: inset 0 2px 0 0 rgba(177, 185, 190, 0.2); /* corundum */
Comment on lines +50 to +54
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be using the color variables?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we can reference them yeah. I think doing it in code here would require relative color functions, which I think has poor support in older browsers. I'm going to leave these as-is for now, since the shadows are going to get reworked.


`;
const darkPalette = `
--d2l-sem-background-color-base: #161718;
--d2l-sem-background-color-elevated: var(--d2l-color-ferrite);
--d2l-sem-background-color-floating: var(--d2l-color-ferrite);
--d2l-sem-background-color-interactive-faint-default: var(--d2l-color-ferrite);
--d2l-sem-background-color-interactive-faint-hover: #303335;
--d2l-sem-background-color-interactive-highlighted: var(--d2l-sem-brand-color-highlight);
--d2l-sem-background-color-interactive-primary-default: var(--d2l-sem-brand-color-primary-default);
--d2l-sem-background-color-interactive-primary-hover: var(--d2l-sem-brand-color-primary-hover);
--d2l-sem-background-color-interactive-secondary-default: #303335;
--d2l-sem-background-color-interactive-secondary-hover: var(--d2l-color-ferrite);
--d2l-sem-background-color-interactive-tertiary-default: #000000;
--d2l-sem-background-color-interactive-tertiary-hover: var(--d2l-sem-background-color-interactive-secondary-default);
--d2l-sem-background-color-interactive-translucent-default: #000000;
--d2l-sem-background-color-interactive-translucent-hover: var(--d2l-sem-brand-color-primary-default);
--d2l-sem-background-color-sunken: #000000;
--d2l-sem-border-color-emphasized: var(--d2l-color-galena);
--d2l-sem-border-color-focus: var(--d2l-color-celestine-plus-1);
--d2l-sem-border-color-standard: var(--d2l-color-tungsten);
--d2l-sem-border-color-subtle: #303335;
--d2l-sem-brand-color-highlight: #161718;
--d2l-sem-brand-color-primary-default: var(--d2l-color-celestine-plus-1);
--d2l-sem-brand-color-primary-hover: var(--d2l-color-celestine);
--d2l-sem-icon-color-faint: var(--d2l-sem-border-color-standard);
--d2l-sem-icon-color-inverted: #ffffff;
--d2l-sem-icon-color-standard: var(--d2l-color-corundum);
--d2l-sem-status-color-default: var(--d2l-sem-brand-color-primary-default);
--d2l-sem-status-color-error: var(--d2l-color-cinnabar-plus-1);
--d2l-sem-status-color-success-text: #ffffff;
--d2l-sem-status-color-success: var(--d2l-color-olivine);
--d2l-sem-status-color-warning-text: var(--d2l-color-carnelian);
--d2l-sem-status-color-warning: var(--d2l-color-carnelian);
--d2l-sem-text-color-interactive-default: var(--d2l-sem-brand-color-primary-default);
--d2l-sem-text-color-interactive-hover: var(--d2l-sem-brand-color-primary-hover);
--d2l-sem-text-color-static-faint: var(--d2l-color-galena);
--d2l-sem-text-color-static-inverted: #161718;
--d2l-sem-text-color-static-standard: var(--d2l-color-mica);
--d2l-sem-text-color-static-subtle: var(--d2l-color-chromite);

--d2l-sem-opacity-disabled-control: 0.5;
--d2l-sem-opacity-disabled-link: 0.74;
--d2l-sem-opacity-disabled-linkicon: 0.64;

--d2l-sem-shadow-attached-color: rgba(0, 0, 0, 0.03);
--d2l-sem-shadow-attached-offset-x: 0;
--d2l-sem-shadow-attached-offset-y: 2px;
--d2l-sem-shadow-attached-blur: 4px;
--d2l-sem-shadow-attached-spread: 0;
--d2l-sem-shadow-attached: var(--d2l-shadow-attached-offset-x) var(--d2l-shadow-attached-offset-y) var(--d2l-shadow-attached-blur) var(--d2l-shadow-attached-spread) var(--d2l-shadow-attached-color);
--d2l-sem-shadow-floating-color: rgba(0, 0, 0, 0.85);
--d2l-sem-shadow-floating-offset-x: 0;
--d2l-sem-shadow-floating-offset-y: 2px;
--d2l-sem-shadow-floating-blur: 12px;
--d2l-sem-shadow-floating-spread: 0;
--d2l-sem-shadow-floating: var(--d2l-shadow-floating-offset-x) var(--d2l-shadow-floating-offset-y) var(--d2l-shadow-floating-blur) var(--d2l-shadow-floating-spread) var(--d2l-shadow-floating-color);
--d2l-sem-shadow-inset-color: rgba(177, 185, 190, 0.2); /* corundum */
--d2l-sem-shadow-inset-offset-x: 0;
--d2l-sem-shadow-inset-offset-y: 2px;
--d2l-sem-shadow-inset-blur: 0;
--d2l-sem-shadow-inset-spread: 0;
--d2l-sem-shadow-inset: inset var(--d2l-shadow-inset-offset-x) var(--d2l-shadow-inset-offset-y) var(--d2l-shadow-inset-blur) var(--d2l-shadow-inset-spread) var(--d2l-shadow-inset-color);
--d2l-theme-background-color-base: #161718;
--d2l-theme-background-color-elevated: var(--d2l-color-ferrite);
--d2l-theme-background-color-floating: var(--d2l-color-ferrite);
--d2l-theme-background-color-interactive-faint-default: var(--d2l-color-ferrite);
--d2l-theme-background-color-interactive-faint-hover: #303335;
--d2l-theme-background-color-interactive-highlighted: var(--d2l-theme-brand-color-highlight);
--d2l-theme-background-color-interactive-primary-default: var(--d2l-theme-brand-color-primary-default);
--d2l-theme-background-color-interactive-primary-hover: var(--d2l-theme-brand-color-primary-hover);
--d2l-theme-background-color-interactive-secondary-default: #303335;
--d2l-theme-background-color-interactive-secondary-hover: var(--d2l-color-ferrite);
--d2l-theme-background-color-interactive-tertiary-default: transparent;
--d2l-theme-background-color-interactive-tertiary-hover: var(--d2l-theme-background-color-interactive-secondary-default);
--d2l-theme-background-color-interactive-translucent-default: #00000080;
--d2l-theme-background-color-interactive-translucent-hover: var(--d2l-theme-brand-color-primary-default);
--d2l-theme-background-color-sunken: #000000;
--d2l-theme-border-color-emphasized: var(--d2l-color-galena);
--d2l-theme-border-color-focus: var(--d2l-color-celestine-plus-1);
--d2l-theme-border-color-standard: var(--d2l-color-tungsten);
--d2l-theme-border-color-subtle: #303335;
--d2l-theme-brand-color-highlight: #161718;
--d2l-theme-brand-color-primary-default: var(--d2l-color-celestine-plus-1);
--d2l-theme-brand-color-primary-hover: var(--d2l-color-celestine);
--d2l-theme-icon-color-faint: var(--d2l-theme-border-color-standard);
--d2l-theme-icon-color-inverted: #ffffff;
--d2l-theme-icon-color-standard: var(--d2l-color-corundum);
--d2l-theme-shadow-attached-color: #000000d9;
--d2l-theme-shadow-floating-color: #000000d9;
--d2l-theme-status-color-default: var(--d2l-theme-brand-color-primary-default);
--d2l-theme-status-color-error: var(--d2l-color-cinnabar-plus-1);
--d2l-theme-status-color-success-text: #ffffff;
--d2l-theme-status-color-success: var(--d2l-color-olivine);
--d2l-theme-status-color-warning-text: var(--d2l-color-carnelian);
--d2l-theme-status-color-warning: var(--d2l-color-carnelian);
--d2l-theme-text-color-interactive-default: var(--d2l-theme-brand-color-primary-default);
--d2l-theme-text-color-interactive-hover: var(--d2l-theme-brand-color-primary-hover);
--d2l-theme-text-color-static-faint: var(--d2l-color-galena);
--d2l-theme-text-color-static-inverted: #161718;
--d2l-theme-text-color-static-standard: var(--d2l-color-mica);
--d2l-theme-text-color-static-subtle: var(--d2l-color-chromite);

--d2l-theme-opacity-disabled-control: 0.5;
--d2l-theme-opacity-disabled-link: 0.74;
--d2l-theme-opacity-disabled-linkicon: 0.64;

--d2l-theme-shadow-attached: 0 2px 4px 0 rgba(0, 0, 0, 0.85);
--d2l-theme-shadow-attached-block-start: 0 2px 4px 0 rgba(0, 0, 0, 0.85);
--d2l-theme-shadow-attached-block-end: 0 -2px 4px 0 rgba(0, 0, 0, 0.85);
--d2l-theme-shadow-floating: 0 2px 12px 0 rgba(0, 0, 0, 0.85);
--d2l-theme-shadow-inset: inset 0 2px 0 0 rgba(177, 185, 190, 0.2); /* corundum */
`;

style.textContent = `
Expand Down
4 changes: 2 additions & 2 deletions components/demo/demo-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class DemoPage extends LitElement {
static get styles() {
return [ css`
:host {
background-color: var(--d2l-sem-background-color-sunken);
background-color: var(--d2l-theme-background-color-sunken);
display: block;
padding: 30px;
}
Expand All @@ -46,7 +46,7 @@ class DemoPage extends LitElement {
}
.d2l-demo-page-content > ::slotted(h2),
.d2l-demo-page-content > ::slotted(h3) {
color: var(--d2l-sem-text-color-static-standard);
color: var(--d2l-theme-text-color-static-standard);
font-size: 0.8rem;
font-weight: 700;
line-height: 1.2rem;
Expand Down
10 changes: 5 additions & 5 deletions components/demo/demo-snippet.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ class DemoSnippet extends LitElement {
static get styles() {
return css`
:host {
background-color: var(--d2l-sem-background-color-base);
border: 1px solid var(--d2l-sem-border-color-standard);
background-color: var(--d2l-theme-background-color-base);
border: 1px solid var(--d2l-theme-border-color-standard);
border-radius: 6px;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
display: block;
Expand All @@ -41,7 +41,7 @@ class DemoSnippet extends LitElement {
display: flex;
}
.d2l-demo-snippet-demo-wrapper.fullscreen {
background-color: var(--d2l-sem-background-color-base);
background-color: var(--d2l-theme-background-color-base);
height: 100vh;
inset: 0;
overflow: auto;
Expand All @@ -67,7 +67,7 @@ class DemoSnippet extends LitElement {
padding: 0;
}
.d2l-demo-snippet-settings {
border-inline-start: 1px solid var(--d2l-sem-border-color-standard);
border-inline-start: 1px solid var(--d2l-theme-border-color-standard);
flex: 0 0 auto;
padding: 6px;
}
Expand All @@ -76,7 +76,7 @@ class DemoSnippet extends LitElement {
top: 0;
}
d2l-dropdown.settings-dropdown {
background-color: var(--d2l-sem-background-color-base);
background-color: var(--d2l-theme-background-color-base);
border-radius: 6px;
outline: 1px solid var(--d2l-color-celestine-minus-1);
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion components/demo/styles.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
html {
background-color: var(--d2l-sem-background-color-base);
background-color: var(--d2l-theme-background-color-base);
font-size: 20px;
}
body {
Expand Down