This is the codeAbility Sharing Platform! Learn more about the
codeAbility Sharing Platform
.
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
codeAbility Sharing Platform
Manage
Activity
Members
Labels
Plan
Issues
43
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
development
sharing
codeAbility Sharing Platform
Commits
e3c198ac
There was an error fetching the commit references. Please try again later.
Commit
e3c198ac
authored
2 years ago
by
Eduard Frankford
Browse files
Options
Downloads
Patches
Plain Diff
made logout dropdown look better
parent
041aba80
2 merge requests
!117
Preparing April Release
,
!104
made logout dropdown look better
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/webapp/app/layouts/navbar/navbar.component.html
+63
-59
63 additions, 59 deletions
src/main/webapp/app/layouts/navbar/navbar.component.html
src/main/webapp/content/scss/navbar.scss
+1
-1
1 addition, 1 deletion
src/main/webapp/content/scss/navbar.scss
with
64 additions
and
60 deletions
src/main/webapp/app/layouts/navbar/navbar.component.html
+
63
−
59
View file @
e3c198ac
...
...
@@ -259,17 +259,23 @@
<ul
class=
"dropdown-menu search-container"
ngbDropdownMenu
aria-labelledby=
"account-menu"
>
<ng-container
*ngSwitchCase=
"false"
>
<li
*ngFor=
"let config of configs"
>
<img
src=
"{{ 'oauth2.' + config.registrationId + '.icon' | translate }}"
alt=
"oAuth2Login"
style=
"width: 50px"
/>
<button
[disabled]=
"!contentEditable"
type=
"submit"
class=
"btn btn-outline-secondary"
*ngSwitchCase=
"false"
(click)=
"loginWithGitLab(config.registrationId)"
jhiTranslate=
"oauth2.{{ config.registrationId }}.text"
>
Sign in with GitLab Account
</button>
<div
class=
"row"
>
<div
class=
"col-4"
>
<img
src=
"{{ 'oauth2.' + config.registrationId + '.icon' | translate }}"
alt=
"oAuth2Login"
style=
"max-width: 50px"
/>
</div>
<div
class=
"col-8"
>
<button
[disabled]=
"!contentEditable"
type=
"submit"
class=
"btn btn-outline-secondary"
*ngSwitchCase=
"false"
(click)=
"loginWithGitLab(config.registrationId)"
jhiTranslate=
"oauth2.{{ config.registrationId }}.text"
>
Sign in with GitLab Account
</button>
</div>
</div>
</li>
<li
class=
"dropdown-divider"
></li>
</ng-container>
...
...
@@ -330,54 +336,52 @@
</form>
</li>
<li
*ngSwitchCase=
"true"
>
<a
class=
"dropdown-item"
routerLink=
"account/settings"
routerLinkActive=
"active"
*ngSwitchCase=
"true"
(click)=
"collapseNavbar()"
>
<fa-icon
icon=
"wrench"
[fixedWidth]=
"true"
></fa-icon>
<span
jhiTranslate=
"global.menu.account.settings"
>
Settings
</span>
</a>
<span
class=
"spawn-submenu"
jhiTranslate=
"global.menu.account.settingsDescription"
*ngSwitchCase=
"true"
>
Manage your user settings
</span
>
</li>
<li
*ngSwitchCase=
"true"
>
<a
class=
"dropdown-item"
routerLink=
"account/password"
routerLinkActive=
"active"
*ngSwitchCase=
"true"
(click)=
"collapseNavbar()"
>
<fa-icon
icon=
"lock"
[fixedWidth]=
"true"
></fa-icon>
<span
jhiTranslate=
"global.menu.account.password"
>
Password
</span>
</a>
<span
class=
"spawn-submenu"
jhiTranslate=
"global.menu.account.passwordDescription"
*ngSwitchCase=
"true"
>
Change password
</span>
</li>
<li
*ngSwitchCase=
"true"
>
<a
class=
"dropdown-item"
routerLink=
"account/achievements"
routerLinkActive=
"active"
*ngSwitchCase=
"true"
(click)=
"collapseNavbar()"
>
<fa-icon
icon=
"award"
[fixedWidth]=
"true"
></fa-icon>
<span
jhiTranslate=
"global.menu.account.achievements"
>
Achievements
</span>
</a>
<span
class=
"spawn-submenu"
jhiTranslate=
"global.menu.account.achievementsDescription"
*ngSwitchCase=
"true"
>
Look at your achievements
</span
>
</li>
<li
*ngSwitchCase=
"true"
>
<a
class=
"dropdown-item"
(click)=
"logout()"
id=
"logout"
>
<fa-icon
icon=
"sign-out-alt"
[fixedWidth]=
"true"
></fa-icon>
<span
jhiTranslate=
"global.menu.account.logout"
>
Sign out
</span>
</a>
<span
class=
"spawn-submenu"
jhiTranslate=
"global.menu.account.logoutDescription"
*ngSwitchCase=
"true"
>
Quit session
</span>
<div
class=
"row"
>
<div
class=
"col-12"
>
<a
style=
"color: #212529"
routerLink=
"account/settings"
routerLinkActive=
"active"
*ngSwitchCase=
"true"
(click)=
"collapseNavbar()"
>
<fa-icon
icon=
"wrench"
[fixedWidth]=
"true"
></fa-icon>
<span
jhiTranslate=
"global.menu.account.settings"
>
Settings
</span>
</a>
</div>
<div
class=
"col-12"
>
<a
style=
"color: #212529"
routerLink=
"account/password"
routerLinkActive=
"active"
*ngSwitchCase=
"true"
(click)=
"collapseNavbar()"
>
<fa-icon
icon=
"lock"
[fixedWidth]=
"true"
></fa-icon>
<span
jhiTranslate=
"global.menu.account.passwordDescription"
>
Change password
</span>
</a>
</div>
<div
class=
"col-12"
>
<a
routerLink=
"account/achievements"
routerLinkActive=
"active"
*ngSwitchCase=
"true"
style=
"color: #212529"
(click)=
"collapseNavbar()"
>
<fa-icon
icon=
"award"
[fixedWidth]=
"true"
></fa-icon>
<span
jhiTranslate=
"global.menu.account.achievements"
>
Achievements
</span>
</a>
</div>
<div
class=
"col-12"
>
<a
(click)=
"logout()"
id=
"logout"
>
<fa-icon
icon=
"sign-out-alt"
[fixedWidth]=
"true"
></fa-icon>
<span
jhiTranslate=
"global.menu.account.logout"
>
Sign out
</span>
</a>
</div>
</div>
</li>
</ul>
</li>
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/content/scss/navbar.scss
+
1
−
1
View file @
e3c198ac
...
...
@@ -46,7 +46,7 @@ svg {
z-index
:
1000
;
display
:
none
;
float
:
left
;
min-width
:
1
0
rem
;
min-width
:
1
5
rem
;
width
:
auto
;
padding
:
0
.5rem
0
;
margin
:
0
.125rem
0
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment