Fix rebasing issues
This commit is contained in:
MrTimscampi
parent
1646cac34a
commit
8634ae8400
33 changed files with 382 additions and 276 deletions
|
|
@ -23,10 +23,10 @@ html {
|
|||
.skinHeader-withBackground {
|
||||
color: rgba(0, 0, 0, 0.7);
|
||||
background: #303030;
|
||||
background: -webkit-gradient(linear, left top, right top, from(#BCBCBC), color-stop(#A7B4B7), color-stop(#BEB5A5), color-stop(#ADBEC2), to(#B9C7CB));
|
||||
background: -webkit-linear-gradient(left, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB);
|
||||
background: -o-linear-gradient(left, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB);
|
||||
background: linear-gradient(to right, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB);
|
||||
background: -webkit-gradient(linear, left top, right top, from(#bcbcbc), color-stop(#a7b4b7), color-stop(#beb5a5), color-stop(#adbec2), to(#b9c7cb));
|
||||
background: -webkit-linear-gradient(left, #bcbcbc, #a7b4b7, #beb5a5, #adbec2, #b9c7cb);
|
||||
background: -o-linear-gradient(left, #bcbcbc, #a7b4b7, #beb5a5, #adbec2, #b9c7cb);
|
||||
background: linear-gradient(to right, #bcbcbc, #a7b4b7, #beb5a5, #adbec2, #b9c7cb);
|
||||
}
|
||||
|
||||
.skinHeader.semiTransparent {
|
||||
|
|
@ -44,16 +44,16 @@ html {
|
|||
|
||||
.backgroundContainer,
|
||||
.dialog {
|
||||
background: #D5E9F2;
|
||||
background: #d5e9f2;
|
||||
-webkit-background-size: 100% 100%;
|
||||
background-size: 100% 100%;
|
||||
}
|
||||
|
||||
.backgroundContainer.withBackdrop {
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(rgba(192, 212, 222, .94)), color-stop(rgba(235, 250, 254, .94)), color-stop(rgba(227, 220, 212, .94)), color-stop(rgba(206, 214, 216, .94)), to(rgba(192, 211, 218, .94)));
|
||||
background: -webkit-linear-gradient(top, rgba(192, 212, 222, .94), rgba(235, 250, 254, .94), rgba(227, 220, 212, .94), rgba(206, 214, 216, .94), rgba(192, 211, 218, .94));
|
||||
background: -o-linear-gradient(top, rgba(192, 212, 222, .94), rgba(235, 250, 254, .94), rgba(227, 220, 212, .94), rgba(206, 214, 216, .94), rgba(192, 211, 218, .94));
|
||||
background: linear-gradient(to bottom, rgba(192, 212, 222, .94), rgba(235, 250, 254, .94), rgba(227, 220, 212, .94), rgba(206, 214, 216, .94), rgba(192, 211, 218, .94));
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(rgba(192, 212, 222, 0.94)), color-stop(rgba(235, 250, 254, 0.94)), color-stop(rgba(227, 220, 212, 0.94)), color-stop(rgba(206, 214, 216, 0.94)), to(rgba(192, 211, 218, 0.94)));
|
||||
background: -webkit-linear-gradient(top, rgba(192, 212, 222, 0.94), rgba(235, 250, 254, 0.94), rgba(227, 220, 212, 0.94), rgba(206, 214, 216, 0.94), rgba(192, 211, 218, 0.94));
|
||||
background: -o-linear-gradient(top, rgba(192, 212, 222, 0.94), rgba(235, 250, 254, 0.94), rgba(227, 220, 212, 0.94), rgba(206, 214, 216, 0.94), rgba(192, 211, 218, 0.94));
|
||||
background: linear-gradient(to bottom, rgba(192, 212, 222, 0.94), rgba(235, 250, 254, 0.94), rgba(227, 220, 212, 0.94), rgba(206, 214, 216, 0.94), rgba(192, 211, 218, 0.94));
|
||||
}
|
||||
|
||||
.actionSheet {
|
||||
|
|
@ -189,10 +189,10 @@ html {
|
|||
.formDialogFooter:not(.formDialogFooter-clear) {
|
||||
color: rgba(0, 0, 0, 0.7);
|
||||
background: #303030;
|
||||
background: -webkit-gradient(linear, left top, right top, from(#BCBCBC), color-stop(#A7B4B7), color-stop(#BEB5A5), color-stop(#ADBEC2), to(#B9C7CB));
|
||||
background: -webkit-linear-gradient(left, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB);
|
||||
background: -o-linear-gradient(left, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB);
|
||||
background: linear-gradient(to right, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB);
|
||||
background: -webkit-gradient(linear, left top, right top, from(#bcbcbc), color-stop(#a7b4b7), color-stop(#beb5a5), color-stop(#adbec2), to(#b9c7cb));
|
||||
background: -webkit-linear-gradient(left, #bcbcbc, #a7b4b7, #beb5a5, #adbec2, #b9c7cb);
|
||||
background: -o-linear-gradient(left, #bcbcbc, #a7b4b7, #beb5a5, #adbec2, #b9c7cb);
|
||||
background: linear-gradient(to right, #bcbcbc, #a7b4b7, #beb5a5, #adbec2, #b9c7cb);
|
||||
}
|
||||
|
||||
.nowPlayingBarSecondaryText {
|
||||
|
|
@ -254,10 +254,10 @@ html {
|
|||
.emby-input,
|
||||
.emby-textarea {
|
||||
color: inherit;
|
||||
background: rgba(255, 255, 255, .9);
|
||||
border: .07em solid rgba(0, 0, 0, .158);
|
||||
-webkit-border-radius: .15em;
|
||||
border-radius: .15em;
|
||||
background: rgba(255, 255, 255, 0.9);
|
||||
border: 0.07em solid rgba(0, 0, 0, 0.158);
|
||||
-webkit-border-radius: 0.15em;
|
||||
border-radius: 0.15em;
|
||||
}
|
||||
|
||||
.emby-input:focus,
|
||||
|
|
@ -408,8 +408,8 @@ html {
|
|||
color: #000;
|
||||
background: #fff3a5;
|
||||
padding: 1em;
|
||||
-webkit-border-radius: .25em;
|
||||
border-radius: .25em;
|
||||
-webkit-border-radius: 0.25em;
|
||||
border-radius: 0.25em;
|
||||
}
|
||||
|
||||
.ratingbutton-icon-withrating {
|
||||
|
|
|
|||
|
|
@ -17,20 +17,20 @@ html {
|
|||
|
||||
.skinHeader-withBackground {
|
||||
background: #303030;
|
||||
background: -webkit-gradient(linear, left top, right top, from(#291A31), color-stop(#033664), color-stop(#011432), color-stop(#141A3A), to(#291A31));
|
||||
background: -webkit-linear-gradient(left, #291A31, #033664, #011432, #141A3A, #291A31);
|
||||
background: -o-linear-gradient(left, #291A31, #033664, #011432, #141A3A, #291A31);
|
||||
background: linear-gradient(to right, #291A31, #033664, #011432, #141A3A, #291A31);
|
||||
background: -webkit-gradient(linear, left top, right top, from(#291a31), color-stop(#033664), color-stop(#011432), color-stop(#141a3a), to(#291a31));
|
||||
background: -webkit-linear-gradient(left, #291a31, #033664, #011432, #141a3a, #291a31);
|
||||
background: -o-linear-gradient(left, #291a31, #033664, #011432, #141a3a, #291a31);
|
||||
background: linear-gradient(to right, #291a31, #033664, #011432, #141a3a, #291a31);
|
||||
}
|
||||
|
||||
.skinHeader.semiTransparent {
|
||||
-webkit-backdrop-filter: none !important;
|
||||
backdrop-filter: none !important;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0)));
|
||||
background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
|
||||
background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
|
||||
background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
|
||||
background-color: rgba(0, 0, 0, .3);
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.6)), to(rgba(0, 0, 0, 0)));
|
||||
background: -webkit-linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
|
||||
background: -o-linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
|
||||
background: linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
|
||||
background-color: rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
.pageTitleWithDefaultLogo {
|
||||
|
|
@ -251,10 +251,10 @@ html {
|
|||
.emby-input,
|
||||
.emby-textarea {
|
||||
color: inherit;
|
||||
background: rgba(0, 0, 0, .5);
|
||||
border: .07em solid transparent;
|
||||
-webkit-border-radius: .15em;
|
||||
border-radius: .15em;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
border: 0.07em solid transparent;
|
||||
-webkit-border-radius: 0.15em;
|
||||
border-radius: 0.15em;
|
||||
}
|
||||
|
||||
.emby-input:focus,
|
||||
|
|
@ -411,8 +411,8 @@ html {
|
|||
color: #ddd;
|
||||
background: #111;
|
||||
padding: 1em;
|
||||
-webkit-border-radius: .25em;
|
||||
border-radius: .25em;
|
||||
-webkit-border-radius: 0.25em;
|
||||
border-radius: 0.25em;
|
||||
}
|
||||
|
||||
.ratingbutton-icon-withrating {
|
||||
|
|
@ -438,8 +438,8 @@ html {
|
|||
}
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track-piece {
|
||||
|
|
|
|||
|
|
@ -226,9 +226,9 @@ html {
|
|||
.emby-textarea {
|
||||
color: inherit;
|
||||
background: #292929;
|
||||
border: .07em solid #292929;
|
||||
-webkit-border-radius: .15em;
|
||||
border-radius: .15em;
|
||||
border: 0.07em solid #292929;
|
||||
-webkit-border-radius: 0.15em;
|
||||
border-radius: 0.15em;
|
||||
}
|
||||
|
||||
.emby-input:focus,
|
||||
|
|
@ -381,8 +381,8 @@ html {
|
|||
color: #ddd;
|
||||
background: #111;
|
||||
padding: 1em;
|
||||
-webkit-border-radius: .25em;
|
||||
border-radius: .25em;
|
||||
-webkit-border-radius: 0.25em;
|
||||
border-radius: 0.25em;
|
||||
}
|
||||
|
||||
.ratingbutton-icon-withrating {
|
||||
|
|
@ -408,8 +408,8 @@ html {
|
|||
}
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track-piece {
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ html {
|
|||
.skinHeader-withBackground {
|
||||
background-color: #303030;
|
||||
color: #ccc;
|
||||
color: rgba(255, 255, 255, .87);
|
||||
-webkit-box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37);
|
||||
box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37);
|
||||
color: rgba(255, 255, 255, 0.87);
|
||||
-webkit-box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37);
|
||||
box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37);
|
||||
}
|
||||
|
||||
.osdHeader {
|
||||
|
|
@ -248,9 +248,9 @@ html {
|
|||
.emby-textarea {
|
||||
color: inherit;
|
||||
background: #fff;
|
||||
border: .07em solid rgba(0, 0, 0, .158);
|
||||
-webkit-border-radius: .15em;
|
||||
border-radius: .15em;
|
||||
border: 0.07em solid rgba(0, 0, 0, 0.158);
|
||||
-webkit-border-radius: 0.15em;
|
||||
border-radius: 0.15em;
|
||||
}
|
||||
|
||||
.emby-input:focus,
|
||||
|
|
@ -400,8 +400,8 @@ html {
|
|||
color: #000;
|
||||
background: #fff3a5;
|
||||
padding: 1em;
|
||||
-webkit-border-radius: .25em;
|
||||
border-radius: .25em;
|
||||
-webkit-border-radius: 0.25em;
|
||||
border-radius: 0.25em;
|
||||
}
|
||||
|
||||
.ratingbutton-icon-withrating {
|
||||
|
|
|
|||
|
|
@ -18,18 +18,18 @@ html {
|
|||
.skinHeader-withBackground {
|
||||
background: #000420;
|
||||
background: -moz-linear-gradient(left, #000420 0%, #06256f 18%, #2b052b 38%, #2b052b 68%, #06256f 81%, #000420 100%);
|
||||
background: -webkit-linear-gradient(left, #000420 0%,#06256f 18%,#2b052b 38%,#2b052b 68%,#06256f 81%,#000420 100%);
|
||||
background: linear-gradient(to right, #000420 0%,#06256f 18%,#2b052b 38%,#2b052b 68%,#06256f 81%,#000420 100%);
|
||||
background: -webkit-linear-gradient(left, #000420 0%, #06256f 18%, #2b052b 38%, #2b052b 68%, #06256f 81%, #000420 100%);
|
||||
background: linear-gradient(to right, #000420 0%, #06256f 18%, #2b052b 38%, #2b052b 68%, #06256f 81%, #000420 100%);
|
||||
}
|
||||
|
||||
.skinHeader.semiTransparent {
|
||||
-webkit-backdrop-filter: none !important;
|
||||
backdrop-filter: none !important;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0)));
|
||||
background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
|
||||
background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
|
||||
background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
|
||||
background-color: rgba(0, 0, 0, .3);
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.6)), to(rgba(0, 0, 0, 0)));
|
||||
background: -webkit-linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
|
||||
background: -o-linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
|
||||
background: linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
|
||||
background-color: rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
.pageTitleWithDefaultLogo {
|
||||
|
|
@ -339,10 +339,10 @@ a[data-role=button] {
|
|||
.emby-input,
|
||||
.emby-textarea {
|
||||
color: inherit;
|
||||
background: rgba(0, 0, 0, .5);
|
||||
border: .07em solid transparent;
|
||||
-webkit-border-radius: .15em;
|
||||
border-radius: .15em;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
border: 0.07em solid transparent;
|
||||
-webkit-border-radius: 0.15em;
|
||||
border-radius: 0.15em;
|
||||
}
|
||||
|
||||
.emby-input:focus,
|
||||
|
|
@ -504,8 +504,8 @@ a[data-role=button] {
|
|||
color: #0e0f2d;
|
||||
background: #dbe6ff;
|
||||
padding: 1em;
|
||||
-webkit-border-radius: .25em;
|
||||
border-radius: .25em;
|
||||
-webkit-border-radius: 0.25em;
|
||||
border-radius: 0.25em;
|
||||
}
|
||||
|
||||
.ratingbutton-icon-withrating {
|
||||
|
|
@ -542,8 +542,8 @@ a[data-role=button] {
|
|||
}
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track-piece {
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@ html {
|
|||
.skinHeader.semiTransparent {
|
||||
-webkit-backdrop-filter: none !important;
|
||||
backdrop-filter: none !important;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0)));
|
||||
background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
|
||||
background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
|
||||
background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
|
||||
background-color: rgba(0, 0, 0, .3);
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.6)), to(rgba(0, 0, 0, 0)));
|
||||
background: -webkit-linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
|
||||
background: -o-linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
|
||||
background: linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0));
|
||||
background-color: rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
.pageTitleWithDefaultLogo {
|
||||
|
|
@ -45,11 +45,11 @@ html {
|
|||
|
||||
.backgroundContainer,
|
||||
.dialog {
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#0F3562), color-stop(#1162A4), to(#03215F));
|
||||
background: -webkit-linear-gradient(top, #0F3562, #1162A4, #03215F);
|
||||
background: -o-linear-gradient(top, #0F3562, #1162A4, #03215F);
|
||||
background: linear-gradient(to bottom, #0F3562, #1162A4, #03215F);
|
||||
background-color: #0F3562;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#0f3562), color-stop(#1162a4), to(#03215f));
|
||||
background: -webkit-linear-gradient(top, #0f3562, #1162a4, #03215f);
|
||||
background: -o-linear-gradient(top, #0f3562, #1162a4, #03215f);
|
||||
background: linear-gradient(to bottom, #0f3562, #1162a4, #03215f);
|
||||
background-color: #0f3562;
|
||||
}
|
||||
|
||||
.backgroundContainer.withBackdrop {
|
||||
|
|
@ -169,12 +169,12 @@ html {
|
|||
|
||||
.appfooter,
|
||||
.formDialogFooter:not(.formDialogFooter-clear) {
|
||||
background: #0C2450;
|
||||
background: -webkit-gradient(linear, left bottom, left top, from(#0C2450), to(#081B3B));
|
||||
background: -webkit-linear-gradient(bottom, #0C2450, #081B3B);
|
||||
background: -o-linear-gradient(bottom, #0C2450, #081B3B);
|
||||
background: linear-gradient(to top, #0C2450, #081B3B);
|
||||
color: rgba(255, 255, 255, .78);
|
||||
background: #0c2450;
|
||||
background: -webkit-gradient(linear, left bottom, left top, from(#0c2450), to(#081b3b));
|
||||
background: -webkit-linear-gradient(bottom, #0c2450, #081b3b);
|
||||
background: -o-linear-gradient(bottom, #0c2450, #081b3b);
|
||||
background: linear-gradient(to top, #0c2450, #081b3b);
|
||||
color: rgba(255, 255, 255, 0.78);
|
||||
}
|
||||
|
||||
.itemSelectionPanel {
|
||||
|
|
@ -237,10 +237,10 @@ html {
|
|||
.emby-input,
|
||||
.emby-textarea {
|
||||
color: inherit;
|
||||
background: rgba(255, 255, 255, .2);
|
||||
border: .07em solid rgba(255, 255, 255, .135);
|
||||
-webkit-border-radius: .15em;
|
||||
border-radius: .15em;
|
||||
background: rgba(255, 255, 255, 0.2);
|
||||
border: 0.07em solid rgba(255, 255, 255, 0.135);
|
||||
-webkit-border-radius: 0.15em;
|
||||
border-radius: 0.15em;
|
||||
}
|
||||
|
||||
.emby-input:focus,
|
||||
|
|
@ -395,8 +395,8 @@ html {
|
|||
color: #000;
|
||||
background: #fff3a5;
|
||||
padding: 1em;
|
||||
-webkit-border-radius: .25em;
|
||||
border-radius: .25em;
|
||||
-webkit-border-radius: 0.25em;
|
||||
border-radius: 0.25em;
|
||||
}
|
||||
|
||||
.ratingbutton-icon-withrating {
|
||||
|
|
@ -422,8 +422,8 @@ html {
|
|||
}
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
|
||||
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track-piece {
|
||||
|
|
@ -439,7 +439,7 @@ html {
|
|||
::-webkit-scrollbar-thumb:vertical {
|
||||
border-radius: 2px;
|
||||
-webkit-border-radius: 2px;
|
||||
background: center no-repeat rgba(255, 255, 255, .7);
|
||||
background: center no-repeat rgba(255, 255, 255, 0.7);
|
||||
}
|
||||
|
||||
.metadataSidebarIcon {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue