alex/yomichan
1
Fork 0
Code Releases Activity

Display styles update (#1030)

Browse Source 
* Make section comments into single line comments

* Update :before/:after to be ::before/::after

* Organize and compact CSS

* Remove obsolete style

* Add padding var

* Use calc and var for layout units and common values

* Update search page styles
This commit is contained in:
toasted-nutbread 2020-11-14 15:23:20 -05:00 committed by GitHub
parent 50a1fbfb9f
commit af16643f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 168 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/bg/search.html
View File

@ -11,8 +11,8 @@
<link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48"> <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
<link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64"> <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
<link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128"> <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
<link rel="stylesheet" type="text/css" href="/mixed/css/search.css">
<link rel="stylesheet" type="text/css" href="/mixed/css/display.css"> <link rel="stylesheet" type="text/css" href="/mixed/css/display.css">
<link rel="stylesheet" type="text/css" href="/mixed/css/search.css">
</head> </head>
<body> <body>

450
ext/mixed/css/display.css
View File

@ -15,11 +15,30 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
/* /* Variables */
* Variables
*/
:root { :root {
/* Layout */
--font-size-no-units: 14;
--font-size: calc(1px * var(--font-size-no-units));
--query-parser-font-size-no-units: 2;
--query-parser-font-size: calc(1em * var(--query-parser-font-size-no-units));
--expression-font-size-no-units: 2;
--expression-font-size: calc(1em * var(--expression-font-size-no-units));
--h2-font-size-no-units: 1.25;
--h2-font-size: calc(1em * var(--h2-font-size-no-units));
--line-height-no-units: 20;
--line-height: calc(var(--line-height-no-units) / var(--font-size-no-units));
--thin-border-size: calc(1em / var(--font-size-no-units));
--expression-thin-border-size: calc(1em / (var(--expression-font-size-no-units) * var(--font-size-no-units)));
--spinner-size-no-units: 32;
--action-button-size-no-units: 16;
--entry-padding: 0.72em;
/* Colors */
--background-color: #ffffff; --background-color: #ffffff;
--glossary-image-background-color: #eeeeee; --glossary-image-background-color: #eeeeee;
@ -48,8 +67,8 @@
--tag-search-background-color: #8a8a91; --tag-search-background-color: #8a8a91;
--tag-pitch-accent-dictionary-background-color: #6640be; --tag-pitch-accent-dictionary-background-color: #6640be;
} }
:root[data-yomichan-theme=dark] { :root[data-yomichan-theme=dark] {
/* Colors */
--background-color: #1e1e1e; --background-color: #1e1e1e;
--glossary-image-background-color: #2f2f2f; --glossary-image-background-color: #2f2f2f;
@ -80,31 +99,23 @@
} }
/* /* Fonts */
* Fonts
*/
@font-face { @font-face {
font-family: kanji-stroke-orders; font-family: kanji-stroke-orders;
src: url('/mixed/ttf/kanji-stroke-orders.ttf'); src: url('/mixed/ttf/kanji-stroke-orders.ttf');
} }
/* /* General */
* General
*/
:root[data-yomichan-page=float]:not([data-yomichan-theme]), :root[data-yomichan-page=float]:not([data-yomichan-theme]),
:root[data-yomichan-page=float]:not([data-yomichan-theme]) body { :root[data-yomichan-page=float]:not([data-yomichan-theme]) body {
background-color: transparent; background-color: transparent;
} }
:root { :root {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: var(--font-size);
line-height: 1.42857143; /* 14px => 20px */ line-height: var(--line-height);
} }
body { body {
margin: 0; margin: 0;
border: 0; border: 0;
@ -112,32 +123,28 @@ body {
overflow-y: scroll; /* always show scroll bar */ overflow-y: scroll; /* always show scroll bar */
background-color: var(--background-color); background-color: var(--background-color);
color: var(--default-text-color); color: var(--default-text-color);
font-size: inherit;
} }
ol, ul { ol, ul {
margin-top: 0; margin-top: 0;
margin-bottom: 0.72em; margin-bottom: var(--entry-padding);
} }
#spinner { #spinner {
position: fixed; position: fixed;
z-index: 1; z-index: 1;
right: 0.36em; right: 0.36em;
bottom: 0.36em; bottom: 0.36em;
} }
#spinner>img { #spinner>img {
width: 2.28571428em; /* 14px => 32px */ width: calc(1em * (var(--spinner-size-no-units) / var(--font-size-no-units)));
height: 2.28571428em; /* 14px => 32px */ height: calc(1em * (var(--spinner-size-no-units) / var(--font-size-no-units)));
} }
h2 { h2 {
font-size: 1.25em; font-size: var(--h2-font-size);
font-weight: normal; font-weight: normal;
margin: 0.25em 0 0; margin: 0.25em 0 0;
border-bottom: 0.05714285714285714em solid var(--light-border-color); /* 14px * 1.25em => 1px */ border-bottom: calc(1em / (var(--font-size-no-units) * var(--h2-font-size-no-units))) solid var(--light-border-color);
} }
a { a {
color: var(--popuplar-kanji-text-color); color: var(--popuplar-kanji-text-color);
text-decoration: underline; text-decoration: underline;
@ -145,10 +152,7 @@ a {
} }
/* /* Navigation */
* Navigation
*/
.navigation-header { .navigation-header {
top: 0; top: 0;
left: 0; left: 0;
@ -156,105 +160,76 @@ a {
height: 2.1em; height: 2.1em;
box-sizing: border-box; box-sizing: border-box;
padding: 0.25em 0.5em; padding: 0.25em 0.5em;
border-bottom: 0.07142857em solid var(--light-border-color); /* 14px => 1px */ border-bottom: var(--thin-border-size) solid var(--light-border-color);
background-color: var(--background-color); background-color: var(--background-color);
z-index: 10; z-index: 10;
} }
.navigation-header-actions {
display: flex;
}
.navigation-header:not([data-has-previous=true]) .navigation-header-actions .action-button.action-previous::before,
.navigation-header:not([data-has-next=true]) .navigation-header-actions .action-button.action-next::before {
opacity: 0.25;
-webkit-filter: grayscale(100%);
filter: grayscale(100%);
}
.action-button.action-next::before {
transform: scaleX(-1);
}
:root[data-yomichan-page=search] .navigation-header { :root[data-yomichan-page=search] .navigation-header {
position: sticky; position: sticky;
} }
:root[data-yomichan-page=float] .navigation-header { :root[data-yomichan-page=float] .navigation-header {
position: fixed; position: fixed;
} }
:root[data-yomichan-page=float] .navigation-header:not([hidden])~.navigation-header-spacer { :root[data-yomichan-page=float] .navigation-header:not([hidden])~.navigation-header-spacer {
height: 2.1em; height: 2.1em;
} }
.navigation-header-actions {
display: flex;
}
.navigation-header:not([data-has-previous=true]) .navigation-header-actions .action-button.action-previous:before,
.navigation-header:not([data-has-next=true]) .navigation-header-actions .action-button.action-next:before {
opacity: 0.25;
-webkit-filter: grayscale(100%);
filter: grayscale(100%);
}
.action-button.action-next:before {
transform: scaleX(-1);
}
/*
* Search page
*/
/* Search page */
#query-parser-content { #query-parser-content {
margin-top: 0.5em; margin-top: 0.5em;
font-size: 2em; font-size: var(--query-parser-font-size);
white-space: pre-wrap; white-space: pre-wrap;
} }
#query-parser-content:not(:empty) {
padding-bottom: 0.25em;
border-bottom: var(--expression-thin-border-size) solid var(--light-border-color);
}
#query-parser-content[data-term-spacing=true] .query-parser-term { #query-parser-content[data-term-spacing=true] .query-parser-term {
margin-right: 0.2em; margin-right: 0.2em;
} }
:root[data-yomichan-page=search][data-search-mode=popup] .search-input {
display: none;
}
:root[data-yomichan-page=float] #query-parser-container { :root[data-yomichan-page=float] #query-parser-container {
padding-left: 0.72em; padding-left: var(--entry-padding);
padding-right: 0.72em; padding-right: var(--entry-padding);
border-bottom: 0.07142857142857142em solid var(--light-border-color); /* 14px => 1px */
} }
/* /* Action buttons */
* Entries
*/
.entry {
padding-top: 0.72em;
padding-bottom: 0.72em;
}
:root[data-yomichan-page=float] .entry {
padding-left: 0.72em;
padding-right: 0.72em;
}
.action-button.disabled { .action-button.disabled {
pointer-events: none; pointer-events: none;
cursor: default; cursor: default;
} }
.action-button.disabled::before {
.action-button.disabled:before {
-webkit-filter: grayscale(100%); -webkit-filter: grayscale(100%);
filter: grayscale(100%); filter: grayscale(100%);
opacity: 0.25; opacity: 0.25;
} }
.action-button.pending { .action-button.pending {
visibility: hidden; visibility: hidden;
} }
.actions { .actions {
display: flex; display: flex;
float: right; float: right;
margin: -0.25em; margin: -0.25em;
} }
.actions::after {
.actions:after {
clear: both; clear: both;
content: ''; content: '';
display: block; display: block;
} }
.action-button { .action-button {
display: inline-block; display: inline-block;
border: 0; border: 0;
@ -263,61 +238,42 @@ a {
background: transparent; background: transparent;
font-size: inherit; font-size: inherit;
} }
button.action-button { button.action-button {
cursor: pointer; cursor: pointer;
} }
.action-button[data-icon]::before {
.action-button[data-icon]:before {
content: ""; content: "";
width: 1.14285714em; /* 14px => 16px */ width: calc(1em * (var(--action-button-size-no-units) / var(--font-size-no-units)));
height: 1.14285714em; /* 14px => 16px */ height: calc(1em * (var(--action-button-size-no-units) / var(--font-size-no-units)));
display: block; display: block;
background-color: transparent; background-color: transparent;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain; background-size: contain;
} }
.action-button[data-icon=entry-current]::before {
.action-button[data-icon=entry-current]:before {
background-image: url("/mixed/img/entry-current.svg"); background-image: url("/mixed/img/entry-current.svg");
} }
.action-button[data-icon=view-note]:before { .action-button[data-icon=view-note]::before {
background-image: url("/mixed/img/view-note.svg"); background-image: url("/mixed/img/view-note.svg");
} }
.action-button[data-icon=add-term-kanji]:before { .action-button[data-icon=add-term-kanji]::before {
background-image: url("/mixed/img/add-term-kanji.svg"); background-image: url("/mixed/img/add-term-kanji.svg");
} }
.action-button[data-icon=add-term-kana]:before { .action-button[data-icon=add-term-kana]::before {
background-image: url("/mixed/img/add-term-kana.svg"); background-image: url("/mixed/img/add-term-kana.svg");
} }
.action-button[data-icon=play-audio]:before { .action-button[data-icon=play-audio]::before {
background-image: url("/mixed/img/play-audio.svg"); background-image: url("/mixed/img/play-audio.svg");
} }
.action-button[data-icon=source-term]:before { .action-button[data-icon=source-term]::before {
background-image: url("/mixed/img/source-term.svg"); background-image: url("/mixed/img/source-term.svg");
} }
.entry[data-type=term][data-expression-multi=true] .actions>.action-play-audio {
.term-expression .kanji-link {
border-bottom: 0.03571428em dashed var(--dark-border-color); /* 28px => 1px */
color: var(--default-text-color);
text-decoration: none;
cursor: pointer;
}
.term-expression[data-frequency=popular]>.term-expression-text,
.term-expression[data-frequency=popular]>.term-expression-text .kanji-link {
color: var(--popuplar-kanji-text-color);
}
.term-expression[data-frequency=rare]>.term-expression-text,
.term-expression[data-frequency=rare]>.term-expression-text .kanji-link {
color: var(--very-light-text-color);
}
.entry:not(.entry-current) .action-current-indicator {
display: none; display: none;
} }
/* Tags */
.tag { .tag {
display: inline-block; display: inline-block;
padding: 0.2em 0.6em 0.3em; padding: 0.2em 0.6em 0.3em;
@ -331,51 +287,39 @@ button.action-button {
color: var(--tag-text-color); color: var(--tag-text-color);
background-color: var(--tag-default-background-color); background-color: var(--tag-default-background-color);
} }
.tag[data-category=name] { .tag[data-category=name] {
background-color: var(--tag-name-background-color); background-color: var(--tag-name-background-color);
} }
.tag[data-category=expression] { .tag[data-category=expression] {
background-color: var(--tag-expression-background-color); background-color: var(--tag-expression-background-color);
} }
.tag[data-category=popular] { .tag[data-category=popular] {
background-color: var(--tag-popular-background-color); background-color: var(--tag-popular-background-color);
} }
.tag[data-category=frequent] { .tag[data-category=frequent] {
background-color: var(--tag-frequent-background-color); background-color: var(--tag-frequent-background-color);
} }
.tag[data-category=archaism] { .tag[data-category=archaism] {
background-color: var(--tag-archaism-background-color); background-color: var(--tag-archaism-background-color);
} }
.tag[data-category=dictionary] { .tag[data-category=dictionary] {
background-color: var(--tag-dictionary-background-color); background-color: var(--tag-dictionary-background-color);
} }
.tag[data-category=frequency] { .tag[data-category=frequency] {
background-color: var(--tag-frequency-background-color); background-color: var(--tag-frequency-background-color);
} }
.tag[data-category=partOfSpeech] { .tag[data-category=partOfSpeech] {
background-color: var(--tag-part-of-speech-background-color); background-color: var(--tag-part-of-speech-background-color);
} }
.tag[data-category=search] { .tag[data-category=search] {
background-color: var(--tag-search-background-color); background-color: var(--tag-search-background-color);
} }
.tag[data-category=pitch-accent-dictionary] { .tag[data-category=pitch-accent-dictionary] {
background-color: var(--tag-pitch-accent-dictionary-background-color); background-color: var(--tag-pitch-accent-dictionary-background-color);
} }
.tag-inner { .tag-inner {
display: block; display: block;
} }
.tag-list>.tag { .tag-list>.tag {
margin-right: 0.375em; margin-right: 0.375em;
} }
@ -383,64 +327,81 @@ button.action-button {
:root:not([data-enable-search-tags=true]) .tag[data-category=search] { :root:not([data-enable-search-tags=true]) .tag[data-category=search] {
display: none; display: none;
} }
:root[data-compact-tags=true] .tag[data-redundant=true] {
display: none;
}
/* Entries */
.entry {
padding-top: var(--entry-padding);
padding-bottom: var(--entry-padding);
}
:root[data-yomichan-page=float] .entry {
padding-left: var(--entry-padding);
padding-right: var(--entry-padding);
}
.term-expression .kanji-link {
border-bottom: var(--expression-thin-border-size) dashed var(--dark-border-color);
color: var(--default-text-color);
text-decoration: none;
cursor: pointer;
}
.term-expression[data-frequency=popular]>.term-expression-text,
.term-expression[data-frequency=popular]>.term-expression-text .kanji-link {
color: var(--popuplar-kanji-text-color);
}
.term-expression[data-frequency=rare]>.term-expression-text,
.term-expression[data-frequency=rare]>.term-expression-text .kanji-link {
color: var(--very-light-text-color);
}
.entry:not(.entry-current) .action-current-indicator {
display: none;
}
.entry-header2, .entry-header2,
.entry-header3 { .entry-header3 {
display: inline; display: inline;
} }
.term-frequency-separator::before { .term-frequency-separator::before {
content: ":"; content: ":";
} }
.entry+.entry { .entry+.entry {
border-top: 0.07142857em solid var(--light-border-color); /* 14px => 1px */ border-top: var(--thin-border-size) solid var(--light-border-color);
} }
.entry[data-type=term][data-expression-multi=true] .actions>.action-play-audio {
display: none;
}
.term-reasons { .term-reasons {
display: inline-block; display: inline-block;
color: var(--light-text-color); color: var(--light-text-color);
} }
.term-reasons>.term-reason+.term-reason-separator+.term-reason::before {
.term-reasons>.term-reason+.term-reason-separator+.term-reason:before {
content: " \00AB "; /* The two spaces is not a typo */ content: " \00AB "; /* The two spaces is not a typo */
white-space: pre-wrap; white-space: pre-wrap;
display: inline; display: inline;
} }
.term-expression-list { .term-expression-list {
display: inline; display: inline;
} }
.term-expression { .term-expression {
display: inline; display: inline;
} }
.term-expression-text { .term-expression-text {
display: inline-block; display: inline-block;
font-size: 2em; font-size: var(--expression-font-size);
} }
.term-expression-details { .term-expression-details {
display: inline; display: inline;
} }
.term-expression-details>.tags { .term-expression-details>.tags {
display: inline; display: inline;
} }
.term-expression-details>.frequencies { .term-expression-details>.frequencies {
display: none; display: none;
} }
.term-expression-list>.term-expression:not(:last-of-type)>.term-expression-text::after { .term-expression-list>.term-expression:not(:last-of-type)>.term-expression-text::after {
content: "\3001"; content: "\3001";
} }
/* Merged term styles */
.entry[data-expression-multi=true] .term-expression-list .term-expression-details { .entry[data-expression-multi=true] .term-expression-list .term-expression-details {
display: inline-block; display: inline-block;
position: relative; position: relative;
@ -449,25 +410,20 @@ button.action-button {
visibility: hidden; visibility: hidden;
z-index: 1; z-index: 1;
} }
.entry[data-expression-multi=true] .term-expression-list>.term-expression:not(:last-of-type) .term-expression-details { .entry[data-expression-multi=true] .term-expression-list>.term-expression:not(:last-of-type) .term-expression-details {
left: -2em; left: calc(-1 * var(--expression-font-size));
} }
.entry[data-expression-multi=true] .term-expression:hover .term-expression-details { .entry[data-expression-multi=true] .term-expression:hover .term-expression-details {
visibility: visible; visibility: visible;
} }
.entry[data-expression-multi=true] .term-expression-list .term-expression-details>.action-play-audio { .entry[data-expression-multi=true] .term-expression-list .term-expression-details>.action-play-audio {
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 0.5em; bottom: 0.5em;
} }
.entry:not([data-expression-multi=true]) .term-expression-list .term-expression-details>.action-play-audio { .entry:not([data-expression-multi=true]) .term-expression-list .term-expression-details>.action-play-audio {
display: none; display: none;
} }
.entry[data-expression-multi=true] .term-expression-list .term-expression-details>.tags { .entry[data-expression-multi=true] .term-expression-list .term-expression-details>.tags {
display: block; display: block;
position: absolute; position: absolute;
@ -475,7 +431,6 @@ button.action-button {
bottom: -0.5em; bottom: -0.5em;
white-space: nowrap; white-space: nowrap;
} }
.entry[data-expression-multi=true] .term-expression-list .term-expression-details>.frequencies { .entry[data-expression-multi=true] .term-expression-list .term-expression-details>.frequencies {
display: block; display: block;
position: absolute; position: absolute;
@ -484,87 +439,42 @@ button.action-button {
white-space: nowrap; white-space: nowrap;
} }
/* Definitions */
.term-definition-list { .term-definition-list {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style-type: none; list-style-type: none;
color: var(--light-text-color); color: var(--light-text-color);
} }
.term-definition-list:not([data-count="0"]):not([data-count="1"]) { .term-definition-list:not([data-count="0"]):not([data-count="1"]) {
padding-left: 1.4em; padding-left: 1.4em;
list-style-type: decimal; list-style-type: decimal;
} }
.term-glossary-list { .term-glossary-list {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style-type: none; list-style-type: none;
} }
.term-glossary-list:not([data-count="0"]):not([data-count="1"]) { .term-glossary-list:not([data-count="0"]):not([data-count="1"]) {
padding-left: 1.4em; padding-left: 1.4em;
list-style-type: circle; list-style-type: circle;
} }
.term-glossary { .term-glossary {
color: var(--dark-text-color); color: var(--dark-text-color);
} }
.term-definition-disambiguation-list[data-count="0"] { .term-definition-disambiguation-list[data-count="0"] {
display: none; display: none;
} }
.term-definition-disambiguation-list::before {
.term-definition-disambiguation-list:before {
content: "("; content: "(";
} }
.term-definition-disambiguation-list::after {
.term-definition-disambiguation-list:after {
content: " only) "; content: " only) ";
} }
.term-definition-disambiguation+.term-definition-disambiguation::before {
.term-definition-disambiguation+.term-definition-disambiguation:before {
content: ", "; content: ", ";
} }
:root:not([data-debug=true]) .debug-info {
display: none;
}
:root[data-anki-enabled=false] .action-view-note,
:root[data-anki-enabled=false] .action-add-note {
display: none;
}
:root[data-audio-enabled=false] .action-play-audio {
display: none;
}
:root[data-compact-glossaries=true] .term-definition-tag-list,
:root[data-compact-glossaries=true] .term-definition-disambiguation-list:not([data-count="0"]) {
display: inline;
}
:root[data-compact-glossaries=true] .term-glossary-list {
display: inline;
list-style: none;
padding-left: 0;
}
:root[data-compact-glossaries=true] .term-glossary-list>li {
display: inline;
}
:root[data-compact-glossaries=true] .term-glossary-list>li:not(:first-child):before {
white-space: pre-wrap;
content: " | ";
display: inline;
}
:root[data-compact-tags=true] .tag[data-redundant=true] {
display: none;
}
.term-glossary-separator, .term-glossary-separator,
.term-reason-separator { .term-reason-separator {
display: inline; display: inline;
@ -572,109 +482,116 @@ button.action-button {
opacity: 0; opacity: 0;
white-space: pre-wrap; white-space: pre-wrap;
} }
.term-special-tags>.frequencies { .term-special-tags>.frequencies {
display: inline; display: inline;
} }
.term-entry-body[data-section-count="0"] .term-entry-body-section-header, .term-entry-body[data-section-count="0"] .term-entry-body-section-header,
.term-entry-body[data-section-count="1"] .term-entry-body-section-header { .term-entry-body[data-section-count="1"] .term-entry-body-section-header {
display: none; display: none;
} }
/* /* Conditional styles */
* Pitch accent styles :root:not([data-debug=true]) .debug-info {
*/ display: none;
}
:root[data-anki-enabled=false] .action-view-note,
:root[data-anki-enabled=false] .action-add-note {
display: none;
}
:root[data-audio-enabled=false] .action-play-audio {
display: none;
}
:root[data-compact-glossaries=true] .term-definition-tag-list,
:root[data-compact-glossaries=true] .term-definition-disambiguation-list:not([data-count="0"]) {
display: inline;
}
:root[data-compact-glossaries=true] .term-glossary-list {
display: inline;
list-style: none;
padding-left: 0;
}
:root[data-compact-glossaries=true] .term-glossary-list>li {
display: inline;
}
:root[data-compact-glossaries=true] .term-glossary-list>li:not(:first-child)::before {
white-space: pre-wrap;
content: " | ";
display: inline;
}
/* Pitch accent styles */
.entry[data-pitch-accent-count='0'] .term-pitch-accent-container { .entry[data-pitch-accent-count='0'] .term-pitch-accent-container {
display: none; display: none;
} }
.term-pitch-accent-container { .term-pitch-accent-container {
border-bottom: 0.05714285714285714em solid var(--light-border-color); /* 14px * 1.25em => 1px */ border-bottom: var(--thin-border-size) solid var(--light-border-color);
padding-bottom: 0.25em; padding-bottom: 0.25em;
margin-bottom: 0.25em; margin-bottom: 0.25em;
} }
.term-pitch-accent-group-list { .term-pitch-accent-group-list {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style-type: none; list-style-type: none;
color: var(--light-text-color); color: var(--light-text-color);
} }
.term-pitch-accent-group-list:not([data-count="0"]):not([data-count="1"]) { .term-pitch-accent-group-list:not([data-count="0"]):not([data-count="1"]) {
padding-left: 1.4em; padding-left: 1.4em;
list-style-type: decimal; list-style-type: decimal;
} }
.term-pitch-accent-list { .term-pitch-accent-list {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style-type: none; list-style-type: none;
display: inline; display: inline;
} }
.term-pitch-accent-list:not([data-count="0"]):not([data-count="1"]) { .term-pitch-accent-list:not([data-count="0"]):not([data-count="1"]) {
padding-left: 1.4em; padding-left: 1.4em;
list-style-type: circle; list-style-type: circle;
display: block; display: block;
} }
.term-pitch-accent { .term-pitch-accent {
display: inline; display: inline;
line-height: 1.5em; line-height: 1.5em;
color: var(--dark-text-color); color: var(--dark-text-color);
} }
.term-pitch-accent-list:not([data-count="0"]):not([data-count="1"])>.term-pitch-accent { .term-pitch-accent-list:not([data-count="0"]):not([data-count="1"])>.term-pitch-accent {
display: list-item; display: list-item;
} }
.term-pitch-accent-group-tag-list { .term-pitch-accent-group-tag-list {
margin-right: 0.375em; margin-right: 0.375em;
} }
.term-pitch-accent-disambiguation-list { .term-pitch-accent-disambiguation-list {
padding-right: 0.25em; padding-right: 0.25em;
color: var(--light-text-color); color: var(--light-text-color);
} }
.term-pitch-accent-disambiguation-list::before {
.term-pitch-accent-disambiguation-list:before {
content: "("; content: "(";
} }
.term-pitch-accent-disambiguation-list::after {
.term-pitch-accent-disambiguation-list:after {
content: " only)"; content: " only)";
} }
.term-pitch-accent-disambiguation+.term-pitch-accent-disambiguation::before {
.term-pitch-accent-disambiguation+.term-pitch-accent-disambiguation:before {
content: ", "; content: ", ";
} }
.term-pitch-accent-disambiguation-list[data-count="0"] {
.term-pitch-accent-disambiguation-list[data-count="0"],
:root[data-show-pitch-accent-downstep-notation=true] .term-pitch-accent-disambiguation-list[data-expression-count="0"],
:root[data-show-pitch-accent-downstep-notation=true] .term-pitch-accent-disambiguation[data-type=reading] {
display: none; display: none;
} }
.term-pitch-accent-tag-list:not([data-count="0"]) { .term-pitch-accent-tag-list:not([data-count="0"]) {
margin-right: 0.375em; margin-right: 0.375em;
} }
.term-special-tags>.pitches { .term-special-tags>.pitches {
display: inline; display: inline;
} }
.term-pitch-accent-character { .term-pitch-accent-character {
display: inline-block; display: inline-block;
position: relative; position: relative;
} }
.term-pitch-accent-character:before { .term-pitch-accent-character::before {
border-color: var(--pitch-accent-annotation-color); border-color: var(--pitch-accent-annotation-color);
} }
.term-pitch-accent-character[data-pitch='high']:before { .term-pitch-accent-character[data-pitch='high']::before {
content: ""; content: "";
display: block; display: block;
user-select: none; user-select: none;
@ -687,7 +604,7 @@ button.action-button {
border-top-width: 0.1em; border-top-width: 0.1em;
border-top-style: solid; border-top-style: solid;
} }
.term-pitch-accent-character[data-pitch='high'][data-pitch-next='low']:before { .term-pitch-accent-character[data-pitch='high'][data-pitch-next='low']::before {
right: -0.1em; right: -0.1em;
height: 0.4em; height: 0.4em;
border-right-width: 0.1em; border-right-width: 0.1em;
@ -697,14 +614,12 @@ button.action-button {
padding-right: 0.1em; padding-right: 0.1em;
margin-right: 0.1em; margin-right: 0.1em;
} }
.term-pitch-accent-position::before {
.term-pitch-accent-position:before {
content: " ["; content: " [";
} }
.term-pitch-accent-position:after { .term-pitch-accent-position::after {
content: "]"; content: "]";
} }
.term-pitch-accent-details { .term-pitch-accent-details {
display: inline-block; display: inline-block;
height: 0; height: 0;
@ -712,24 +627,22 @@ button.action-button {
vertical-align: middle; vertical-align: middle;
} }
:root[data-show-pitch-accent-downstep-notation=true] .term-pitch-accent-disambiguation-list[data-expression-count="0"],
:root[data-show-pitch-accent-downstep-notation=true] .term-pitch-accent-disambiguation[data-type=reading] {
display: none;
}
:root[data-show-pitch-accent-downstep-notation=false] .term-pitch-accent-characters { :root[data-show-pitch-accent-downstep-notation=false] .term-pitch-accent-characters {
display: none; display: none;
} }
:root[data-show-pitch-accent-position-notation=false] .term-pitch-accent-position { :root[data-show-pitch-accent-position-notation=false] .term-pitch-accent-position {
display: none; display: none;
} }
:root[data-show-pitch-accent-graph=false] .term-pitch-accent-details { :root[data-show-pitch-accent-graph=false] .term-pitch-accent-details {
display: none; display: none;
} }
/* /* Pitch accent graph styles */
* Pitch accent graph styles
*/
.term-pitch-accent-graph { .term-pitch-accent-graph {
display: block; display: block;
height: 1.5em; height: 1.5em;
@ -764,10 +677,7 @@ button.action-button {
} }
/* /* Glossary images */
* Glossary images
*/
.term-glossary-image-container { .term-glossary-image-container {
display: inline-block; display: inline-block;
white-space: nowrap; white-space: nowrap;
@ -775,35 +685,31 @@ button.action-button {
position: relative; position: relative;
vertical-align: top; vertical-align: top;
line-height: 0; line-height: 0;
font-size: 0.07142857em; /* 14px => 1px */ font-size: calc(1em / var(--font-size-no-units));
overflow: hidden; overflow: hidden;
background-color: var(--glossary-image-background-color); background-color: var(--glossary-image-background-color);
} }
.term-glossary-image-link { .term-glossary-image-link {
cursor: inherit; cursor: inherit;
color: inherit; color: inherit;
} }
.term-glossary-image-link[href]:hover { .term-glossary-image-link[href]:hover {
cursor: pointer; cursor: pointer;
} }
.term-glossary-image-container-overlay { .term-glossary-image-container-overlay {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 14em; /* 1px => 14px; */ font-size: calc(1em * var(--font-size-no-units));
line-height: 1.42857143; /* 14px => 20px */ line-height: var(--line-height);
display: table; display: table;
table-layout: fixed; table-layout: fixed;
white-space: normal; white-space: normal;
color: var(--light-text-color); color: var(--light-text-color);
} }
.term-glossary-item[data-has-image=true][data-image-load-state=load-error] .term-glossary-image-container-overlay::after {
.term-glossary-item[data-has-image=true][data-image-load-state=load-error] .term-glossary-image-container-overlay:after {
content: "Image failed to load"; content: "Image failed to load";
display: table-cell; display: table-cell;
width: 100%; width: 100%;
@ -812,7 +718,6 @@ button.action-button {
text-align: center; text-align: center;
padding: 0.25em; padding: 0.25em;
} }
.term-glossary-image { .term-glossary-image {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
@ -825,11 +730,9 @@ button.action-button {
border: none; border: none;
outline: none; outline: none;
} }
.term-glossary-image:not([src]) { .term-glossary-image:not([src]) {
display: none; display: none;
} }
.term-glossary-image[data-pixelated=true] { .term-glossary-image[data-pixelated=true] {
image-rendering: auto; image-rendering: auto;
image-rendering: -moz-crisp-edges; image-rendering: -moz-crisp-edges;
@ -837,7 +740,6 @@ button.action-button {
image-rendering: pixelated; image-rendering: pixelated;
image-rendering: crisp-edges; image-rendering: crisp-edges;
} }
.term-glossary-image-aspect-ratio-sizer { .term-glossary-image-aspect-ratio-sizer {
content: ""; content: "";
display: inline-block; display: inline-block;
@ -845,12 +747,10 @@ button.action-button {
vertical-align: top; vertical-align: top;
font-size: 0; font-size: 0;
} }
.term-glossary-image-link-text::before {
.term-glossary-image-link-text:before {
content: "["; content: "[";
} }
.term-glossary-image-link-text::after {
.term-glossary-image-link-text:after {
content: "]"; content: "]";
} }
@ -861,35 +761,27 @@ button.action-button {
top: 100%; top: 100%;
z-index: 1; z-index: 1;
} }
:root[data-compact-glossaries=true] .entry:nth-last-of-type(1):not(:nth-of-type(1)) .term-glossary-image-container { :root[data-compact-glossaries=true] .entry:nth-last-of-type(1):not(:nth-of-type(1)) .term-glossary-image-container {
bottom: 100%; bottom: 100%;
top: auto; top: auto;
} }
:root[data-compact-glossaries=true] .term-glossary-image-link { :root[data-compact-glossaries=true] .term-glossary-image-link {
position: relative; position: relative;
display: inline-block; display: inline-block;
} }
:root[data-compact-glossaries=true] .term-glossary-image-link:hover .term-glossary-image-container, :root[data-compact-glossaries=true] .term-glossary-image-link:hover .term-glossary-image-container,
:root[data-compact-glossaries=true] .term-glossary-image-link:focus .term-glossary-image-container { :root[data-compact-glossaries=true] .term-glossary-image-link:focus .term-glossary-image-container {
display: block; display: block;
} }
:root:not([data-compact-glossaries=true]) .term-glossary-image-link-text { :root:not([data-compact-glossaries=true]) .term-glossary-image-link-text {
display: none; display: none;
} }
:root:not([data-compact-glossaries=true]) .term-glossary-image-description { :root:not([data-compact-glossaries=true]) .term-glossary-image-description {
display: block; display: block;
} }
/* /* Kanji */
* Kanji
*/
.kanji-glyph { .kanji-glyph {
font-family: kanji-stroke-orders; font-family: kanji-stroke-orders;
font-size: 8.5em; font-size: 8.5em;
@ -897,25 +789,21 @@ button.action-button {
padding: 0.01em; padding: 0.01em;
vertical-align: top; vertical-align: top;
} }
.kanji-glyph-data { .kanji-glyph-data {
margin-top: 0.75em; margin-top: 0.75em;
border-spacing: 0; border-spacing: 0;
border-collapse: collapse; border-collapse: collapse;
} }
.kanji-glyph-data>tbody>tr>* { .kanji-glyph-data>tbody>tr>* {
border-top: 0.07142857em solid var(--medium-border-color); /* 14px => 1px */ border-top: var(--thin-border-size) solid var(--medium-border-color);
text-align: left; text-align: left;
vertical-align: top; vertical-align: top;
padding: 0.36em; padding: 0.36em;
margin: 0; margin: 0;
} }
.kanji-info-table { .kanji-info-table {
width: 100%; width: 100%;
} }
.kanji-info-table>tbody>tr>th, .kanji-info-table>tbody>tr>th,
.kanji-info-table>tbody>tr>td { .kanji-info-table>tbody>tr>td {
text-align: left; text-align: left;
@ -923,32 +811,26 @@ button.action-button {
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
.kanji-info-table>tbody>tr>td { .kanji-info-table>tbody>tr>td {
text-align: right; text-align: right;
} }
.kanji-glyph-data dl { .kanji-glyph-data dl {
margin-top: 0; margin-top: 0;
margin-bottom: 1.4em; margin-bottom: 1.4em;
} }
.kanji-glyph-data dd { .kanji-glyph-data dd {
margin-left: 0; margin-left: 0;
} }
.kanji-glossary-list { .kanji-glossary-list {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style-type: none; list-style-type: none;
color: var(--light-text-color); color: var(--light-text-color);
} }
.kanji-glossary-list:not([data-count="0"]):not([data-count="1"]) { .kanji-glossary-list:not([data-count="0"]):not([data-count="1"]) {
padding-left: 1.4em; padding-left: 1.4em;
list-style-type: decimal; list-style-type: decimal;
} }
.kanji-glossary { .kanji-glossary {
color: var(--dark-text-color); color: var(--dark-text-color);
} }

11
ext/mixed/css/search.css
View File

@ -23,9 +23,6 @@
--shadow-color: rgba(0, 0, 0, 0.185); --shadow-color: rgba(0, 0, 0, 0.185);
--shadow-vertical: 0 1px 4px 0 var(--shadow-color), 0 2px 2px 0 var(--shadow-color); --shadow-vertical: 0 1px 4px 0 var(--shadow-color), 0 2px 2px 0 var(--shadow-color);
--font-size-default: 14px;
--line-height-default: calc(20 / 14);
--thin-border-size: 1px;
--toggle-size: 16px; --toggle-size: 16px;
--textarea-line-height: 1.25em; --textarea-line-height: 1.25em;
@ -84,10 +81,8 @@ body {
margin: 0; margin: 0;
padding: 0; padding: 0;
margin: 0; margin: 0;
font-size: var(--font-size-default);
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
color: var(--text-color-default); color: var(--text-color-default);
line-height: var(--line-height-default);
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
} }
@ -277,7 +272,7 @@ label.toggle {
min-height: calc(var(--textarea-line-height) + var(--textarea-padding) * 2); min-height: calc(var(--textarea-line-height) + var(--textarea-padding) * 2);
max-height: calc(var(--textarea-line-height) * 10 + var(--textarea-padding) * 2); max-height: calc(var(--textarea-line-height) * 10 + var(--textarea-padding) * 2);
resize: vertical; resize: vertical;
font-size: var(--font-size-default); font-size: var(--font-size);
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
color: var(--text-color-default); color: var(--text-color-default);
white-space: pre-wrap; white-space: pre-wrap;
@ -366,7 +361,3 @@ label.toggle {
margin: 0; margin: 0;
} }
#query-parser-content:not(:empty) {
border-bottom: var(--thin-border-size) solid var(--separator-color1);
padding-bottom: 0.5em;
}