Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 90e0f9a

Browse files
authored
Merge pull request #945 from shubhendusaurabh/issue-940
fixes #940 top menu login/join buttons
2 parents 2a130ec + 26ff8ed commit 90e0f9a

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

app/layout/header/header.jade

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111
button.btn-close-menu(type="button", ng-if="main.menuVisible", ng-click="main.menuVisible = false")
1212

1313
// User link (profile or join)
14-
a(ui-sref="profile.about({userHandle: vm.userHandle})", ng-switch="vm.isAuth" class="user-link" data-ng-if="!main.menuVisible")
15-
img(ng-switch-when="true", ng-if="vm.profile.photoURL && vm.profile.photoURL.length", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
14+
div.user-link(data-ng-if="!main.menuVisible")
15+
a(ui-sref="profile.about({userHandle: vm.userHandle})", ng-if="vm.isAuth")
16+
img(ng-if="vm.profile.photoURL && vm.profile.photoURL.length", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
1617

17-
img(ng-switch-when="true", ng-if="!vm.profile.photoURL || !vm.profile.photoURL.length", class="user-avatar", ng-src=require("../../../assets/images/ico-user-default.svg"))
18+
img(ng-if="!vm.profile.photoURL || !vm.profile.photoURL.length", class="user-avatar", ng-src=require("../../../assets/images/ico-user-default.svg"))
19+
20+
a.tc-btn.tc-btn-s.btn-link(ui-sref="register", ng-if="!vm.isAuth") JOIN
21+
22+
a.tc-btn.tc-btn-s.tc-btn-ghost.btn-link(ui-sref="login", ng-if="!vm.isAuth") LOG IN
1823

19-
span(ng-switch-when="false" class="tc-btn tc-btn-s") JOIN
2024

2125
ul.main-menu
2226
li.menu-item.search-wrapper

assets/css/layout/header.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@
8888
right: 10px;
8989
top: 0;
9090
text-decoration: none;
91+
92+
a + a {
93+
margin-left: 12px;
94+
}
9195
}
9296

9397
.btn-link {

0 commit comments

Comments
 (0)