mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2025-01-30 10:51:52 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/hermes' into hermes

Browse source
This commit is contained in:
Louis Vézina 2020-05-04 07:28:28 -04:00
commit 8a7afaf02b
5 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
static/css/bazarr.css
View file

@ -37,7 +37,7 @@ body {
z-index: 19; }
.topbar {
background: #ce2829; }
background: #911f93; }
.topbar .top-navbar .navbar-header .navbar-brand .light-logo {
display: inline-block;
color: rgba(255, 255, 255, 0.8); }
@ -112,16 +112,16 @@ a.link:hover, a.link:focus {
color: #e1e2e3;
font-size: 14px; }
.sidebar-nav ul li a.active, .sidebar-nav ul li a:hover {
color: #ce2829;
color: #911f93;
cursor: pointer; }
.sidebar-nav ul li a.active {
font-weight: 400;
color: #ce2829; }
color: #911f93; }
.sidebar-nav ul li ul {
padding-left: 60px;
padding-top: 0;
transition-delay: inherit;
border-left: 3px solid #ce2829; }
border-left: 3px solid #911f93; }
.sidebar-nav ul li ul li a {
padding: 15px 35px 10px 15px; }
.sidebar-nav ul li ul ul {
@ -135,17 +135,17 @@ a.link:hover, a.link:focus {
.sidebar-nav > ul > li {
margin-bottom: 0px; }
.sidebar-nav > ul > li.active > a {
color: #ce2829;
color: #911f93;
font-weight: 400;
border-left: 3px solid #ce2829;
border-left: 3px solid #911f93;
background: #252833;
padding: 8px 35px 8px 37px;
box-shadow: 0 0 0 rgba(0, 0, 0, 0.2); }
.sidebar-nav > ul > li.active > a i {
color: #ce2829;
color: #911f93;
font-size: 14px; }
.sidebar-nav > ul > li > a.active i, .sidebar-nav > ul > li > a:hover i {
color: #ce2829; }
color: #911f93; }
.sidebar-nav > ul > li > a i {
width: 27px;
height: 27px;
@ -159,7 +159,7 @@ a.link:hover, a.link:focus {
.sidebar-nav > ul > li > a.active {
font-weight: 400;
background: #242933;
color: #ce2829; }
color: #911f93; }
@media (min-width: 768px) {
.mini-sidebar .sidebar-nav #sidebarnav li {
@ -230,7 +230,7 @@ a.link:hover, a.link:focus {
.mini-sidebar .sidebar-nav #sidebarnav > li.active > a {
border-color: transparent; }
.mini-sidebar .sidebar-nav #sidebarnav > li.active > a.active {
border-color: #ce2829; } }
border-color: #911f93; } }
/*******************
/*Buttons
*******************/
@ -327,7 +327,7 @@ a.link:hover, a.link:focus {
color: #e1e2e3; }
.form-material .form-control, .form-material .form-control.focus, .form-material .form-control:focus {
background-image: linear-gradient(#ce2829, #ce2829), linear-gradient(#e1e2e3, #e1e2e3);
background-image: linear-gradient(#911f93, #911f93), linear-gradient(#e1e2e3, #e1e2e3);
border: 0 none;
border-radius: 0;
box-shadow: none;
@ -335,15 +335,15 @@ a.link:hover, a.link:focus {
.form-control:focus::placeholder {
/* Chrome, Firefox, Opera, Safari 10.1+ */
color: #ce2829;
color: #911f93;
opacity: 1;
/* Firefox */ }
.form-control:focus:-ms-input-placeholder {
/* Internet Explorer 10-11 */
color: #ce2829; }
color: #911f93; }
.form-control:focus::-ms-input-placeholder {
/* Microsoft Edge */
color: #ce2829; }
color: #911f93; }
.page-wrapper {
background: #f5f7fa;

2
static/css/bazarr.css.map
View file

File diff suppressed because one or more lines are too long

2
static/scss/bazarr.scss
View file

@ -13,7 +13,7 @@ $headingfont: 'Roboto', 'open sans', 'Helvetica Neue', 'Helvetica', 'Arial', san
$themecolor: #3a3f51;
$themecolor-dark: #252833;
$topbar: #ce2829;
$topbar: #911f93;
$themecolor-alt: #252833;
$sidebar: #3a3f51;
$swhite: #e1e2e3;

4
views/episodes.html
View file

@ -528,7 +528,7 @@
lengthChange: true,
pageLength: {{ settings.general.page_size_manual_search }},
lengthMenu: [ 5, 10, 15, 20, 25 ],
searching: false,
searching: true,
ordering: false,
processing: true,
serverSide: false,
@ -568,6 +568,7 @@
},
{
data: null,
searchable: false,
render: function (data) {
const array_matches = data.matches;
const array_dont_matches = data.dont_matches;
@ -612,6 +613,7 @@
},
{
data: null,
searchable: false,
render: function (data) {
return '<a href="" class="manual_download badge badge-secondary" data-episodePath="' + episodePath + '" data-sceneName="' + sceneName + '" data-sonarrEpisodeId=' + sonarrEpisodeId + ' data-subtitle="' + data.subtitle + '" data-provider="' + data.provider + '" data-language="' + data.language + '" data-forced="' + forced + '"><i class="fas fa-download" style="margin-right:0px" ></i></a>';
}

4
views/movie.html
View file

@ -411,7 +411,7 @@
lengthChange: true,
pageLength: {{ settings.general.page_size_manual_search }},
lengthMenu: [ 5, 10, 15, 20, 25 ],
searching: false,
searching: true,
ordering: false,
processing: true,
serverSide: false,
@ -447,6 +447,7 @@
}
},
{ data: null,
searchable: false,
render: function ( data ) {
const array_matches = data.matches;
const array_dont_matches = data.dont_matches;
@ -488,6 +489,7 @@
}
},
{ data: null,
searchable: false,
render: function ( data ) {
return '<a href="" class="manual_download badge badge-secondary" data-moviePath="'+moviePath+'" data-sceneName="'+sceneName+'" data-subtitle="'+data.subtitle+'" data-provider="'+data.provider+'" data-language="'+data.language+'" data-forced="'+forced+'"><i class="fas fa-download" style="margin-right:0px" ></i></a>';
}