Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-31 04:59:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace bootstrap .divider with cleaner .dividerbar which also reduces knockout calls

Browse source
This commit is contained in:
djmaze 2020-10-12 15:03:45 +02:00
parent c2a5d0fda5
commit 527694f361
10 changed files with 30 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

30
dev/Common/Utils.js
View file

@ -369,7 +369,7 @@ export function folderListOptionsBuilder(
id: line[0],
name: line[1],
system: false,
seporator: false,
dividerbar: false,
disabled: false
});
});
@ -377,27 +377,17 @@ export function folderListOptionsBuilder(
bSep = true;
aSystem.forEach(oItem => {
if (fVisibleCallback ? fVisibleCallback(oItem) : true) {
if (bSep && aResult.length) {
aResult.push({
id: '---',
name: '---',
system: false,
seporator: true,
disabled: true
});
}
bSep = false;
aResult.push({
id: oItem.fullNameRaw,
name: fRenameCallback ? fRenameCallback(oItem) : oItem.name(),
system: true,
seporator: false,
dividerbar: bSep,
disabled:
!oItem.selectable ||
aDisabled.includes(oItem.fullNameRaw) ||
(fDisableCallback ? fDisableCallback(oItem) : false)
});
bSep = false;
}
});
@ -410,29 +400,19 @@ export function folderListOptionsBuilder(
) {
if (fVisibleCallback ? fVisibleCallback(oItem) : true) {
if (FolderType.User === oItem.type() || !bSystem || oItem.hasSubScribedSubfolders()) {
if (bSep && aResult.length) {
aResult.push({
id: '---',
name: '---',
system: false,
seporator: true,
disabled: true
});
}
bSep = false;
aResult.push({
id: oItem.fullNameRaw,
name:
new Array(oItem.deep + 1 - iUnDeep).join(sDeepPrefix) +
(fRenameCallback ? fRenameCallback(oItem) : oItem.name()),
system: false,
seporator: false,
dividerbar: bSep,
disabled:
!oItem.selectable ||
aDisabled.includes(oItem.fullNameRaw) ||
(fDisableCallback ? fDisableCallback(oItem) : false)
});
bSep = false;
}
}
}

16
dev/Styles/_BootstrapFix.less
View file

@ -133,10 +133,6 @@ select {
font-size: 17px;
}
.dropdown-menu {
border-radius: @btnBorderRadius;
}
.btn-group + .btn-group {
margin-left: 3px;
}
@ -190,8 +186,16 @@ select {
}
.dropdown-menu {
border-radius: 0;
box-shadow: 0 1px 2px rgba(0,0,0,0.2);
border-radius: 0;
box-shadow: 0 1px 2px rgba(0,0,0,0.2);
}
.dropdown-menu * + .dividerbar {
margin-top: 9px;
padding-top: 9px;
border-top: 1px solid #e5e5e5;
/*
border-image: linear-gradient(to right, #00F 10%, #FFF 10%, #FFF 19%, #F00 19%, #F00 28%, #FFF 28%, #FFF 37%, #00F 37%, #00F 46%, #FFF 46%, #FFF 55%, #F00 55%, #F00 64%, #FFF 64%, #FFF 73%, #00F 73%, #00F 82%, #FFF 82%, #FFF 91%, #F00 91%) 1;
*/
}
.btn-group > .btn {