Fixed #10825 - selectlists in modals b0rked

Signed-off-by: snipe <[email protected]>
snipe · Mar 16, 2022 · 54d6a4d · 54d6a4d
1 parent 84aa26d
commit 54d6a4d
Show file tree

Hide file tree

Showing 31 changed files with 104 additions and 162 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css
@@ -37,13 +37,18 @@
     color: #fff;
   }
   .skin-black-dark .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-black-dark .main-header .navbar .dropdown-menu li a:hover {
     background: #040404;
     color: #fff;
   }
 }
+@media (max-width: 991px) {
+  .skin-black-dark .main-header .navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+    background-color: var(--back-sub);
+  }
+}
 .skin-black-dark .main-header li.user-header {
   background-color: #111;
 }
@@ -315,11 +320,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css
@@ -37,13 +37,18 @@
     color: #fff;
   }
   .skin-black-dark .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-black-dark .main-header .navbar .dropdown-menu li a:hover {
     background: #040404;
     color: #fff;
   }
 }
+@media (max-width: 991px) {
+  .skin-black-dark .main-header .navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+    background-color: var(--back-sub);
+  }
+}
 .skin-black-dark .main-header li.user-header {
   background-color: #111;
 }
@@ -315,11 +320,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-black.css b/public/css/dist/skins/skin-black.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-black .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-black .main-header .navbar .dropdown-menu li a:hover {
     background: #040404;

diff --git a/public/css/dist/skins/skin-black.min.css b/public/css/dist/skins/skin-black.min.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-black .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-black .main-header .navbar .dropdown-menu li a:hover {
     background: #040404;

diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css
@@ -301,11 +301,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css
@@ -301,11 +301,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css
@@ -301,11 +301,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css
@@ -301,11 +301,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-green.css b/public/css/dist/skins/skin-green.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-green .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-green .main-header .navbar .dropdown-menu li a:hover {
     background: #008d4c;

diff --git a/public/css/dist/skins/skin-green.min.css b/public/css/dist/skins/skin-green.min.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-green .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-green .main-header .navbar .dropdown-menu li a:hover {
     background: #008d4c;

diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css
@@ -304,11 +304,6 @@ a:link.btn-default {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css
@@ -304,11 +304,6 @@ a:link.btn-default {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-orange.css b/public/css/dist/skins/skin-orange.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-orange .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-orange .main-header .navbar .dropdown-menu li a:hover {
     background: #e67e00;

diff --git a/public/css/dist/skins/skin-orange.min.css b/public/css/dist/skins/skin-orange.min.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-orange .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-orange .main-header .navbar .dropdown-menu li a:hover {
     background: #e67e00;

diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css
@@ -304,11 +304,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css
@@ -304,11 +304,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-purple.css b/public/css/dist/skins/skin-purple.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-purple .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-purple .main-header .navbar .dropdown-menu li a:hover {
     background: #555299;

diff --git a/public/css/dist/skins/skin-purple.min.css b/public/css/dist/skins/skin-purple.min.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-purple .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-purple .main-header .navbar .dropdown-menu li a:hover {
     background: #555299;

diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css
@@ -302,11 +302,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css
@@ -302,11 +302,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-red.css b/public/css/dist/skins/skin-red.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-red .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-red .main-header .navbar .dropdown-menu li a:hover {
     background: #d73925;

diff --git a/public/css/dist/skins/skin-red.min.css b/public/css/dist/skins/skin-red.min.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-red .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-red .main-header .navbar .dropdown-menu li a:hover {
     background: #d73925;

diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css
@@ -304,11 +304,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css
@@ -304,11 +304,6 @@ body {
 #details > div > div > div > table {
   background-color: transparent;
 }
-.dropdown-menu,
-.dropdown-menu > li > a {
-  background-color: var(--back-sub);
-  color: var(--text-main) !important;
-}
 .dropdown-menu > li > a:hover {
   background-color: var(--back-main);
   color: var(--nav-link);

diff --git a/public/css/dist/skins/skin-yellow.css b/public/css/dist/skins/skin-yellow.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-yellow .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-yellow .main-header .navbar .dropdown-menu li a:hover {
     background: #e08e0b;

diff --git a/public/css/dist/skins/skin-yellow.min.css b/public/css/dist/skins/skin-yellow.min.css
@@ -36,7 +36,7 @@
     background-color: rgba(255, 255, 255, 0.1);
   }
   .skin-yellow .main-header .navbar .dropdown-menu li a {
-    color: #fff;
+    color: #333;
   }
   .skin-yellow .main-header .navbar .dropdown-menu li a:hover {
     background: #e08e0b;

diff --git a/public/js/build/app.js b/public/js/build/app.js
@@ -2241,7 +2241,8 @@ If you want to pass additional variables to the modal (In the Category Create on
 
 */
 $(function () {
-  //handle modal-add-interstitial calls
+  var baseUrl = $('meta[name="baseUrl"]').attr('content'); //handle modal-add-interstitial calls
+
   var model, select, refreshSelector;
 
   if ($('#createModal').length == 0) {

diff --git a/public/js/dist/all.js b/public/js/dist/all.js
@@ -61379,7 +61379,8 @@ If you want to pass additional variables to the modal (In the Category Create on
 
 */
 $(function () {
-  //handle modal-add-interstitial calls
+  var baseUrl = $('meta[name="baseUrl"]').attr('content'); //handle modal-add-interstitial calls
+
   var model, select, refreshSelector;
 
   if ($('#createModal').length == 0) {