diff options
Diffstat (limited to 'client/src/app')
-rw-r--r-- | client/src/app/menu/menu.component.html | 6 | ||||
-rw-r--r-- | client/src/app/menu/menu.component.scss | 14 | ||||
-rw-r--r-- | client/src/app/modal/quick-settings-modal.component.scss | 17 | ||||
-rw-r--r-- | client/src/app/shared/shared-icons/global-icon.component.ts | 1 |
4 files changed, 6 insertions, 32 deletions
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html index ada53d844..a5985a301 100644 --- a/client/src/app/menu/menu.component.html +++ b/client/src/app/menu/menu.component.html | |||
@@ -59,11 +59,13 @@ | |||
59 | <div class="dropdown-divider"></div> | 59 | <div class="dropdown-divider"></div> |
60 | 60 | ||
61 | <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" (click)="openHotkeysCheatSheet()"> | 61 | <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" (click)="openHotkeysCheatSheet()"> |
62 | <i class="icon icon-shortcuts" aria-hidden="true"></i> <ng-container i18n>Keyboard shortcuts</ng-container> | 62 | <my-global-icon iconName="command" aria-hidden="true"></my-global-icon> |
63 | <ng-container i18n>Keyboard shortcuts</ng-container> | ||
63 | </a> | 64 | </a> |
64 | 65 | ||
65 | <a ngbDropdownItem ngbDropdownToggle (click)="logout($event)" class="dropdown-item" href="#"> | 66 | <a ngbDropdownItem ngbDropdownToggle (click)="logout($event)" class="dropdown-item" href="#"> |
66 | <my-global-icon iconName="sign-out" aria-hidden="true"></my-global-icon> <ng-container i18n>Log out</ng-container> | 67 | <my-global-icon iconName="sign-out" aria-hidden="true"></my-global-icon> |
68 | <ng-container i18n>Log out</ng-container> | ||
67 | </a> | 69 | </a> |
68 | </div> | 70 | </div> |
69 | </div> | 71 | </div> |
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index c27f8f8c4..3ca4e47a1 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -352,20 +352,6 @@ menu { | |||
352 | color: #6c757d; | 352 | color: #6c757d; |
353 | } | 353 | } |
354 | 354 | ||
355 | .icon { | ||
356 | @include disable-outline; | ||
357 | @include icon($menu-link-icon-size); | ||
358 | opacity: 0.8; | ||
359 | |||
360 | &.icon-shortcuts { | ||
361 | position: relative; | ||
362 | top: -1px; | ||
363 | margin-right: 10px; | ||
364 | |||
365 | background-image: url('../../assets/images/misc/keyboard.png'); | ||
366 | } | ||
367 | } | ||
368 | |||
369 | input[type=checkbox]{ | 355 | input[type=checkbox]{ |
370 | position: absolute; | 356 | position: absolute; |
371 | visibility: hidden; | 357 | visibility: hidden; |
diff --git a/client/src/app/modal/quick-settings-modal.component.scss b/client/src/app/modal/quick-settings-modal.component.scss index afc8460d0..b0e256744 100644 --- a/client/src/app/modal/quick-settings-modal.component.scss +++ b/client/src/app/modal/quick-settings-modal.component.scss | |||
@@ -19,21 +19,6 @@ | |||
19 | } | 19 | } |
20 | } | 20 | } |
21 | 21 | ||
22 | .icon { | ||
23 | @include disable-outline; | ||
24 | @include icon(22px); | ||
25 | opacity: 0.6; | ||
26 | margin-left: -1px; | ||
27 | |||
28 | &.icon-shortcuts { | ||
29 | position: relative; | ||
30 | top: -1px; | ||
31 | margin-right: 4px; | ||
32 | |||
33 | background-image: url('../../assets/images/misc/keyboard.png'); | ||
34 | } | ||
35 | } | ||
36 | |||
37 | .quick-settings-title { | 22 | .quick-settings-title { |
38 | @include in-content-small-title; | 23 | @include in-content-small-title; |
39 | } \ No newline at end of file | 24 | } |
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts index ab71bc3e7..f3c1fe59b 100644 --- a/client/src/app/shared/shared-icons/global-icon.component.ts +++ b/client/src/app/shared/shared-icons/global-icon.component.ts | |||
@@ -62,6 +62,7 @@ const icons = { | |||
62 | 'sensitive': require('!!raw-loader?!../../../assets/images/feather/eye.svg').default, | 62 | 'sensitive': require('!!raw-loader?!../../../assets/images/feather/eye.svg').default, |
63 | 'unsensitive': require('!!raw-loader?!../../../assets/images/feather/eye-off.svg').default, | 63 | 'unsensitive': require('!!raw-loader?!../../../assets/images/feather/eye-off.svg').default, |
64 | 'refresh': require('!!raw-loader?!../../../assets/images/feather/refresh-cw.svg').default, | 64 | 'refresh': require('!!raw-loader?!../../../assets/images/feather/refresh-cw.svg').default, |
65 | 'command': require('!!raw-loader?!../../../assets/images/feather/command.svg').default, | ||
65 | 'go': require('!!raw-loader?!../../../assets/images/feather/arrow-up-right.svg').default, | 66 | 'go': require('!!raw-loader?!../../../assets/images/feather/arrow-up-right.svg').default, |
66 | 'cross': require('!!raw-loader?!../../../assets/images/feather/x.svg').default, | 67 | 'cross': require('!!raw-loader?!../../../assets/images/feather/x.svg').default, |
67 | 'tick': require('!!raw-loader?!../../../assets/images/feather/check.svg').default, | 68 | 'tick': require('!!raw-loader?!../../../assets/images/feather/check.svg').default, |