Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quantified Elements #704

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Quantified Elements #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6755c42
Quantifying
klh6157 Sep 30, 2024
1c76e77
Merge branch 'master' of https://github.com/klh6157/webcomponents
klh6157 Sep 30, 2024
3058305
Merge branch 'haxtheweb:master' into master
klh6157 Oct 7, 2024
b32aa44
quantified self-check, tagging-question, inline-audio
klh6157 Oct 7, 2024
5873b30
changes to inline-audio, video-player
klh6157 Oct 7, 2024
01adfd1
changes to flash-card-answer-box, haxor-slevin, simple-icons, trainin…
klh6157 Oct 9, 2024
3ed74ef
Changes to rpg-character-toast, hal-9000-ui, hax-map, hax-view-source
klh6157 Oct 14, 2024
227973a
Merge branch 'haxtheweb:master' into master
klh6157 Oct 14, 2024
1b7da2e
fixes to the PR
klh6157 Oct 14, 2024
8d215fe
Merge branch 'master' of https://github.com/klh6157/webcomponents
klh6157 Oct 14, 2024
dde09e7
Fixes to tagging-question, simple-icon, inline-audio
klh6157 Oct 14, 2024
ec3aed8
Changes to tagging-question
klh6157 Oct 14, 2024
f859537
Merge branch 'haxtheweb:master' into master
klh6157 Oct 16, 2024
6f80b82
Changes to app-hax-search-results
klh6157 Oct 21, 2024
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
2 changes: 1 addition & 1 deletion elements/app-hax/lib/rpg-character-toast/rpg-character-toast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class RPGCharacterToast extends SimpleToastEl {
width: 100px;
margin: 6px 0px 0px;
padding: 16px;
color: var(--simple-colors-default-theme-purple-6, purple);
color: var(--ddd-theme-default-wonderPurple);
vertical-align: middle;
display: inline-flex;
height: 100px;
Expand Down
4 changes: 2 additions & 2 deletions elements/app-hax/lib/v1/app-hax-search-results.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export class AppHaxSearchResults extends SimpleColors {
margin-bottom: 8px;
}
:host([dark]) #noResult {
color: var(--simple-colors-default-theme-grey-12, black);
color: var(--ddd-theme-default-coalyGray);
}
`,
];
Expand Down Expand Up @@ -193,4 +193,4 @@ export class AppHaxSearchResults extends SimpleColors {
}
}
}
customElements.define(AppHaxSearchResults.tag, AppHaxSearchResults);
customElements.define(AppHaxSearchResults.tag, AppHaxSearchResults);
5 changes: 3 additions & 2 deletions elements/flash-card/lib/flash-card-answer-box.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { SimpleColors } from "@haxtheweb/simple-colors/simple-colors.js";
import "@haxtheweb/simple-icon/lib/simple-icons.js";
import "@haxtheweb/simple-icon/lib/simple-icon-lite.js";
import "@haxtheweb/simple-icon/lib/simple-icon-button-lite.js";
import { DDD } from "@haxtheweb/d-d-d";

export class FlashCardAnswerBox extends I18NMixin(SimpleColors) {
export class FlashCardAnswerBox extends I18NMixin(DDD) {
static get tag() {
return "flash-card-answer-box";
}
Expand Down Expand Up @@ -166,7 +167,7 @@ export class FlashCardAnswerBox extends I18NMixin(SimpleColors) {
}
button#check {
background-color: var(--simple-colors-default-theme-accent-10);
color: var(--simple-colors-default-theme-grey-1);
color: var(--ddd-theme-default-white);
font-size: 14px;
margin: none;
padding: 0px;
Expand Down
2 changes: 1 addition & 1 deletion elements/hal-9000/lib/hal-9000-ui/hal-9000-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class Hal9000UI extends SimpleColors {
left: 20px;
bottom: 20px;
z-index: 10000;
background-color: var(--simple-colors-default-theme-grey-12);
background-color: var(--ddd-theme-default-coalyGray);
border-radius: 15px;
}

Expand Down
2 changes: 1 addition & 1 deletion elements/hax-body/lib/hax-map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class HaxMap extends I18NMixin(SimpleColors) {
--simple-icon-height: 14px;
height: 38px;
margin: 0 4px;
color: var(--simple-colors-default-theme-grey-12, black);
color: var(--ddd-theme-default-coalyGray);
background-color: var(--simple-colors-default-theme-grey-1, white);
}
li simple-icon-button:hover {
Expand Down
4 changes: 2 additions & 2 deletions elements/hax-body/lib/hax-view-source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ class HaxViewSource extends I18NMixin(MtzFileDownloadBehaviors(LitElement)) {
height: calc(100vh - 200px);
}
.updatecontent {
background-color: var(--simple-colors-default-theme-green-1);
color: var(--simple-colors-default-theme-green-8);
background-color: var(--ddd-theme-default-coalygray);
color: var(--ddd-theme-default-opportunityGreen);
}
hax-toolbar {
flex: 0 0 auto;
Expand Down
4 changes: 2 additions & 2 deletions elements/haxor-slevin/haxor-slevin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class HaxorSlevin extends HAXCMSThemeParts(
css`
:host {
display: block;
background-color: var(--simple-colors-default-theme-grey-1);
color: var(--simple-colors-default-theme-grey-12);
background-color: var(--ddd-theme-default-coalyGray);
color: var(--ddd-theme-default-white);
transition:
0.6s ease-in-out color,
0.6s ease-in-out background-color;
Expand Down
4 changes: 2 additions & 2 deletions elements/haxor-slevin/src/haxor-slevin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class HaxorSlevin extends HAXCMSThemeParts(
css`
:host {
display: block;
background-color: var(--simple-colors-default-theme-grey-1);
color: var(--simple-colors-default-theme-grey-12);
background-color: var(--ddd-theme-default-coalyGray);
color: var(--ddd-theme-default-white);
transition:
0.6s ease-in-out color,
0.6s ease-in-out background-color;
Expand Down
12 changes: 7 additions & 5 deletions elements/inline-audio/inline-audio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { I18NMixin } from "@haxtheweb/i18n-manager/lib/I18NMixin.js";
import "@haxtheweb/simple-icon/lib/simple-icons.js";
import "@haxtheweb/simple-icon/lib/simple-icon-button.js";
import "@haxtheweb/hax-iconset/lib/simple-hax-iconset.js";
import { DDD } from "@haxtheweb/d-d-d";

/**
* `inline-audio`
* `A simple inline audio player to augment text`
Expand All @@ -29,7 +31,7 @@ Custom property | Description | Default
* @element inline-audio
*
*/
class InlineAudio extends I18NMixin(SimpleColors) {
class InlineAudio extends I18NMixin(DDD) {
/**
* convention
*/
Expand Down Expand Up @@ -58,7 +60,7 @@ class InlineAudio extends I18NMixin(SimpleColors) {
:host {
display: inline-flex;
vertical-align: middle;
color: var(--simple-colors-default-theme-grey-12);
color: var(--ddd-theme-default-white);
--inline-audio-padding: 0px 4px;
--inline-audio-margin: 0;
--inline-audio-icon-padding: 0px 4px 0px 0px;
Expand All @@ -69,7 +71,7 @@ class InlineAudio extends I18NMixin(SimpleColors) {
align-items: center;
padding: var(--inline-audio-padding);
margin: var(--inline-audio-margin);
background-color: var(--simple-colors-default-theme-grey-2);
background-color: var(--ddd-theme-default-coalyGray);
min-width: 48px;
border-radius: 4px;
cursor: pointer;
Expand Down Expand Up @@ -109,10 +111,10 @@ class InlineAudio extends I18NMixin(SimpleColors) {

.icon {
padding: var(--inline-audio-icon-padding);
--simple-icon-color: var(--simple-colors-default-theme-grey-12);
--simple-icon-color: var(--ddd-theme-default-white);
--simple-icon-button-border-radius: none;
--simple-icon-button-focus-color: var(
--simple-colors-default-theme-grey-12
--ddd-theme-default-white
);
--simple-icon-button-focus-opacity: var(
--inline-audio-button-focus-opacity,
Expand Down
12 changes: 7 additions & 5 deletions elements/inline-audio/src/inline-audio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { I18NMixin } from "@haxtheweb/i18n-manager/lib/I18NMixin.js";
import "@haxtheweb/simple-icon/lib/simple-icons.js";
import "@haxtheweb/simple-icon/lib/simple-icon-button.js";
import "@haxtheweb/hax-iconset/lib/simple-hax-iconset.js";
import { DDD } from "@haxtheweb/d-d-d";

/**
* `inline-audio`
* `A simple inline audio player to augment text`
Expand All @@ -29,7 +31,7 @@ Custom property | Description | Default
* @element inline-audio
*
*/
class InlineAudio extends I18NMixin(SimpleColors) {
class InlineAudio extends I18NMixin(DDD) {
/**
* convention
*/
Expand Down Expand Up @@ -58,7 +60,7 @@ class InlineAudio extends I18NMixin(SimpleColors) {
:host {
display: inline-flex;
vertical-align: middle;
color: var(--simple-colors-default-theme-grey-12);
color: var(--ddd-theme-default-white);
--inline-audio-padding: 0px 4px;
--inline-audio-margin: 0;
--inline-audio-icon-padding: 0px 4px 0px 0px;
Expand All @@ -69,7 +71,7 @@ class InlineAudio extends I18NMixin(SimpleColors) {
align-items: center;
padding: var(--inline-audio-padding);
margin: var(--inline-audio-margin);
background-color: var(--simple-colors-default-theme-grey-2);
background-color: var(--ddd-theme-default-coalyGray);
min-width: 48px;
border-radius: 4px;
cursor: pointer;
Expand Down Expand Up @@ -109,10 +111,10 @@ class InlineAudio extends I18NMixin(SimpleColors) {

.icon {
padding: var(--inline-audio-icon-padding);
--simple-icon-color: var(--simple-colors-default-theme-grey-12);
--simple-icon-color: var(--ddd-theme-default-white);
--simple-icon-button-border-radius: none;
--simple-icon-button-focus-color: var(
--simple-colors-default-theme-grey-12
--ddd-theme-default-white
);
--simple-icon-button-focus-opacity: var(
--inline-audio-button-focus-opacity,
Expand Down
4 changes: 2 additions & 2 deletions elements/self-check/self-check.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ class SelfCheck extends I18NMixin(lazyImageLoader(SchemaBehaviors(DDD))) {
#question_wrap {
color: var(
--ddd-component-self-check-question-text,
var(--simple-colors-default-theme-grey-12, #000)
var(--ddd-theme-default-coalyGray)
);
background-color: var(
--ddd-component-self-check-question-background,
var(--simple-colors-default-theme-grey-1, #fff)
var(--ddd-theme-default-white)
);
position: relative;
}
Expand Down
4 changes: 2 additions & 2 deletions elements/self-check/src/self-check.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ class SelfCheck extends I18NMixin(lazyImageLoader(SchemaBehaviors(DDD))) {
#question_wrap {
color: var(
--ddd-component-self-check-question-text,
var(--simple-colors-default-theme-grey-12, #000)
var(--ddd-theme-default-coalyGray)
);
background-color: var(
--ddd-component-self-check-question-background,
var(--simple-colors-default-theme-grey-1, #fff)
var(--ddd-theme-default-white)
);
position: relative;
}
Expand Down
3 changes: 2 additions & 1 deletion elements/simple-icon/simple-icon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import { svg, css } from "lit";
import { SimpleColors } from "@haxtheweb/simple-colors/simple-colors.js";
import { SimpleIconBehaviors } from "./lib/simple-icon-lite.js";
import { DDD } from "@haxtheweb/d-d-d";
/**
* `simple-icon`
* `Render an SVG based icon`
Expand All @@ -21,7 +22,7 @@ import { SimpleIconBehaviors } from "./lib/simple-icon-lite.js";
* @demo demo/iconset.html Iconset Demo
* @element simple-icon
*/
class SimpleIcon extends SimpleIconBehaviors(SimpleColors) {
class SimpleIcon extends SimpleIconBehaviors(DDD) {
/**
* This is a convention, not the standard
*/
Expand Down
3 changes: 2 additions & 1 deletion elements/simple-icon/src/simple-icon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import { svg, css } from "lit";
import { SimpleColors } from "@haxtheweb/simple-colors/simple-colors.js";
import { SimpleIconBehaviors } from "./lib/simple-icon-lite.js";
import { DDD } from "@haxtheweb/d-d-d";
/**
* `simple-icon`
* `Render an SVG based icon`
Expand All @@ -21,7 +22,7 @@ import { SimpleIconBehaviors } from "./lib/simple-icon-lite.js";
* @demo demo/iconset.html Iconset Demo
* @element simple-icon
*/
class SimpleIcon extends SimpleIconBehaviors(SimpleColors) {
class SimpleIcon extends SimpleIconBehaviors(DDD) {
/**
* This is a convention, not the standard
*/
Expand Down
3 changes: 1 addition & 2 deletions elements/super-daemon/lib/super-daemon-search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,7 @@ export class SuperDaemonSearch extends I18NMixin(SimpleColors) {
--simple-fields-placeholder-font-weight: bold;
--simple-fields-placeholder-opacity: 0.8;
--simple-fields-placeholder-color: var(
--simple-colors-default-theme-grey-12,
grey
--ddd-theme-default-coalyGray
);
background-color: rgba(255, 0, 255, 0.05);
}
Expand Down
20 changes: 9 additions & 11 deletions elements/tagging-question/src/tagging-question.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/
import { html, css } from "lit";
import { QuestionElement } from "@haxtheweb/multiple-choice/lib/QuestionElement.js";
import { DDD } from "@haxtheweb/d-d-d/d-d-d.js";

/**
* `tagging-question`
Expand Down Expand Up @@ -64,9 +65,8 @@ class TaggingQuestion extends QuestionElement {
border: var(--ddd-border-sm);
border-radius: var(--ddd-radius-sm);
box-sizing: border-box;
background-color: light-dark(
var(--simple-colors-default-theme-grey-2),
var(--simple-colors-default-theme-grey-10)
background-color: (
var(--ddd-theme-default-coalyGray)
);
}

Expand All @@ -87,7 +87,7 @@ class TaggingQuestion extends QuestionElement {

:host(:not([show-answer])) .tag-option:hover,
:host(:not([show-answer])) .tag-option:focus {
background-color: var(--simple-colors-default-theme-grey-3);
background-color: var(--ddd-theme-default-disable);
}

:host([dragging]) #user-choice-container {
Expand All @@ -97,17 +97,15 @@ class TaggingQuestion extends QuestionElement {
:host([drag-enter-answer][dragging]) #user-choice-container {
border-style: dashed;
border-color: black;
background-color: light-dark(
var(--simple-colors-default-theme-grey-3),
var(--simple-colors-default-theme-grey-9)
background-color: (
var(--ddd-theme-default-coalyGray)
);
}
:host([drag-enter][dragging]) #possible-container {
border-color: black;
border-style: dashed;
background-color: light-dark(
var(--simple-colors-default-theme-grey-2),
var(--simple-colors-default-theme-grey-8)
background-color: (
var(--ddd-theme-default-coalyGray)
);
}

Expand All @@ -119,7 +117,7 @@ class TaggingQuestion extends QuestionElement {
padding: var(--ddd-spacing-2) var(--ddd-spacing-3);
border: var(--ddd-border-sm);
border-radius: var(--ddd-radius-sm);
background-color: var(--simple-colors-default-theme-grey-2);
background-color: var(--ddd-theme-default-coalyGray);
cursor: pointer;
user-select: none;
transition: background-color 0.3s ease;
Expand Down
20 changes: 9 additions & 11 deletions elements/tagging-question/tagging-question.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/
import { html, css } from "lit";
import { QuestionElement } from "@haxtheweb/multiple-choice/lib/QuestionElement.js";
import { DDD } from "@haxtheweb/d-d-d/d-d-d.js";

/**
* `tagging-question`
Expand Down Expand Up @@ -64,9 +65,8 @@ class TaggingQuestion extends QuestionElement {
border: var(--ddd-border-sm);
border-radius: var(--ddd-radius-sm);
box-sizing: border-box;
background-color: light-dark(
var(--simple-colors-default-theme-grey-2),
var(--simple-colors-default-theme-grey-10)
background-color: (
btopro marked this conversation as resolved.
Show resolved Hide resolved
var(--ddd-theme-default-coalyGray)
);
}

Expand All @@ -87,7 +87,7 @@ class TaggingQuestion extends QuestionElement {

:host(:not([show-answer])) .tag-option:hover,
:host(:not([show-answer])) .tag-option:focus {
background-color: var(--simple-colors-default-theme-grey-3);
background-color: var(--ddd-theme-default-disable);
}

:host([dragging]) #user-choice-container {
Expand All @@ -97,17 +97,15 @@ class TaggingQuestion extends QuestionElement {
:host([drag-enter-answer][dragging]) #user-choice-container {
border-style: dashed;
border-color: black;
background-color: light-dark(
var(--simple-colors-default-theme-grey-3),
var(--simple-colors-default-theme-grey-9)
background-color: (
var(--ddd-theme-default-coalyGray)
);
}
:host([drag-enter][dragging]) #possible-container {
border-color: black;
border-style: dashed;
background-color: light-dark(
var(--simple-colors-default-theme-grey-2),
var(--simple-colors-default-theme-grey-8)
background-color: (
var(--ddd-theme-default-coalyGray)
);
}

Expand All @@ -119,7 +117,7 @@ class TaggingQuestion extends QuestionElement {
padding: var(--ddd-spacing-2) var(--ddd-spacing-3);
border: var(--ddd-border-sm);
border-radius: var(--ddd-radius-sm);
background-color: var(--simple-colors-default-theme-grey-2);
background-color: var(--ddd-theme-default-coalyGray);
cursor: pointer;
user-select: none;
transition: background-color 0.3s ease;
Expand Down
2 changes: 1 addition & 1 deletion elements/training-theme/src/training-theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ class TrainingTheme extends HAXCMSOperationButtons(
--site-menu-button-link-decoration: none;
--site-menu-button-button-hover-color: var(
--haxcms-color,
var(--simple-colors-default-theme-purple-7)
var(--ddd-theme-default-wonderPurple)
);
color: #242a31;
border: 1px solid #e6ecf1;
Expand Down
Loading
Loading