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

fixes #940 top menu login/join buttons #945

Merged
merged 1 commit into from
Jan 24, 2017
Merged

fixes #940 top menu login/join buttons #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions app/layout/header/header.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@
button.btn-close-menu(type="button", ng-if="main.menuVisible", ng-click="main.menuVisible = false")

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

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"))
img(ng-if="!vm.profile.photoURL || !vm.profile.photoURL.length", class="user-avatar", ng-src=require("../../../assets/images/ico-user-default.svg"))

a.tc-btn.tc-btn-s.btn-link(ui-sref="register", ng-if="!vm.isAuth") JOIN

a.tc-btn.tc-btn-s.tc-btn-ghost.btn-link(ui-sref="login", ng-if="!vm.isAuth") LOG IN

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

ul.main-menu
li.menu-item.search-wrapper
Expand Down
4 changes: 4 additions & 0 deletions assets/css/layout/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@
right: 10px;
top: 0;
text-decoration: none;

a + a {
margin-left: 12px;
}
}

.btn-link {
Expand Down