github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 21:03:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'v2.5-export' into nightly

Browse source
This commit is contained in:
JonnyWong16 2020-10-02 20:45:11 -07:00
commit 739c977cd7
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
45 changed files with 6500 additions and 521 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interfaces/default/css/dataTables.colVis.css
View file

@ -71,7 +71,7 @@ ul.ColVis_collection {
list-style: none;
width: 150px;
padding: 8px 8px 4px 8px;
margin: 10px 0px 0px 0px;
margin: 10px 0px 10px 0px;
background-color: #444;
overflow: hidden;
z-index: 2002;

57
data/interfaces/default/css/tautulli.css
View file

@ -217,6 +217,10 @@ select.form-control:focus,
.selectize-dropdown .optgroup-header {
font-weight: bold;
}
.selectize-dropdown [data-selectable].option-disabled {
color: #aaa;
cursor: default;
}
select.form-control option {
color: #555;
background-color: #eee;
@ -1750,6 +1754,7 @@ a:hover .dashboard-recent-media-cover {
box-shadow: inset 0 0 0 2px #e9a049;
opacity: 0;
transition: opacity .2s;
z-index: 2;
}
.summary-poster-face-overlay span {
display: block;
@ -1963,7 +1968,10 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
.item-children-instance {
list-style: none;
margin: 0;
overflow: hidden;
overflow: auto;
}
.item-children-instance.max-height {
max-height: 875px;
}
.item-children-instance li {
float: left;
@ -2099,7 +2107,7 @@ a:hover .item-children-poster {
}
.item-children-list-item-title {
display: inline-block;
width: calc(100% - 110px);
/*width: calc(100% - 110px);*/
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@ -2109,9 +2117,16 @@ a:hover .item-children-poster {
color: #777;
text-align: right;
display: inline-block;
width: 40px;
width: 60px;
margin-right: 20px;
}
.nav-list {
list-style: none;
padding: 0;
}
.nav-list.nav-pills > li > a {
margin-bottom: 0;
}
#new_title h3 {
color: #E5A00D;
font-size: 14px;
@ -2185,32 +2200,17 @@ li.advanced-setting {
.user-info-username {
font-size: 24px;
color: #eee;
padding-top: 27px;
padding-top: 15px;
padding-left: 105px;
}
.user-info-nav {
margin-top: 15px;
}
.user-info-nav > .active > a {
color: #cc7b19;
padding-left: 105px;
}
.nav-tabs > .active > a:hover,
.nav-tabs > .active > a:focus {
color: #e9a049;
}
.user-info-nav a:hover {
color: #e9a049;
text-decoration: none;
}
.user-info-nav ul {
list-style: none;
padding: 0;
}
.user-info-nav li {
float: left;
margin-left: 10px;
margin-right: 10px;
}
.user-overview-stats-wrapper {
}
.user-overview-stats-wrapper ul {
@ -3485,6 +3485,9 @@ pre::-webkit-scrollbar-thumb {
.selectize-input input[type='text'] {
height: 20px;
}
.selectize-input.disabled, .selectize-input.disabled * {
cursor: not-allowed !important;
}
.small-muted {
font-size: small;
color: #777;
@ -3707,6 +3710,20 @@ a:hover .overlay-refresh-image {
a:hover .overlay-refresh-image:hover {
opacity: .9;
}
.smart-playlist-image {
float: left;
position: absolute;
top: 5px;
left: 5px;
background-color: #8e6191;
border-radius: 4px;
color: #fff;
font-size: 16px;
z-index: 1;
width: 32px;
padding: 5px;
text-align: center;
}
#ip_error, #isp_error {
color: #aaa;
display: none;