diff options
| author | Robert Zorko <robertz@gurucue.com> | 2015-09-29 15:34:39 +0200 |
|---|---|---|
| committer | Robert Zorko <robertz@gurucue.com> | 2015-09-29 15:34:39 +0200 |
| commit | ba7f477d4dcc155132d69d8faefc33523a0089fd (patch) | |
| tree | b4731ab16b54f551b45f7fa5697c3fb349240db1 /js/codeq/login.js | |
| parent | a565a09172071783174450cea5a425964f3b6aa6 (diff) | |
| parent | b2983855ea01fd04a8ba53099d2d5ee7ebed31f9 (diff) | |
resolved merge conflicts
Diffstat (limited to 'js/codeq/login.js')
| -rw-r--r-- | js/codeq/login.js | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/js/codeq/login.js b/js/codeq/login.js index 02a6517..e3204d3 100644 --- a/js/codeq/login.js +++ b/js/codeq/login.js @@ -37,9 +37,7 @@ codeq.globalStateMachine.register('login',{ 'enter': function(){ $("#submit").on('click', loginFun); - - $("#navigation-login").addClass("active"); - $('#navigation-login').css('display', ''); + //$('#modalLogin').modal(); $("#screen_login").css('display', ''); $('#disabled').css('display', 'none'); @@ -48,9 +46,6 @@ $("#submit").off('click', loginFun); $("#screen_login").css('display', 'none'); $("#password").val(''); - - $('#navigation-login').css('display', 'none'); - $("#navigation-login").removeClass("active"); } }); })();
\ No newline at end of file |