Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 20:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Settings menus:

Browse source 
- remove .disabled, never used
- cleanup/simplify code
This commit is contained in:
djmaze 2021-04-22 16:02:12 +02:00
parent a624d43602
commit 75c879836c
20 changed files with 33 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dev/Screen/AbstractSettings.js
View file

@ -126,8 +126,7 @@ export class AbstractSettingsScreen extends AbstractScreen {
this.menu.push({
route: SettingsViewModel.__rlSettingsData.Route,
label: SettingsViewModel.__rlSettingsData.Label,
selected: ko.observable(false),
disabled: false
selected: ko.observable(false)
});
}
});

39
dev/Styles/Admin.less
View file

@ -26,43 +26,26 @@
.b-admin-menu {
.e-item {
overflow: hidden;
text-decoration: none;
}
.e-link {
position: relative;
a {
color: var(--settings-menu-color, #333);
cursor: pointer;
display: block;
font-size: 18px;
height: 30px;
line-height: 29px;
cursor: pointer;
font-size: 18px;
z-index: 1;
cursor: default;
background-color: transparent;
color: var(--settings-menu-disabled-color, #666);
overflow: hidden;
padding: 4px 10px;
text-decoration: none;
}
.e-item.selectable .e-link {
cursor: pointer;
color: var(--settings-menu-color, #333);
a:focus, a:hover {
background-color: var(--settings-menu-hover-bg-color, #333);
color: var(--settings-menu-hover-color, #eee);
}
.e-item.selectable {
&:hover .e-link{
background-color: var(--settings-menu-hover-bg-color, #333);
color: var(--settings-menu-hover-color, #eee);
}
&.selected .e-link {
background-color: var(--settings-menu-selected-bg-color, #333);
color: var(--settings-menu-selected-color, #eee);
}
a.selected {
background-color: var(--settings-menu-selected-bg-color, #333);
color: var(--settings-menu-selected-color, #eee);
}
}

39
dev/Styles/Settings.less
View file

@ -36,42 +36,27 @@
.b-settings-menu {
.e-item {
overflow: hidden;
text-decoration: none;
}
.e-link {
position: relative;
a {
background-color: transparent;
color: var(--settings-menu-color, #333);
cursor: pointer;
display: block;
font-size: 18px;
height: 30px;
line-height: 29px;
font-size: 18px;
z-index: 1;
cursor: default;
background-color: transparent;
color: var(--settings-menu-disabled-color, #666);
overflow: hidden;
padding: 4px 10px;
text-decoration: none;
}
.e-item.selectable .e-link {
cursor: pointer;
color: var(--settings-menu-color, #333);
a:focus, a:hover {
background-color: var(--settings-menu-hover-bg-color, #333);
color: var(--settings-menu-hover-color, #eee);
}
.e-item.selectable {
&:hover .e-link{
background-color: var(--settings-menu-hover-bg-color, #333);
color: var(--settings-menu-hover-color, #eee);
}
&.selected .e-link {
background-color: var(--settings-menu-selected-bg-color, #333);
color: var(--settings-menu-selected-color, #eee);
}
a.selected {
background-color: var(--settings-menu-selected-bg-color, #333);
color: var(--settings-menu-selected-color, #eee);
}
}

8
dev/View/Admin/Settings/Menu.js
View file

@ -1,6 +1,3 @@
import { Scope } from 'Common/Enums';
import { settingsMenuKeysHandler } from 'Knoin/Knoin';
import { AbstractViewLeft } from 'Knoin/AbstractViews';
class MenuSettingsAdminView extends AbstractViewLeft {
@ -16,11 +13,6 @@ class MenuSettingsAdminView extends AbstractViewLeft {
link(route) {
return '#/' + route;
}
onBuild(dom) {
shortcuts.add('arrowup,arrowdown', '', Scope.Settings,
settingsMenuKeysHandler(dom.querySelectorAll('.b-admin-menu .e-item')));
}
}
export { MenuSettingsAdminView };

7
dev/View/User/Settings/Menu.js
View file

@ -1,9 +1,7 @@
import { Scope } from 'Common/Enums';
import { leftPanelDisabled } from 'Common/Globals';
import { settings, mailbox } from 'Common/Links';
import { getFolderInboxName } from 'Common/Cache';
import { settingsMenuKeysHandler } from 'Knoin/Knoin';
import { AbstractViewLeft } from 'Knoin/AbstractViews';
import { ThemeStore } from 'Stores/Theme';
@ -23,12 +21,9 @@ export class MenuSettingsUserView extends AbstractViewLeft {
onBuild(dom) {
dom.addEventListener('click', event =>
ThemeStore.isMobile()
&& event.target.closestWithin('.b-settings-menu .e-item.selectable', dom)
&& event.target.closest('.b-settings-menu a', dom)
&& leftPanelDisabled(true)
);
shortcuts.add('arrowup,arrowdown', '', Scope.Settings,
settingsMenuKeysHandler(dom.querySelectorAll('.b-settings-menu .e-item')));
}
link(route) {