LoweBowe
/
Theme-Snow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed conflict

This commit is contained in:
zeldaroot 2021-03-30 01:27:27 +03:00
parent 0ca4014e5c
commit a5f7739e4c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
views/category.ejs
View File

@ -265,7 +265,7 @@
var url = '/' + page_urls_search + '?' + page_urls_year + '=' + year;
var hash = '#year=' + year;
document.querySelectorAll('[data-url]').forEach(function(e) {
var v = encodeURIComponent(e.value || e.options[e.selectedIndex].value);
var v = encodeURIComponent( e.value || (typeof e.selectedIndex !== 'undefined' && typeof e.options !== 'undefined' && typeof e.options[e.selectedIndex] !== 'undefined' && e.options[e.selectedIndex].value) || '');
if (v) {
hash += '|' + e.dataset.url_name + '=' + v;
url += '&' + e.dataset.url + '=' + v;
@ -352,7 +352,7 @@
setHashData();
</script>
<style>
.custom-select{position:relative;background:0 0;border:1px #72436f solid;border-radius:8px;color:#e79899}.custom-select select{display:none}.select-selected{background:0 0}.select-selected:after{position:absolute;content:"";top:18px;right:10px;width:0;height:0;border:6px solid transparent;border-color:#f07d7f transparent transparent transparent}.select-selected.select-arrow-active:after{border-color:transparent transparent #964c8c transparent;top:10px}.select-items div,.select-selected{color:#e79899;padding:8px 16px;border:1px solid transparent;cursor:pointer;user-select:none}.select-items{position:absolute;background:0 0;color:#e79899;top:100%;left:0;right:0;z-index:99}.select-hide{display:none}.select-items{border:1px #563550 solid;border-radius:8px;background-color:rgba(0,0,0,.7);max-height:300px;overflow-y:auto}.select-items div{color:#fff;font-size:12px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.same-as-selected,.select-items div:hover{border-radius:8px;background-color:rgba(88,54,80,0.6);margin:0 5px;}.select-selected{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.filter-slider{margin:60px auto;padding:10px 25px 10px 10px}.noUi-connect{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0}.noUi-horizontal .noUi-handle,.noUi-vertical .noUi-handle{background-image:-webkit-gradient(linear,left top,right top,from(#944b8c),to(#f37f7f));background-image:-o-linear-gradient(left,#944b8c,#f37f7f);background-image:linear-gradient(to right,#944b8c,#f37f7f)}.noUi-value{color:#72436f!important}.noUi-marker{color:#302f3f!important;background:#302f3f!important}.noUi-horizontal{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0;color:#fff}.noUi-target.noUi-horizontal{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0;color:#fff}.noUi-tooltip{background-image:-webkit-gradient(linear,left top,right top,from(#944b8c),to(#f37f7f));background-image:-o-linear-gradient(left,#944b8c,#f37f7f);background-image:linear-gradient(to right,#944b8c,#f37f7f);border:0;color:#fff}.noUi-horizontal{height:10px!important;border:0!important;background:#302f3f!important;box-shadow:none!important}.noUi-handle{box-shadow:none!important;border-radius:100%!important;border:0!important;width:20px!important;height:20px!important}.noUi-handle::after,.noUi-handle::before{background:0 0!important}
.custom-select{position:relative;background:0 0;border:1px #72436f solid;border-radius:8px;color:#e79899}.custom-select select{display:none}.select-selected{background:0 0}.select-selected:after{position:absolute;content:"";top:18px;right:10px;width:0;height:0;border:6px solid transparent;border-color:#f07d7f transparent transparent transparent}.select-selected.select-arrow-active:after{border-color:transparent transparent #964c8c transparent;top:10px}.select-items div,.select-selected{color:#e79899;padding:8px 16px;border:1px solid transparent;cursor:pointer;user-select:none}.select-items{position:absolute;background:0 0;color:#e79899;top:100%;left:0;right:0;z-index:99}.select-hide{display:none}.select-items{border:1px #563550 solid;border-radius:8px;background-color:rgba(0,0,0,.7);max-height:300px;overflow-y:auto}.select-items div{color:#fff;font-size:12px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.same-as-selected,.select-items div:hover{border-radius:8px;background-color:rgba(0,0,0,0.4)}.select-selected{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.filter-slider{margin:60px auto;padding:10px 25px 10px 10px}.noUi-connect{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0}.noUi-horizontal .noUi-handle,.noUi-vertical .noUi-handle{background-image:-webkit-gradient(linear,left top,right top,from(#944b8c),to(#f37f7f));background-image:-o-linear-gradient(left,#944b8c,#f37f7f);background-image:linear-gradient(to right,#944b8c,#f37f7f)}.noUi-value{color:#72436f!important}.noUi-marker{color:#302f3f!important;background:#302f3f!important}.noUi-horizontal{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0;color:#fff}.noUi-target.noUi-horizontal{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0;color:#fff}.noUi-tooltip{background-image:-webkit-gradient(linear,left top,right top,from(#944b8c),to(#f37f7f));background-image:-o-linear-gradient(left,#944b8c,#f37f7f);background-image:linear-gradient(to right,#944b8c,#f37f7f);border:0;color:#fff}.noUi-horizontal{height:10px!important;border:0!important;background:#302f3f!important;box-shadow:none!important}.noUi-handle{box-shadow:none!important;border-radius:100%!important;border:0!important;width:20px!important;height:20px!important}.noUi-handle::after,.noUi-handle::before{background:0 0!important}
</style>
</div>
<% } %>

4
views/index.ejs
View File

@ -308,7 +308,7 @@
var url = '/' + page_urls_search + '?' + page_urls_year + '=' + year;
var hash = '#year=' + year;
document.querySelectorAll('[data-url]').forEach(function(e) {
var v = encodeURIComponent(e.value || e.options[e.selectedIndex].value);
var v = encodeURIComponent( e.value || (typeof e.selectedIndex !== 'undefined' && typeof e.options !== 'undefined' && typeof e.options[e.selectedIndex] !== 'undefined' && e.options[e.selectedIndex].value) || '');
if (v) {
hash += '|' + e.dataset.url_name + '=' + v;
url += '&' + e.dataset.url + '=' + v;
@ -381,7 +381,7 @@
setHashData();
</script>
<style>
.custom-select{position:relative;background:0 0;border:1px #72436f solid;border-radius:8px;color:#e79899}.custom-select select{display:none}.select-selected{background:0 0}.select-selected:after{position:absolute;content:"";top:18px;right:10px;width:0;height:0;border:6px solid transparent;border-color:#f07d7f transparent transparent transparent}.select-selected.select-arrow-active:after{border-color:transparent transparent #964c8c transparent;top:10px}.select-items div,.select-selected{color:#e79899;padding:8px 16px;border:1px solid transparent;cursor:pointer;user-select:none}.select-items{position:absolute;background:0 0;color:#e79899;top:100%;left:0;right:0;z-index:99}.select-hide{display:none}.select-items{border:1px #563550 solid;border-radius:8px;background-color:rgba(0,0,0,.7);max-height:300px;overflow-y:auto}.select-items div{color:#fff;font-size:12px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.same-as-selected,.select-items div:hover{border-radius:8px;background-color:rgba(0,0,0,.3)}.select-selected{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.filter-slider{margin:60px auto;padding:10px 25px 10px 10px}.noUi-connect{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0}.noUi-horizontal .noUi-handle,.noUi-vertical .noUi-handle{background-image:-webkit-gradient(linear,left top,right top,from(#944b8c),to(#f37f7f));background-image:-o-linear-gradient(left,#944b8c,#f37f7f);background-image:linear-gradient(to right,#944b8c,#f37f7f)}.noUi-value{color:#72436f!important}.noUi-marker{color:#302f3f!important;background:#302f3f!important}.noUi-horizontal{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0;color:#fff}.noUi-target.noUi-horizontal{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0;color:#fff}.noUi-tooltip{background-image:-webkit-gradient(linear,left top,right top,from(#944b8c),to(#f37f7f));background-image:-o-linear-gradient(left,#944b8c,#f37f7f);background-image:linear-gradient(to right,#944b8c,#f37f7f);border:0;color:#fff}.noUi-horizontal{height:10px!important;border:0!important;background:#302f3f!important;box-shadow:none!important}.noUi-handle{box-shadow:none!important;border-radius:100%!important;border:0!important;width:20px!important;height:20px!important}.noUi-handle::after,.noUi-handle::before{background:0 0!important}
.custom-select{position:relative;background:0 0;border:1px #72436f solid;border-radius:8px;color:#e79899}.custom-select select{display:none}.select-selected{background:0 0}.select-selected:after{position:absolute;content:"";top:18px;right:10px;width:0;height:0;border:6px solid transparent;border-color:#f07d7f transparent transparent transparent}.select-selected.select-arrow-active:after{border-color:transparent transparent #964c8c transparent;top:10px}.select-items div,.select-selected{color:#e79899;padding:8px 16px;border:1px solid transparent;cursor:pointer;user-select:none}.select-items{position:absolute;background:0 0;color:#e79899;top:100%;left:0;right:0;z-index:99}.select-hide{display:none}.select-items{border:1px #563550 solid;border-radius:8px;background-color:rgba(0,0,0,.7);max-height:300px;overflow-y:auto}.select-items div{color:#fff;font-size:12px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.same-as-selected,.select-items div:hover{border-radius:8px;background-color:rgba(0,0,0,.4)}.select-selected{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.filter-slider{margin:60px auto;padding:10px 25px 10px 10px}.noUi-connect{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0}.noUi-horizontal .noUi-handle,.noUi-vertical .noUi-handle{background-image:-webkit-gradient(linear,left top,right top,from(#944b8c),to(#f37f7f));background-image:-o-linear-gradient(left,#944b8c,#f37f7f);background-image:linear-gradient(to right,#944b8c,#f37f7f)}.noUi-value{color:#72436f!important}.noUi-marker{color:#302f3f!important;background:#302f3f!important}.noUi-horizontal{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0;color:#fff}.noUi-target.noUi-horizontal{background-image:-webkit-gradient(linear,left top,right top,from(#f37f7f),to(#944b8c));background-image:-o-linear-gradient(left,#f37f7f,#944b8c);background-image:linear-gradient(to right,#f37f7f,#944b8c);border:0;color:#fff}.noUi-tooltip{background-image:-webkit-gradient(linear,left top,right top,from(#944b8c),to(#f37f7f));background-image:-o-linear-gradient(left,#944b8c,#f37f7f);background-image:linear-gradient(to right,#944b8c,#f37f7f);border:0;color:#fff}.noUi-horizontal{height:10px!important;border:0!important;background:#302f3f!important;box-shadow:none!important}.noUi-handle{box-shadow:none!important;border-radius:100%!important;border:0!important;width:20px!important;height:20px!important}.noUi-handle::after,.noUi-handle::before{background:0 0!important}
</style>
</div>
<div class="last-episodes-day">