mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #670 from dkanada/merge

Browse source 
Fix issue with previous merge commit
This commit is contained in:
dkanada 2020-01-06 23:31:09 +09:00 • committed by GitHub
commit 4d48e441fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 0 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/components/themes/appletv/theme.css
View file

@ -26,16 +26,6 @@ html {
background: linear-gradient(to right, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB)
}
<<<<<<< HEAD
@supports (backdrop-filter:blur(1.5em)) {
.skinHeader-blurred {
background: linear-gradient(to right, rgba(188, 188, 188, .7), rgba(167, 180, 183, .7), rgba(190, 181, 165, .7), rgba(173, 190, 194, .7), rgba(185, 199, 203, .7));
backdrop-filter: blur(1.5em)
}
}
=======
>>>>>>> master
.skinHeader.semiTransparent {
backdrop-filter: none !important
}
@ -194,16 +184,6 @@ html {
background: linear-gradient(to right, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB)
}
<<<<<<< HEAD
@supports (backdrop-filter:blur(10px)) {
.appfooter-blurred {
background: rgba(24, 24, 24, .7);
backdrop-filter: blur(20px)
}
}
=======
>>>>>>> master
.nowPlayingBarSecondaryText {
color: #999
}

4
src/components/themes/blueradiance/theme.css
View file

@ -175,11 +175,7 @@ html {
@supports (backdrop-filter:blur(10px)) {
.appfooter-blurred {
<<<<<<< HEAD
background: rgba(24, 24, 24, .7);
=======
background: rgba(1, 2, 50, .7);
>>>>>>> master
backdrop-filter: blur(20px)
}
}

10
src/components/themes/dark/theme.css
View file

@ -161,16 +161,6 @@ html {
color: rgba(255, 255, 255, .78)
}
<<<<<<< HEAD
@supports (backdrop-filter:blur(10px)) {
.appfooter-blurred {
background: rgba(24, 24, 24, .7);
backdrop-filter: blur(20px)
}
}
=======
>>>>>>> master
.itemSelectionPanel {
border: 1px solid #00a4dc
}

10
src/components/themes/emby/theme.css
View file

@ -161,16 +161,6 @@ html {
color: rgba(255, 255, 255, .78)
}
<<<<<<< HEAD
@supports (backdrop-filter:blur(10px)) {
.appfooter-blurred {
background: rgba(24, 24, 24, .7);
backdrop-filter: blur(20px)
}
}
=======
>>>>>>> master
.itemSelectionPanel {
border: 1px solid #52b54b
}

10
src/components/themes/light/theme.css
View file

@ -186,16 +186,6 @@ html {
color: rgba(255, 255, 255, .78)
}
<<<<<<< HEAD
@supports (backdrop-filter:blur(10px)) {
.appfooter-blurred {
background: rgba(24, 24, 24, .7);
backdrop-filter: blur(20px)
}
}
=======
>>>>>>> master
.nowPlayingBarSecondaryText {
color: #999
}

4
src/components/themes/purple-haze/theme.css
View file

@ -263,11 +263,7 @@ a[data-role=button] {
@supports (backdrop-filter:blur(10px)) {
.appfooter-blurred {
<<<<<<< HEAD
background: rgba(24, 24, 24, .7);
=======
background: rgba(6, 37, 111, .7);
>>>>>>> master
backdrop-filter: blur(20px)
}
}

20
src/components/themes/wmc/theme.css
View file

@ -26,16 +26,6 @@ html {
background: linear-gradient(to bottom, #0C2450, #081B3B)
}
<<<<<<< HEAD
@supports (backdrop-filter:blur(1.5em)) {
.skinHeader-blurred {
background: rgba(20, 20, 20, .7);
backdrop-filter: blur(1.5em)
}
}
=======
>>>>>>> master
.skinHeader.semiTransparent {
backdrop-filter: none !important;
background-color: rgba(0, 0, 0, .3);
@ -174,16 +164,6 @@ html {
color: rgba(255, 255, 255, .78)
}
<<<<<<< HEAD
@supports (backdrop-filter:blur(10px)) {
.appfooter-blurred {
background: rgba(24, 24, 24, .7);
backdrop-filter: blur(20px)
}
}
=======
>>>>>>> master
.itemSelectionPanel {
border: 1px solid #00a4dc
}

3
src/css/librarybrowser.css
View file

@ -406,10 +406,7 @@
.detailImageContainer {
width: 280px;
<<<<<<< HEAD
=======
margin-right: 2em;
>>>>>>> master
flex-shrink: 0;
}