From 4f13de283572b2c57e7462f1030c12fe8335882e Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Fri, 12 Feb 2021 21:03:30 -0500 Subject: [PATCH] Move css files (#1374) * Move bg/css/ to css/ * Move mixed/css/ to css/ --- ext/bg/context.html | 2 +- ext/bg/info.html | 4 ++-- ext/bg/legal.html | 4 ++-- ext/bg/permissions.html | 4 ++-- ext/bg/pitch-accents-preview.html | 4 ++-- ext/bg/popup-preview.html | 4 ++-- ext/bg/search.html | 6 +++--- ext/bg/settings.html | 2 +- ext/bg/settings2.html | 4 ++-- ext/bg/welcome.html | 4 ++-- ext/{bg => }/css/context.css | 0 ext/{mixed => }/css/display.css | 0 ext/{mixed => }/css/material.css | 0 ext/{bg => }/css/pitch-accents-preview.css | 0 ext/{mixed => }/css/popup-outer.css | 0 ext/{bg => }/css/popup-preview.css | 0 ext/{mixed => }/css/search.css | 0 ext/{bg => }/css/settings.css | 0 ext/{bg => }/css/settings2.css | 0 ext/fg/float.html | 4 ++-- ext/fg/js/popup.js | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) rename ext/{bg => }/css/context.css (100%) rename ext/{mixed => }/css/display.css (100%) rename ext/{mixed => }/css/material.css (100%) rename ext/{bg => }/css/pitch-accents-preview.css (100%) rename ext/{mixed => }/css/popup-outer.css (100%) rename ext/{bg => }/css/popup-preview.css (100%) rename ext/{mixed => }/css/search.css (100%) rename ext/{bg => }/css/settings.css (100%) rename ext/{bg => }/css/settings2.css (100%) diff --git a/ext/bg/context.html b/ext/bg/context.html index 4e28b7b0..1b0072a6 100644 --- a/ext/bg/context.html +++ b/ext/bg/context.html @@ -11,7 +11,7 @@ - + diff --git a/ext/bg/info.html b/ext/bg/info.html index 5e8b6e38..920f94a0 100644 --- a/ext/bg/info.html +++ b/ext/bg/info.html @@ -11,8 +11,8 @@ - - + + diff --git a/ext/bg/legal.html b/ext/bg/legal.html index a8aca897..b8c1f1c5 100644 --- a/ext/bg/legal.html +++ b/ext/bg/legal.html @@ -11,8 +11,8 @@ - - + + diff --git a/ext/bg/permissions.html b/ext/bg/permissions.html index fb900018..2ea9f2a1 100644 --- a/ext/bg/permissions.html +++ b/ext/bg/permissions.html @@ -11,8 +11,8 @@ - - + + diff --git a/ext/bg/pitch-accents-preview.html b/ext/bg/pitch-accents-preview.html index 1232b353..b2885c92 100644 --- a/ext/bg/pitch-accents-preview.html +++ b/ext/bg/pitch-accents-preview.html @@ -11,8 +11,8 @@ - - + + diff --git a/ext/bg/popup-preview.html b/ext/bg/popup-preview.html index ae10f611..5a8da859 100644 --- a/ext/bg/popup-preview.html +++ b/ext/bg/popup-preview.html @@ -11,8 +11,8 @@ - - + + diff --git a/ext/bg/search.html b/ext/bg/search.html index 152b38e2..a949beff 100644 --- a/ext/bg/search.html +++ b/ext/bg/search.html @@ -11,9 +11,9 @@ - - - + + + diff --git a/ext/bg/settings.html b/ext/bg/settings.html index e4512e34..3e3f1961 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -13,7 +13,7 @@ - +
diff --git a/ext/bg/settings2.html b/ext/bg/settings2.html index b612e2b6..d0ba0b3c 100644 --- a/ext/bg/settings2.html +++ b/ext/bg/settings2.html @@ -11,8 +11,8 @@ - - + + diff --git a/ext/bg/welcome.html b/ext/bg/welcome.html index c4b475d4..53c386fd 100644 --- a/ext/bg/welcome.html +++ b/ext/bg/welcome.html @@ -11,8 +11,8 @@ - - + + diff --git a/ext/bg/css/context.css b/ext/css/context.css similarity index 100% rename from ext/bg/css/context.css rename to ext/css/context.css diff --git a/ext/mixed/css/display.css b/ext/css/display.css similarity index 100% rename from ext/mixed/css/display.css rename to ext/css/display.css diff --git a/ext/mixed/css/material.css b/ext/css/material.css similarity index 100% rename from ext/mixed/css/material.css rename to ext/css/material.css diff --git a/ext/bg/css/pitch-accents-preview.css b/ext/css/pitch-accents-preview.css similarity index 100% rename from ext/bg/css/pitch-accents-preview.css rename to ext/css/pitch-accents-preview.css diff --git a/ext/mixed/css/popup-outer.css b/ext/css/popup-outer.css similarity index 100% rename from ext/mixed/css/popup-outer.css rename to ext/css/popup-outer.css diff --git a/ext/bg/css/popup-preview.css b/ext/css/popup-preview.css similarity index 100% rename from ext/bg/css/popup-preview.css rename to ext/css/popup-preview.css diff --git a/ext/mixed/css/search.css b/ext/css/search.css similarity index 100% rename from ext/mixed/css/search.css rename to ext/css/search.css diff --git a/ext/bg/css/settings.css b/ext/css/settings.css similarity index 100% rename from ext/bg/css/settings.css rename to ext/css/settings.css diff --git a/ext/bg/css/settings2.css b/ext/css/settings2.css similarity index 100% rename from ext/bg/css/settings2.css rename to ext/css/settings2.css diff --git a/ext/fg/float.html b/ext/fg/float.html index 18bf3f5b..0203043a 100644 --- a/ext/fg/float.html +++ b/ext/fg/float.html @@ -11,8 +11,8 @@ - - + + diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js index 47330090..5e15a654 100644 --- a/ext/fg/js/popup.js +++ b/ext/fg/js/popup.js @@ -342,7 +342,7 @@ class Popup extends EventDispatcher { useWebExtensionApi = false; parentNode = this._shadow; } - await dynamicLoader.loadStyle('yomichan-popup-outer-stylesheet', fileType, '/mixed/css/popup-outer.css', useWebExtensionApi, parentNode); + await dynamicLoader.loadStyle('yomichan-popup-outer-stylesheet', fileType, '/css/popup-outer.css', useWebExtensionApi, parentNode); } _observeFullscreen(observe) {