diff --git a/ProjectSourceCode/src/resources/css/navigation-bar/registration.css b/ProjectSourceCode/src/resources/css/navigation-bar/registration.css index a2b9b50..3ff1fff 100644 --- a/ProjectSourceCode/src/resources/css/navigation-bar/registration.css +++ b/ProjectSourceCode/src/resources/css/navigation-bar/registration.css @@ -18,5 +18,14 @@ background: linear-gradient(to bottom, white, rgb(245, 245, 245), rgb(227, 227, 227)); box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.5); border: 1px solid gray; - border-radius: 8px; +} + +#register-page button { + padding: 5px 10px; + background-color: red; + border-color: red; + + border: 1px solid red; + border-radius: 8px; + color: white; } diff --git a/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js b/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js index d156f06..a1ed99f 100644 --- a/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js +++ b/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js @@ -2,6 +2,8 @@ $(document).ready(function() { // When #user is clicked $('#user').click(function() { + + $('#register-container').hide(); // Toggle the visibility of the login container $('#login-container').toggle(); }); diff --git a/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs b/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs index 78b3547..4234361 100644 --- a/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs +++ b/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs @@ -66,15 +66,15 @@ {{#if user.username}} -
+
{{> navigation-bar/accountinfo}}
{{else}} -
+ {{/if}} -
+ \ No newline at end of file