Merge branch 'dev' of github.com:nixolas1/Zoff into dev

This commit is contained in:
Nicolas A. Tonne
2015-04-16 10:54:23 +02:00
3 changed files with 6 additions and 4 deletions

View File

@@ -5404,7 +5404,7 @@ small {
right: 0;
top: 0;
bottom: 0;
width: 100%;
width: 100%;
height: 18%;
}
.card .card-image .card-title {
@@ -5468,7 +5468,7 @@ small {
#toast-container {
min-width: 8%;
top: 10%;
right: 7%; } }
left: 2%; } }
.toast {
border-radius: 2px;

File diff suppressed because one or more lines are too long

View File

@@ -21,6 +21,8 @@ socket.on("pw", function(msg)
$("input[name="+names[i]+"]").attr("disabled", false);
}
$(".card-action").removeClass("hide");
localStorage.setItem("passord_i_klartekst_lol", msg);
Materialize.toast("Correct Password!", 4000);
});
socket.on(chan.toLowerCase()+",conf", function(msg)