A couple more css fixes, and fix variant setting load order

scooterpsu · Mar 27, 2019 · 3b810ba · 3b810ba
1 parent c4bd891
commit 3b810ba
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 22 deletions.
diff --git a/comixology2/themeScript.js b/comixology2/themeScript.js
@@ -27,30 +27,29 @@ var bookmarkLocation = "Ubooquity_Bookmarks2";
 var Bookmarks = [];
 var cacheLocation = "Ubooquity_IDcache2";
 var IDcache = {"books": [], "comics": []};
-
+
+var themeVariant;
+var themeVariants = ['dark-a', 'dark-b'];
+
 /* Load theme settings from settings.js. */
-loadScript(proxyPrefix+"/theme/settings.js");
+loadScript(proxyPrefix+"/theme/settings.js", function(){
+    if(themeVariant === null){
+        themeVariant='default'; 
+    }
+    if(typeof Storage !== "undefined"){
+        if (localStorage.getItem('UbooquityThemeVariant') !== null) {
+            themeVariant=localStorage.getItem('UbooquityThemeVariant');
+        }else{
+            localStorage.setItem('UbooquityThemeVariant', 'default'); 
+        } 
+    } 
+});
 
 /* Load JQuery and JQuery UI, then rebuild pages. */
 loadScript(proxyPrefix+"/theme/js/jquery-3.3.1.min.js", function(){
     loadScript(proxyPrefix+"/theme/js/jquery-ui.min.js", function(){
-
         $.ajaxSetup({ cache: false });
         $('head').append('<link rel="stylesheet" href="'+proxyPrefix+'/theme/comixology.css" type="text/css" />');
-
-        /* Theme variant load/store. */
-        var themeVariants = ['dark-a', 'dark-b'];
-        if(typeof themeVariant === "undefined"){
-            var themeVariant='default'; 
-        }
-        if(typeof Storage !== "undefined"){
-            if (localStorage.getItem('UbooquityThemeVariant') !== null) {
-                themeVariant=localStorage.getItem('UbooquityThemeVariant');
-            }else{
-                localStorage.setItem('UbooquityThemeVariant', themeVariant); 
-            } 
-        }   
-
         if(typeof Storage !== "undefined"){
             if (localStorage.getItem(bookmarkLocation) !== null) {
                 Bookmarks=JSON.parse(localStorage.getItem(bookmarkLocation));

diff --git a/comixology2/themes/dark-a/dark-a.css b/comixology2/themes/dark-a/dark-a.css
@@ -7,6 +7,12 @@ body {
     background-color: #011628 !important;
 } 
 
+#loginform {
+    border: none;
+    background-color: #1F1F1F;
+    box-shadow: 0 0 13px rgba(0,0,0,.5);
+}
+
 .list-container {
     border: none !important;
     box-shadow: 0 0 13px rgba(0,0,0,.5);
@@ -388,7 +394,7 @@ footer a {
 
 /*Files END*/
 
-/* additonal tweaks */
+/* additional tweaks */
 .content-title {
    font-size: 12px;
 }
@@ -408,5 +414,4 @@ footer a {
 .unlimited-header.unlimited-v2 {
     box-shadow: 0 0 13px rgba(0,0,0,.5);
 }
-
-/* additonal tweaks end */
+/* additional tweaks end */
diff --git a/comixology2/themes/dark-b/dark-b.css b/comixology2/themes/dark-b/dark-b.css
@@ -7,6 +7,12 @@ body {
     background-color: #000 !important;
 } 
 
+#loginform {
+    border: none;
+    background-color: #1F1F1F;
+    box-shadow: 0 0 13px rgba(0,0,0,.5);
+}
+
 .list-container {
     border: none !important;
     box-shadow: 0 0 13px rgba(0,0,0,.5);
@@ -391,7 +397,7 @@ footer a {
 
 /*Files END*/
 
-/* additonal tweaks */
+/* additional tweaks */
 .content-title {
    font-size: 12px;
 }
@@ -412,4 +418,4 @@ footer a {
     box-shadow: 0 0 13px rgba(0,0,0,.5);
 }
 
-/* additonal tweaks end */
+/* additional tweaks end */