From 9543e6af7ef2b40008b133eb55ada2d9a660f430 Mon Sep 17 00:00:00 2001 From: PhilW Date: Sun, 24 Feb 2019 16:30:41 +0000 Subject: [PATCH] remove some duplicate code in toolbar.less --- skins/elastic/styles/widgets/toolbar.less | 467 ++++++++++------------ 1 file changed, 202 insertions(+), 265 deletions(-) diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less index 798d12695..99c5b3ab1 100644 --- a/skins/elastic/styles/widgets/toolbar.less +++ b/skins/elastic/styles/widgets/toolbar.less @@ -51,155 +51,6 @@ margin: 0; line-height: 1.75; } - - &.reply:before { - content: @fa-var-reply; - } - &.reply-all:before { - content: @fa-var-reply-all; - } - &.forward:before { - content: @fa-var-share; - } - &.delete:before { - content: @fa-var-trash-alt; - } - &.markmessage:before { - content: @fa-var-tag; - } - &.more:before { - content: @fa-var-ellipsis-h; - } - &.dropdown:before { - content: @fa-var-caret-down; - } - &.settings:before { - content: @fa-var-sliders-h; - } - &.create:before { - content: @fa-var-plus-square; - } - &.move:before { - content: @fa-var-arrows-alt; - } - &.purge:before { - content: @fa-var-eraser; - } - &.print:before { - content: @fa-var-print; - } - &.search:before { - content: @fa-var-search; - } - &.upload:before, - &.import:before { - content: @fa-var-upload; - } - &.download:before, - &.export:before { - content: @fa-var-download; - } - &.compose:before { - content: @fa-var-edit; - } - &.archive:before { - content: @fa-var-archive; - } - &.junk:before { - content: @fa-var-fire-alt; - } - &.notjunk:before { - content: @fa-var-inbox; - } - &.enigma:before, - &.encrypt:before { - content: @fa-var-lock; - } - &.prev:before { - content: @fa-var-arrow-left; - } - &.next:before { - content: @fa-var-arrow-right; - } - &.firstpage:before { - content: @fa-var-angle-double-left; - } - &.prevpage:before { - content: @fa-var-angle-left; - } - &.nextpage:before { - content: @fa-var-angle-right; - } - &.lastpage:before { - content: @fa-var-angle-double-right; - } - &.send:before { - content: @fa-var-paper-plane; - } - &.back:before { - content: @fa-var-arrow-left; - } - &.closewin:before { - content: @fa-var-window-close; - } - &.save:before { - .font-icon-regular(@fa-var-save); - } - &.vcard:before, - &.attach:before { - content: @fa-var-paperclip; - } - &.spellcheck:before { - content: @fa-var-magic; // TODO - } - &.signature:before { - content: @fa-var-signature; - } - &.responses:before { - content: @fa-var-comment; - } - &.select:before { - .font-icon-regular(@fa-var-check-circle); - } - &.threads:before { - content: @fa-var-comments; - } - &.actions:before { - content: @fa-var-cog; - } - &.refresh:before { - content: @fa-var-sync; - } - &.addressbook:before { - content: @fa-var-user; - } - &.expand:before { - content: @fa-var-angle-right; - } - &.collapse:before { - content: @fa-var-angle-down; - } - &.submit:before { - content: @fa-var-check; - } - &.edit:before { - content: @fa-var-pencil-alt; - } - &.qrcode:before { - content: @fa-var-qrcode; - } - &.properties:before { - content: @fa-var-file; - } - &.zoomin:before { - content: @fa-var-search-plus; - } - &.zoomout:before { - content: @fa-var-search-minus; - } - &.rotate:before { - content: @fa-var-redo-alt; - } } &:not(.popupmenu) span.inner { @@ -442,183 +293,269 @@ a:before { &:extend(.font-icon-class); } +} - a.check:before { +.toolbarmenu.listing li { + &:hover { + a.active { + color: @color-toolbarmenu-hover; + background-color: @color-toolbarmenu-hover-background; + } + } +} + +.toolbar li a, +.toolbarmenu li a { + &.actions:before { + content: @fa-var-cog; + } + &.addressbook:before { + content: @fa-var-user; + } + &.archive:before { + content: @fa-var-archive; + } + &.assigngroup:before { + content: @fa-var-user-plus; + } + &.attach:before, + &.vcard:before { + content: @fa-var-paperclip; + } + &.back:before { + content: @fa-var-arrow-left; + } + &.check:before { content: ""; } - a.check.selected:before { + &.check.selected:before { content: @fa-var-check; } - a.print:before { - content: @fa-var-print; + &.closewin:before { + content: @fa-var-window-close; } - a.copy:before { - content: @fa-var-copy; + &.collapse:before { + content: @fa-var-angle-down; } - a.move:before { - content: @fa-var-arrows-alt; + &.compose:before { + content: @fa-var-edit; } - a.purge:before { - content: @fa-var-eraser; + &.copy:before { + content: @fa-var-copy; } - a.source:before { - content: @fa-var-file-code; + &.create:before { + content: @fa-var-plus-square; } - a.download:before { - content: @fa-var-download; + &.delete:before { + content: @fa-var-trash-alt; } - a.extwin:before { - content: @fa-var-external-link-square-alt; + &.download:before, + &.download.eml:before, + &.download.maildir:before, + &.download.mbox:before { + content: @fa-var-download; } - a.create:before { - content: @fa-var-plus-square; + &.dropdown:before { + content: @fa-var-caret-down; } - a.edit:before { + &.edit:before { content: @fa-var-edit; } - a.edit.asnew:before { + &.edit.asnew:before { content: @fa-var-pencil-alt; } - a.rename:before { - content: @fa-var-pencil-alt; + &.encrypt:before, + &.enigma:before { + content: @fa-var-lock; } - a.read:before { - .font-icon-regular(@fa-var-circle); + &.encrypt.sign:before { + content: @fa-var-lock; // TODO } - a.unread:before { - content: @fa-var-circle; + &.expand:before { + content: @fa-var-angle-right; } - a.flag:before { - content: @fa-var-flag; + &.expand.all:before, + &.expand.none:before, + &.expand.unread:before { + content: @fa-var-comments; } - a.unflag:before { - .font-icon-regular(@fa-var-flag); + &.export:before, + &.export.all:before, + &.export.selection:before { + content: @fa-var-download; } - a.filterlink:before { + &.expunge:before { + content: @fa-var-compress-arrows-alt; + } + &.extwin:before { + content: @fa-var-external-link-square-alt; + } + &.filterlink:before { content: @fa-var-filter; } - a.reply.list:before, - a.reply.all:before { - content: @fa-var-reply-all; + &.firstpage:before { + content: @fa-var-angle-double-left; + } + &.nextpage:before { + content: @fa-var-angle-right; } - a.forward:before, - a.forward.bounce:before, - a.forward.attachment:before, - a.forward.inline:before { + &.prevpage:before { + content: @fa-var-angle-left; + } + &.lastpage:before { + content: @fa-var-angle-double-right; + } + &.flag:before, + &.select.flagged:before { + .font-icon-solid(@fa-var-flag); + } + &.unflag:before { + .font-icon-regular(@fa-var-flag); + } + &.folders:before { + content: @fa-var-folder; + } + &.forward:before, + &.forward.attachment:before, + &.forward.bounce:before, + &.forward.inline:before { content: @fa-var-share; } - a.download.mbox:before, - a.download.eml:before, - a.download.maildir:before { - content: @fa-var-download; + &.import:before, + &.upload:before { + content: @fa-var-upload; } - a.export.selection:before, - a.export.all:before { - content: @fa-var-download; + &.insertresponse:before { + content: @fa-var-comment; } - a.select:before { - content: @fa-var-check-circle; + &.junk:before { + content: @fa-var-fire-alt; } - a.threads:before { - content: @fa-var-comments; + &.notjunk:before { + content: @fa-var-inbox; } - a.selection:before { - content: @fa-var-mouse-pointer; + &.markmessage:before { + content: @fa-var-tag; } - a.select.all:before { - .font-icon-regular(@fa-var-check-square); + &.more:before { + content: @fa-var-ellipsis-h; } - a.select.none:before { - content: @fa-var-times; + &.move:before { + content: @fa-var-arrows-alt; } - a.select.page:before { - content: @fa-var-bars; + &.next:before { + content: @fa-var-angle-right; } - a.select.flagged:before { - content: @fa-var-flag; + &.prev:before { + content: @fa-var-angle-left; } - a.select.unread:before { - content: @fa-var-circle; + &.print:before { + content: @fa-var-print; } - a.select.invert:before { - .font-icon-regular(@fa-var-square); + &.properties:before { + content: @fa-var-file; } - a.expand.all:before, - a.expand.unread:before, - a.expand.none:before { - content: @fa-var-comments; + &.purge:before { + content: @fa-var-eraser; } - a.search:before { - content: @fa-var-search; + &.qrcode:before { + content: @fa-var-qrcode; } - a.delete:before { - content: @fa-var-trash-alt; + &.read:before { + .font-icon-regular(@fa-var-circle); } - a.expunge:before { - content: @fa-var-compress-arrows-alt; + &.unread:before, + &.select.unread:before { + .font-icon-solid(@fa-var-circle); } - a.import:before { - content: @fa-var-upload; + &.recipient:before { + .font-icon-regular(@fa-var-envelope); } - a.settings:before { - content: @fa-var-sliders-h; + &.refresh:before { + content: @fa-var-sync; + } + &.remove:before { + content: @fa-var-eraser; + } + &.removegroup:before { + content: @fa-var-user-times; } - a.insertresponse:before { + &.rename:before { + content: @fa-var-pencil-alt; + } + &.reply:before { + content: @fa-var-reply; + } + &.reply-all:before, + &.reply.all:before, + &.reply.list:before { + content: @fa-var-reply-all; + } + &.responses:before { content: @fa-var-comment; } - a.compose:before { - content: @fa-var-edit; + &.rotate:before { + content: @fa-var-redo-alt; } - a.addressbook:before { - content: @fa-var-user; + &.save:before { + .font-icon-regular(@fa-var-save); } - a.recipient:before { - .font-icon-regular(@fa-var-envelope); + &.search:before { + content: @fa-var-search; } - a.status:before { - .font-icon-regular(@fa-var-lightbulb); + &.search.delete:before { + content: @fa-var-trash-alt; } - a.folders:before { - content: @fa-var-folder; + &.select:before { + .font-icon-regular(@fa-var-check-circle); } - a.remove:before { - content: @fa-var-eraser; + &.select.all:before { + content: @fa-var-check-square; } - a.showurl:before { - content: @fa-var-link; + &.select.invert:before { + content: @fa-var-square; } - a.qrcode:before { - content: @fa-var-qrcode; + &.select.none:before { + .font-icon-solid(@fa-var-times); } - a.assigngroup:before { - content: @fa-var-user-plus; + &.select.page:before { + .font-icon-solid(@fa-var-bars); } - a.removegroup:before { - content: @fa-var-user-times; + &.selection:before { + content: @fa-var-mouse-pointer; } - a.vcard:before { - content: @fa-var-paperclip; + &.send:before { + content: @fa-var-paper-plane; } - a.encrypt:before { - content: @fa-var-lock; + &.settings:before { + content: @fa-var-sliders-h; } - a.encrypt.sign:before { - content: @fa-var-lock; // TODO + &.showurl:before { + content: @fa-var-link; } - a.junk:before { - content: @fa-var-fire-alt; + &.signature:before { + content: @fa-var-signature; } - a.notjunk:before { - content: @fa-var-inbox; + &.source:before { + content: @fa-var-file-code; } -} - -.toolbarmenu.listing li { - &:hover { - a.active { - color: @color-toolbarmenu-hover; - background-color: @color-toolbarmenu-hover-background; - } + &.spellcheck:before { + content: @fa-var-magic; // TODO + } + &.status:before { + .font-icon-regular(@fa-var-lightbulb); + } + &.submit:before { + content: @fa-var-check; + } + &.threads:before { + content: @fa-var-comments; + } + &.zoomin:before { + content: @fa-var-search-plus; + } + &.zoomout:before { + content: @fa-var-search-minus; } }