Merge remote-tracking branch 'airsonic/pr/700'

airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp

@@ -677,7 +677,7 @@
     </c:when>
     <c:otherwise>
         <div class="bgcolor2" style="position:fixed; bottom:0; width:100%;padding-top:10px;">
-            <table style="white-space:nowrap;">
+            <table style="white-space:nowrap; margin-bottom:0;">
                 <tr style="white-space:nowrap;">
                     <c:if test="${model.user.settingsRole and fn:length(model.players) gt 1}">
                         <td style="padding-right: 5px"><select name="player" onchange="location='playQueue.view?player=' + options[selectedIndex].value;">

airsonic-main/src/main/webapp/style/buuftheme.css

@@ -109,4 +109,3 @@ body {
     margin: 5px;
     padding: 5px;
 }
-

airsonic-main/src/main/webapp/style/coolandclean.css

@@ -105,4 +105,3 @@ body {
     margin: 5px;
     padding: 5px;
 }
-

airsonic-main/src/main/webapp/style/default.css

@@ -1,3 +1,2 @@
+@import "default-without-mediaelement.css";
 @import "mediaelement-light.css";
-@import "default-without-mediaelement-light.css";
-

airsonic-main/src/main/webapp/style/hd.css

@@ -80,4 +80,3 @@ input, select {
 .albumComment, .log {
     font-size: 12pt;
 }
-

airsonic-main/src/main/webapp/style/hd1080.css

@@ -14,4 +14,3 @@ body {
 .detail, .albumComment, .log {
     font-size: 12pt;
 }
-

airsonic-main/src/main/webapp/style/hiconi.css

@@ -4,7 +4,8 @@
  * Author: Jeebs (Fisher Evans)
  */
 
-@import "default-without-mediaelement-light.css";
+@import "default-without-mediaelement.css";
+@import "mediaelement-dark.css";
 
 table {
 	color: #a3a3a3;

airsonic-main/src/main/webapp/style/mediaelement-dark.css

@@ -0,0 +1,11 @@
+.mejs__container {
+  background: transparent;
+}
+
+.mejs__container .me_cannotplay a {
+  background: transparent;
+}
+
+.mejs__controls:not([style*="display: none"]) {
+  background: transparent;
+}

airsonic-main/src/main/webapp/style/mediaelement-light.css

@@ -1,4 +1,3 @@
-
 .mejs__overlay-loading-bg-img {
     background-image: url("mejs-controls-dark.svg");
 }
@@ -12,15 +11,15 @@
 }
 
 .mejs__container {
-    background: #F1F1F1;
+  background: transparent;
 }
 
 .mejs__container .me_cannotplay a {
-    color: #F1F1F1;
+  background: transparent;
 }
 
 .mejs__controls:not([style*="display: none"]) {
-    background: #F1F1F1;
+  background: transparent;
 }
 
 .mejs__time {

airsonic-main/src/main/webapp/style/midnight.css

@@ -4,7 +4,8 @@
  * Author: Sindre Mehus
  */
 
-@import "default-without-mediaelement-light.css";
+@import "default-without-mediaelement.css";
+@import "mediaelement-dark.css";
 
 /* The primary background color. */
 .bgcolor1, table.music tr:nth-of-type(even) {

airsonic-main/src/main/webapp/style/monochrome_black.css

@@ -4,7 +4,8 @@
  * Author: David D ddavis1@gmail.com
  */
 
-@import "default-without-mediaelement-light.css";
+@import "default-without-mediaelement.css";
+@import "mediaelement-dark.css";
 
 /* The primary background colour. */
 .bgcolor1, table.music tr:nth-of-type(even) {