diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars index 0e283fe4f1b..d1306aa8245 100644 --- a/app/assets/javascripts/discourse/templates/header.js.handlebars +++ b/app/assets/javascripts/discourse/templates/header.js.handlebars @@ -37,14 +37,18 @@
{{#if currentUser}} {{currentUser.displayName}} - {{else}} - {{/if}}
{{/unless}} + {{#unless currentUser}} + + {{/unless}} {{render "search"}} diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss index e842726cd08..9947dab4f29 100644 --- a/app/assets/stylesheets/desktop/header.scss +++ b/app/assets/stylesheets/desktop/header.scss @@ -47,9 +47,12 @@ display:block; margin-top: 10px; } - button { - margin-top: 9px; - } + } + button.login-button { + float: left; + margin-top: 7px; + padding: 6px 10px; + .fa { margin-right: 3px; } } .icons { float: left; diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss index f111dfadbc8..c102af15e58 100644 --- a/app/assets/stylesheets/mobile/header.scss +++ b/app/assets/stylesheets/mobile/header.scss @@ -51,14 +51,17 @@ font-size: 14px; line-height: 40px; } - button { - margin-top: 8px; - } + } + button.login-button { + float: left; + margin-top: 7px; + padding: 6px 10px; + .fa { margin-right: 3px; } } .icons { float: left; text-align: center; - margin: 0 0 0 15px; + margin: 0 0 0 5px; list-style: none; > li { float: left;