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

fix merge conflict

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-19 23:36:16 -05:00
parent 251d77ad9e
commit 2da0e19d81
5 changed files with 396 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

56
dashboard-ui/themes/holiday/style.css
View file

@ -1,22 +1,18 @@
.ui-body-b h1, .ui-body-b h2 {
color: #cc3333;
color: #E53A35;
}
.viewMenuBar, .holidayInfoButton {
color: #cc3333 !important;
}
.barsMenuButton {
color: #cc3333 !important;
.holidayInfoButton {
color: #E53A35 !important;
}
.libraryViewNav .ui-btn-active {
border-bottom-color: #cc3333 !important;
color: #cc3333 !important;
border-bottom-color: #AC3326 !important;
color: #AC3326 !important;
}
paper-button[raised].more {
background: #cc3333;
background: #AC3326;
}
.channelTimeslotHeader, .timeslotHeader {
@ -26,3 +22,43 @@ paper-button[raised].more {
.channelTimeslotHeader {
border-right-color: #cc3333 !important;
}
paper-tabs #selectionBar, .playedIndicator {
background-color: #cc3333 !important;
}
.darkDrawer .sidebarLink:hover {
background: #AC3326;
}
.darkDrawer .sidebarLink.selectedSidebarLink, .darkDrawer .selectedMediaFolder {
background: #AC3326 !important;
}
#snowflakeContainer {
position: absolute;
left: 0px;
top: 0px;
}
.snowflake {
padding-left: 15px;
font-family: Cambria, Georgia, serif;
font-size: 14px;
line-height: 24px;
position: fixed;
color: #FFFFFF;
user-select: none;
z-index: 1000;
}
.snowflake:hover {
cursor: default;
}
.christmas .mainDrawer {
background-image: url(https://raw.githubusercontent.com/MediaBrowser/Emby.Resources/master/themes/holiday/drawer.jpg);
background-size: cover;
background-position: 60% center;
background-repeat: no-repeat;
}