From 4d2e5b93f4634bd5dfe55c305e441f75f0e0690e Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 24 May 2020 13:37:23 -0400
Subject: Style adjustments (#537)

* Remove newlines for term-definition-item-template

* Update how action button icons are styled

* Fix spacing

* Group text colors together

* Correct image styles

* Fix missing </span>
---
 ext/mixed/css/display.css | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)

(limited to 'ext/mixed/css/display.css')

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 8b567173..a92775b8 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -27,13 +27,12 @@
     --default-text-color: #333333;
     --light-text-color: #777777;
     --very-light-text-color: #999999;
+    --popuplar-kanji-text-color: #0275d8;
 
     --light-border-color: #eeeeee;
     --medium-border-color: #dddddd;
     --dark-border-color: #777777;
 
-    --popuplar-kanji-text-color: #0275d8;
-
     --pitch-accent-annotation-color: #000000;
 
     --tag-text-color: #ffffff;
@@ -58,13 +57,12 @@
     --default-text-color: #d4d4d4;
     --light-text-color: #888888;
     --very-light-text-color: #666666;
+    --popuplar-kanji-text-color: #0275d8;
 
     --light-border-color: #2f2f2f;
     --medium-border-color: #3f3f3f;
     --dark-border-color: #888888;
 
-    --popuplar-kanji-text-color: #0275d8;
-
     --pitch-accent-annotation-color: #ffffff;
 
     --tag-text-color: #e1e1e1;
@@ -173,14 +171,14 @@ h2 {
     display: flex;
 }
 
-.navigation-header:not([data-has-previous=true]) .navigation-header-actions .action-previous>img,
-.navigation-header:not([data-has-next=true]) .navigation-header-actions .action-next>img {
+.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-next>img {
+.action-button.action-next:before {
     transform: scaleX(-1);
 }
 
@@ -234,18 +232,18 @@ h2 {
     padding-right: 0.72em;
 }
 
-.actions .disabled {
+.action-button.disabled {
     pointer-events: none;
     cursor: default;
 }
 
-.actions .disabled img {
+.action-button.disabled:before {
     -webkit-filter: grayscale(100%);
     filter: grayscale(100%);
     opacity: 0.25;
 }
 
-.actions .pending {
+.action-button.pending {
     visibility: hidden;
 }
 
@@ -274,10 +272,32 @@ button.action-button {
     cursor: pointer;
 }
 
-.icon-image {
+.action-button[data-icon]:before {
+    content: "";
     width: 1.14285714em; /* 14px => 16px */
     height: 1.14285714em; /* 14px => 16px */
     display: block;
+    background-color: transparent;
+    background-repeat: no-repeat;
+}
+
+.action-button[data-icon=entry-current]:before {
+    background-image: url("/mixed/img/entry-current.svg");
+}
+.action-button[data-icon=view-note]:before {
+    background-image: url("/mixed/img/view-note.svg");
+}
+.action-button[data-icon=add-term-kanji]:before {
+    background-image: url("/mixed/img/add-term-kanji.svg");
+}
+.action-button[data-icon=add-term-kana]:before {
+    background-image: url("/mixed/img/add-term-kana.svg");
+}
+.action-button[data-icon=play-audio]:before {
+    background-image: url("/mixed/img/play-audio.svg");
+}
+.action-button[data-icon=source-term]:before {
+    background-image: url("/mixed/img/source-term.svg");
 }
 
 .term-expression .kanji-link {
@@ -358,7 +378,7 @@ button.action-button {
     display: block;
 }
 
-.tag-list>.tag:not(:last-child) {
+.tag-list>.tag {
     margin-right: 0.375em;
 }
 
@@ -505,7 +525,7 @@ button.action-button {
 }
 
 .term-definition-disambiguation-list:after {
-    content: " only)";
+    content: " only) ";
 }
 
 .term-definition-disambiguation+.term-definition-disambiguation:before {
-- 
cgit v1.2.3


From 0384e2afef68abd4236fc422f087b1a5f558da34 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 7 Jun 2020 00:08:20 +0300
Subject: scale background icon when page is zoomed (#592)

---
 ext/mixed/css/display.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ext/mixed/css/display.css')

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index a92775b8..1f392de2 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -279,6 +279,7 @@ button.action-button {
     display: block;
     background-color: transparent;
     background-repeat: no-repeat;
+    background-size: contain;
 }
 
 .action-button[data-icon=entry-current]:before {
-- 
cgit v1.2.3


From b614aca3ddd04b9d533959b2eabaa6db43b79f8f Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 7 Jun 2020 00:08:46 +0300
Subject: fix css class name (#591)

Broken in 90af55d4c84f545635f238178b30748a0e8093ee
---
 ext/mixed/css/display.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext/mixed/css/display.css')

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 1f392de2..703cef1c 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -317,7 +317,7 @@ button.action-button {
     color: var(--very-light-text-color);
 }
 
-.entry:not(.entry-current) .current {
+.entry:not(.entry-current) .action-current-indicator {
     display: none;
 }
 
-- 
cgit v1.2.3