Skip to content

Commit

Permalink
TODO
Browse files Browse the repository at this point in the history
  • Loading branch information
@toasted-nutbread
toasted-nutbread committed Jan 8, 2021
1 parent 7d706df commit 30b59e7
Show file tree
Hide file tree
Showing 5 changed files with 224 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ext/bg/data/options-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,15 @@
},
"glossaryLayoutMode": {
"type": "string",
"enum": ["default", "compact"],
"enum": ["default", "compact", "very-compact"],
"default": "default"
},
"mainDictionary": {
"type": "string"
},
"popupTheme": {
"type": "string",
"enum": ["default", "dark"],
"enum": ["default", "dark", "rikai"],
"default": "default"
},
"popupOuterTheme": {
Expand Down
2 changes: 1 addition & 1 deletion ext/bg/js/anki-note-builder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class AnkiNoteBuilder {
modeTermKanji: mode === 'term-kanji',
modeTermKana: mode === 'term-kana',
modeKanji: mode === 'kanji',
compactGlossaries: (glossaryLayoutMode === 'compact'),
compactGlossaries: (glossaryLayoutMode === 'compact' || glossaryLayoutMode === 'very-compact'),
glossaryLayoutMode,
compactTags,
context
Expand Down
2 changes: 2 additions & 0 deletions ext/bg/settings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ <h3>General Options</h3>
<select class="form-control" id="glossary-layout-mode" data-setting="general.glossaryLayoutMode">
<option value="default">Default</option>
<option value="compact">Compact</option>
<option value="very-compact">Very compact</option>
</select>
</div>
</div>
Expand All @@ -326,6 +327,7 @@ <h3>General Options</h3>
<select class="form-control" id="popup-theme" data-setting="general.popupTheme">
<option value="default">Light</option>
<option value="dark">Dark</option>
<option value="rikai">Rikai</option>
</select>
</div>
<div class="col-xs-6">
Expand Down
213 changes: 212 additions & 1 deletion ext/mixed/css/display.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@
--notification-shadow-color: rgba(0, 0, 0, 0.5);

--action-button-active-color: var(--scrollbar-thumb-color);

--definition-highlight-color-off: rgba(0, 0, 0, 0);
--definition-highlight-color-on: rgba(0, 0, 0, 0.1);
}
:root[data-theme=dark] {
/* Colors */
Expand Down Expand Up @@ -202,7 +205,215 @@
--notification-shadow-color: rgba(255, 255, 255, 0.25);

--action-button-active-color: var(--scrollbar-thumb-color);
}

--definition-highlight-color-off: rgba(255, 255, 255, 0);
--definition-highlight-color-on: rgba(255, 255, 255, 0.1);
}


:root[data-theme=rikai] {
/* Layout */
--tag-border-size-no-units: 1;
--tag-border-style: solid;
--tag-font-weight: normal;

/* Colors */
--theme-color: #5c73b8;
--theme-color-dark: #4e67b1;
--theme-color-darker: #445a9c;
--theme-color-light: #7f91c7;

--background-color: var(--theme-color);
--glossary-image-background-color: var(--theme-color-darker);
--accent-color: #ffffff;
--link-color: #ffffff;

--default-text-color: #edf0f7;
--light-text-color: #b8c2e0;
--very-light-text-color: #999999;
--kanji-text-color: #b7e7ff;
--kanji-popular-text-color: var(--kanji-text-color);
--kanji-rare-text-color: var(--kanji-text-color);
--kanji-furigana-text-color: #c0ffc0;
--reason-text-color: #ffe0a0;

--light-border-color: rgba(0, 0, 0, 0);
--medium-border-color: rgba(0, 0, 0, 0);
--dark-border-color: rgba(0, 0, 0, 0);
--kanji-border-color: #b7e7ff;

--pitch-accent-annotation-color: var(--default-text-color);

--tag-text-color: #ffffff;
--tag-border-color: rgba(255, 255, 255, 0.4);
--tag-default-background-color: transparent;
--tag-name-background-color: rgba(50, 200, 50, 0.6);
--tag-expression-background-color: rgba(255, 150, 50, 0.5);
--tag-popular-background-color: rgba(0, 100, 255, 0.5);
--tag-frequent-background-color: rgba(0, 200, 200, 0.5);
--tag-archaism-background-color: rgba(255, 100, 100, 0.5);
--tag-dictionary-background-color: rgba(200, 100, 255, 0.5);
--tag-frequency-background-color: rgba(50, 200, 50, 0.6);
--tag-part-of-speech-background-color: var(--theme-color-darker);
--tag-search-background-color: transparent;
--tag-pitch-accent-dictionary-background-color: var(--tag-dictionary-background-color);

--sidebar-background-color: var(--theme-color-dark);
--sidebar-button-background-color: transparent;
--sidebar-button-background-color-hover: var(--theme-color-light);
--sidebar-button-background-color-active: var(--theme-color-darker);
--sidebar-button-danger-background-color: transparent;
--sidebar-button-danger-background-color-hover: #dd2222;
--sidebar-button-danger-background-color-active: #bb2222;
--sidebar-button-icon-color: #ffffff;
--sidebar-button-disabled-icon-color: rgba(255, 255, 255, 0.5);
--sidebar-button-danger-icon-color: #ffffff;

--scrollbar-thumb-color: var(--theme-color-darker);
--scrollbar-track-color: var(--theme-color-light);

--progress-bar-track-color: var(--theme-color-darker);
--progress-bar-indicator-color: #ffffff;
--entry-current-indicator-color: #ffffff;

--definition-highlight-color-off: rgba(255, 255, 255, 0);
--definition-highlight-color-on: rgba(255, 255, 255, 0.1);
}
:root[data-glossary-layout-mode=very-compact2] {
/* Layout */
--main-content-vertical-padding: 0.5em;
--entry-vertical-padding: 0.125em;
}

/* TODO : separator border color? */
:root[data-glossary-layout-mode=very-compact2] .tag {
display: inline-block;
padding: 0 !important;
font-size: 100% !important;
font-weight: normal !important;
line-height: inherit !important;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: 0 !important;
color: var(--light-text-color) !important;
background-color: transparent !important;
border: none !important;
}
:root[data-glossary-layout-mode=very-compact2] .tag>.tag-inner::before {
content: "(";
}
:root[data-glossary-layout-mode=very-compact2] .tag>.tag-inner::after {
content: ") ";
white-space: pre;
}
:root[data-glossary-layout-mode=very-compact2] .tag-list>.tag {
margin-right: 0 !important;
}
:root[data-glossary-layout-mode=very-compact2] .term-glossary-list {
display: inline !important;
list-style-type: none !important;
margin: 0 !important;
padding: 0 !important;
}
:root[data-glossary-layout-mode=very-compact2] .term-glossary-item {
display: inline !important;
}
:root[data-glossary-layout-mode=very-compact2] .term-glossary-item:not(:first-child)::before {
content: "; " !important;
color: var(--default-text-color) !important;
}
:root[data-glossary-layout-mode=very-compact2] .term-definition-tag-list {
display: inline !important;
}
:root[data-glossary-layout-mode=very-compact2] .tag[data-category=dictionary] {
display: none !important;
}
:root[data-glossary-layout-mode=very-compact2] .tag[data-category=pitch-accent-dictionary] {
display: none !important;
}
:root[data-glossary-layout-mode=very-compact2] .term-definition-list>.term-definition-item {
display: inline !important;
padding: 0 !important;
margin: 0 !important;
}
:root[data-glossary-layout-mode=very-compact2] .term-definition-item:not(:nth-last-child(1)):after {
content: "; " !important;
color: var(--default-text-color) !important;
}
:root[data-glossary-layout-mode=very-compact2] .term-definition-list:not([data-count="1"])>.term-definition-item {
background-color: var(--definition-highlight-color-off);
transition: background-color 0.125s ease-out;
}
:root[data-glossary-layout-mode=very-compact2] .term-definition-list:not([data-count="1"])>.term-definition-item:hover {
background-color: var(--definition-highlight-color-on);
}
:root[data-glossary-layout-mode=very-compact2] .term-definition-list:not([data-count="1"])>.term-definition-item::before {
counter-increment: term-definition-list-index;
content: "(" counter(term-definition-list-index) ") ";
color: var(--light-text-color) !important;
}
:root[data-glossary-layout-mode=very-compact2] .term-definition-list {
counter-reset: term-definition-list-index;
padding-left: 0 !important;
}

:root[data-glossary-layout-mode=very-compact2] .term-pitch-accent-list:not([data-count="1"])>.term-pitch-accent {
background-color: var(--definition-highlight-color-off);
transition: background-color 0.125s ease-out;
}
:root[data-glossary-layout-mode=very-compact2] .term-pitch-accent-list:not([data-count="1"])>.term-pitch-accent:hover {
background-color: var(--definition-highlight-color-on);
}
:root[data-glossary-layout-mode=very-compact2] .term-pitch-accent:not(:last-child)::after {
content: "; ";
}
:root[data-glossary-layout-mode=very-compact2] .term-pitch-accent-list {
padding-left: 0 !important;
}
:root[data-glossary-layout-mode=very-compact2] .term-pitch-accent {
display: inline !important;
list-style-type: none;
}
:root[data-glossary-layout-mode=very-compact2] .term-pitch-accent-group {
display: inline;
list-style-type: none;
}
:root[data-glossary-layout-mode=very-compact2] .term-pitch-accent-group-tag-list {
margin-right: 0 !important;
}
:root[data-glossary-layout-mode=very-compact2] .term-pitch-accent-tag-list {
margin-right: 0 !important;
}

:root[data-theme=rikai] .action-button::before {
background-color: var(--entry-current-indicator-color) !important;
background-image: none !important;
mask-repeat: no-repeat;
mask-position: center center;
mask-mode: alpha;
mask-size: contain;
-webkit-mask-repeat: no-repeat;
-webkit-mask-position: center center;
-webkit-mask-mode: alpha;
-webkit-mask-size: contain;
}
:root[data-theme=rikai] .action-button[data-icon=view-note]::before {
mask-image: url("/mixed/img/note-card.svg");
-webkit-mask-image: url("/mixed/img/note-card.svg");
}
:root[data-theme=rikai] .action-button[data-icon=add-term-kanji]::before {
mask-image: url("/mixed/img/note-card.svg");
-webkit-mask-image: url("/mixed/img/plus-circle-large.svg");
}
:root[data-theme=rikai] .action-button[data-icon=add-term-kana]::before {
mask-image: url("/mixed/img/note-card.svg");
-webkit-mask-image: url("/mixed/img/plus-circle-small.svg");
}
:root[data-theme=rikai] .action-button[data-icon=play-audio]::before {
mask-image: url("/mixed/img/speaker.svg");
-webkit-mask-image: url("/mixed/img/speaker.svg");
}


/* Fonts */
Expand Down
7 changes: 7 additions & 0 deletions ext/mixed/css/popup-outer.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ iframe.yomichan-popup[data-theme=dark] {
background-color: #1e1e1e;
border-color: #666666;
}
iframe.yomichan-popup[data-theme=rikai] {
background-color: #5c73b8;
border: 0.01px solid #5c73b8;
box-shadow: none;
border-radius: 5em;
box-shadow: 2em 2em 1em rgba(100, 100, 100, 0.25);
}
iframe.yomichan-popup[data-outer-theme=dark],
iframe.yomichan-popup[data-outer-theme=auto][data-site-color=dark] {
box-shadow: 0 0 10em rgba(255, 255, 255, 0.5);
Expand Down

0 comments on commit 30b59e7

Please sign in to comment.