KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with toasts comming in the background

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-05 15:58:04 +02:00
parent 7714729093
commit aa1ca995f0
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/public/assets/css/style.css
View File

@@ -440,6 +440,10 @@ footer{
z-index: 999999 !important; z-index: 999999 !important;
} }
#toast-container {
z-index: 999999 !important;
}
#user_password { #user_password {
width: 50% !important; width: 50% !important;
} }

2
server/public/assets/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
server/public/assets/js/admin.js
View File

@@ -119,7 +119,7 @@ var Admin = {
}); });
} }
$("#password").val(""); $("#password").val("");
$("#password").attr("placeholder", "Change channel password"); $("#password").attr("placeholder", "Change admin password");
$(".user-password-li").removeClass("hide"); $(".user-password-li").removeClass("hide");
if($(".password_protected").prop("checked")) { if($(".password_protected").prop("checked")) {
$(".change_user_pass").removeClass("hide"); $(".change_user_pass").removeClass("hide");
@@ -235,7 +235,7 @@ var Admin = {
$('ul.playlist-tabs').tabs('select_tab', $(".playlist-tabs-loggedIn li a.active").attr("href").substring(1)); $('ul.playlist-tabs').tabs('select_tab', $(".playlist-tabs-loggedIn li a.active").attr("href").substring(1));
} }
$("#admin-lock").removeClass("clickable"); $("#admin-lock").removeClass("clickable");
$("#password").attr("placeholder", "Enter channel password"); $("#password").attr("placeholder", "Enter admin password");
//$("#top-button").removeClass("top-button-with-tabs"); //$("#top-button").removeClass("top-button-with-tabs");
}, },
@@ -274,7 +274,7 @@ var Admin = {
$(".playlist-tabs-loggedIn").removeClass("hide"); $(".playlist-tabs-loggedIn").removeClass("hide");
$(".playlist-tabs").addClass("hide"); $(".playlist-tabs").addClass("hide");
} }
$("#password").attr("placeholder", "Create channel password"); $("#password").attr("placeholder", "Create admin password");
} else { } else {
if($(".password_protected").prop("checked")) { if($(".password_protected").prop("checked")) {
$(".change_user_pass").removeClass("hide"); $(".change_user_pass").removeClass("hide");

4
server/public/assets/js/listeners.js
View File

@@ -172,7 +172,7 @@ function init(){
$('ul.playlist-tabs-loggedIn').tabs(); $('ul.playlist-tabs-loggedIn').tabs();
$('ul.chatTabs').tabs(); $('ul.chatTabs').tabs();
$("#settings").sideNav({ $("#settings").sideNav({
menuWidth: 300, // Default is 240 menuWidth: 310, // Default is 240
edge: side, // Choose the horizontal origin edge: side, // Choose the horizontal origin
closeOnClick: false // Closes side-nav on <a> clicks, useful for Angular/Meteor closeOnClick: false // Closes side-nav on <a> clicks, useful for Angular/Meteor
}); });
@@ -1137,7 +1137,7 @@ $(document).off("keyup", "keyup.autocomplete", function(e){
$(document).off("keydown", "keydown.autocomplete", function(e){ $(document).off("keydown", "keydown.autocomplete", function(e){
if(e.keyCode == 13){ if(e.keyCode == 13){
e.preventDefault(); e.preventDefault();
} }
});*/ });*/

4
server/public/partials/panel.handlebars
View File

@@ -14,7 +14,7 @@
<li class="white-bg"> <li class="white-bg">
<div class="input-field field-settings"> <div class="input-field field-settings">
<i id="admin-lock" class="material-icons">lock</i> <i id="admin-lock" class="material-icons">lock</i>
<input placeholder="Enter channel password" id="password" type="password" class="validate" /> <input placeholder="Enter admin password" id="password" type="password" class="validate" />
</div> </div>
</li> </li>
<li> <li>
@@ -93,7 +93,7 @@
</label></div></li> </label></div></li>
<li class="user-password-li hide"><span class="switch-text"> <li class="user-password-li hide"><span class="switch-text">
User password Channel password
</span> </span>
<div class="switch"><label> <div class="switch"><label>
<span class="left-span">No</span> <span class="left-span">No</span>