Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arsnova-lite
Manage
Activity
Members
Labels
Plan
Issues
24
Issue boards
Milestones
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Privacy
Imprint
Contact
Snippets
Groups
Projects
Show more breadcrumbs
ARSnova
arsnova-lite
Commits
e0a22380
Commit
e0a22380
authored
5 years ago
by
Lukas Mauß
Browse files
Options
Downloads
Patches
Plain Diff
Fix icons for mobile devices
parent
410b0e20
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!284
Resolve "Header icons should have a label in desktop view"
Pipeline
#28145
passed with stages
Stage:
Stage:
Stage:
Stage:
in 8 minutes and 14 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/components/shared/header/header.component.html
+25
-7
25 additions, 7 deletions
src/app/components/shared/header/header.component.html
with
25 additions
and
7 deletions
src/app/components/shared/header/header.component.html
+
25
−
7
View file @
e0a22380
...
...
@@ -45,25 +45,33 @@
</mat-grid-list>
</mat-menu>
<button
mat-button
[matMenuTriggerFor]=
"themeMenu"
>
<button
mat-button
*ngIf=
"deviceType === 'desktop'"
[matMenuTriggerFor]=
"themeMenu"
>
<div
class=
"label-icon"
>
<mat-icon
aria-label=
"Example"
class=
"header-icons"
>
palette
</mat-icon>
<h3
*ngIf=
"deviceType === 'desktop'"
>
{{'header.style' | translate}}
</h3>
<h3>
{{'header.style' | translate}}
</h3>
</div>
</button>
<button
mat-icon-button
*ngIf=
"deviceType === 'mobile'"
[matMenuTriggerFor]=
"themeMenu"
>
<mat-icon
class=
"header-icons"
>
palette
</mat-icon>
</button>
<mat-menu
#langMenu
="
matMenu
"
[overlapTrigger]=
"false"
>
<button
mat-menu-item
(click)=
"useLanguage('de')"
>
{{ 'header.german' | translate }}
</button>
<button
mat-menu-item
(click)=
"useLanguage('en')"
>
{{ 'header.english' | translate }}
</button>
</mat-menu>
<button
mat-button
[matMenuTriggerFor]=
"langMenu"
>
<button
mat-button
*ngIf=
"deviceType === 'desktop'"
[matMenuTriggerFor]=
"langMenu"
>
<div
class=
"label-icon"
>
<mat-icon
class=
"header-icons"
matTooltip=
"{{'header.change-language' | translate}}"
>
language
</mat-icon>
<h3
*ngIf=
"deviceType === 'desktop'"
>
{{'header.language' | translate}}
</h3>
<h3>
{{'header.language' | translate}}
</h3>
</div>
</button>
<button
mat-icon-button
*ngIf=
"deviceType === 'mobile'"
[matMenuTriggerFor]=
"langMenu"
>
<mat-icon
class=
"header-icons"
>
language
</mat-icon>
</button>
<mat-menu
#userMenu
="
matMenu
"
[overlapTrigger]=
"false"
>
<button
mat-menu-item
*ngIf=
"user && user.role === 1"
routerLink=
"/creator"
>
<mat-icon
class=
"sessions"
>
style
</mat-icon>
...
...
@@ -90,17 +98,27 @@
</button>
</mat-menu>
<button
mat-button
*ngIf=
"user"
[matMenuTriggerFor]=
"userMenu"
>
<button
mat-button
*ngIf=
"user
&& deviceType === 'desktop'
"
[matMenuTriggerFor]=
"userMenu"
>
<div
class=
"label-icon"
>
<mat-icon
class=
"header-icons"
>
account_box
</mat-icon>
<h3
*ngIf=
"deviceType === 'desktop'"
>
{{'header.my-account' | translate}}
</h3>
<h3>
{{'header.my-account' | translate}}
</h3>
</div>
</button>
<button
mat-button
*ngIf=
"!user"
[matMenuTriggerFor]=
"loginMenu"
>
<button
mat-icon-button
*ngIf=
"user && deviceType === 'mobile'"
[matMenuTriggerFor]=
"userMenu"
>
<mat-icon
class=
"header-icons"
>
account_box
</mat-icon>
</button>
<button
mat-button
*ngIf=
"!user && deviceType === 'desktop'"
[matMenuTriggerFor]=
"loginMenu"
>
<div
class=
"label-icon"
>
<mat-icon
class=
"header-icons"
>
account_box
</mat-icon>
<h3
*ngIf=
"deviceType === 'desktop'"
>
{{'header.login' | translate}}
</h3>
</div>
</button>
<button
mat-icon-button
*ngIf=
"!user && deviceType === 'mobile'"
[matMenuTriggerFor]=
"loginMenu"
>
<mat-icon
class=
"header-icons"
>
account_box
</mat-icon>
</button>
</mat-toolbar-row>
</mat-toolbar>
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