diff options
author | Aleksander Machniak <alec@alec.pl> | 2019-08-24 12:13:24 +0300 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2019-08-24 12:13:24 +0300 |
commit | 0dacbc8e0f06f916b1d2e1c054f400977ad32293 (patch) | |
tree | 3c8c4b4f0f9be01edd7dfb0bac38c8791edcb032 /skins | |
parent | 6ec3217f1e13cd8cc3ee524de13cb0ee71e7fcdb (diff) | |
parent | c5b844e235e81d9750754a78458ebb134d3694c7 (diff) |
Merge branch 'thomascube-pr-elastic-icons'
Diffstat (limited to 'skins')
-rw-r--r-- | skins/elastic/styles/widgets/buttons.less | 7 | ||||
-rw-r--r-- | skins/elastic/styles/widgets/menu.less | 26 | ||||
-rw-r--r-- | skins/elastic/templates/addressbook.html | 2 | ||||
-rw-r--r-- | skins/elastic/templates/compose.html | 2 | ||||
-rw-r--r-- | skins/elastic/templates/mail.html | 4 |
5 files changed, 23 insertions, 18 deletions
diff --git a/skins/elastic/styles/widgets/buttons.less b/skins/elastic/styles/widgets/buttons.less index 6d6ed85ae..5f2f070ef 100644 --- a/skins/elastic/styles/widgets/buttons.less +++ b/skins/elastic/styles/widgets/buttons.less @@ -114,15 +114,18 @@ button.btn { &.folders:before { content: @fa-var-folder-open; } + &.options:before { + content: @fa-var-sliders-h; + } &.tools:before, &.settings:before { - content: @fa-var-wrench; + content: @fa-var-cog; } &.properties:before { content: @fa-var-info-circle; } &.select:before { - .font-icon-regular(@fa-var-check-circle); + .font-icon-regular(@fa-var-check-square); } &.insert.recipient:before { content: @fa-var-user-plus; diff --git a/skins/elastic/styles/widgets/menu.less b/skins/elastic/styles/widgets/menu.less index 450d7c61d..efee6d58f 100644 --- a/skins/elastic/styles/widgets/menu.less +++ b/skins/elastic/styles/widgets/menu.less @@ -370,9 +370,12 @@ a.toolbar-button { &.contacts:before { content: @fa-var-users; } - &.settings:before { + &.options:before { content: @fa-var-sliders-h; } + &.settings:before { + content: @fa-var-cog; + } &.help:before { content: @fa-var-life-ring; } @@ -469,10 +472,11 @@ a.toolbar-button { &.expand:before { content: @fa-var-angle-right; } - &.expand.all:before, - &.expand.none:before, - &.expand.unread:before { - content: @fa-var-comments; + &.expand.all:before { + content: @fa-var-angle-double-down; + } + &.expand.none:before { + content: @fa-var-angle-double-up; } &.export:before, &.export.all:before, @@ -554,6 +558,7 @@ a.toolbar-button { .font-icon-regular(@fa-var-envelope-open); } &.unread:before, + &.expand.unread:before, &.select.unread:before { .font-icon-solid(@fa-var-envelope); } @@ -596,13 +601,13 @@ a.toolbar-button { content: @fa-var-trash-alt; } &.select:before { - .font-icon-regular(@fa-var-check-circle); + content: @fa-var-mouse-pointer; } &.select.all:before { - content: @fa-var-check-square; + content: @fa-var-asterisk; } &.select.invert:before { - content: @fa-var-square; + content: @fa-var-check-square; } &.select.none:before { .font-icon-solid(@fa-var-times); @@ -611,14 +616,11 @@ a.toolbar-button { .font-icon-solid(@fa-var-bars); } &.selection:before { - content: @fa-var-mouse-pointer; + .font-icon-regular(@fa-var-check-square); } &.send:before { content: @fa-var-paper-plane; } - &.settings:before { - content: @fa-var-sliders-h; - } &.showurl:before { content: @fa-var-link; } diff --git a/skins/elastic/templates/addressbook.html b/skins/elastic/templates/addressbook.html index d327c121e..ce8886e1a 100644 --- a/skins/elastic/templates/addressbook.html +++ b/skins/elastic/templates/addressbook.html @@ -101,7 +101,7 @@ <h3 id="aria-label-export-menu" class="voice"><roundcube:label name="arialabelcontactexportoptions" /></h3> <ul class="menu listing" role="menu" aria-labelledby="aria-label-export-menu"> <roundcube:button type="link-menuitem" command="export" label="exportall" prop="sub" class="export all disabled" classAct="export all active" /> - <roundcube:button type="link-menuitem" command="export-selected" label="exportsel" prop="sub" class="export selection disabled" classAct="export selection active" /> + <roundcube:button type="link-menuitem" command="export-selected" label="exportsel" prop="sub" class="export select disabled" classAct="export select active" /> </ul> </div> diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html index 5d8adf766..7c2f11dca 100644 --- a/skins/elastic/templates/compose.html +++ b/skins/elastic/templates/compose.html @@ -79,7 +79,7 @@ <span class="header-title"><roundcube:label name="compose" /></span> <!-- toolbar --> <div id="messagetoolbar" class="toolbar menu" role="toolbar" aria-labelledby="aria-label-toolbar"> - <a class="settings" href="#options" onclick="UI.show_sidebar()" data-hidden="big"> + <a class="options" href="#options" onclick="UI.show_sidebar()" data-hidden="big"> <span class="inner"><roundcube:label name="optionsandattachments"></span> </a> <roundcube:button command="savedraft" type="link" class="save draft disabled" classAct="save draft" diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html index 519b11c29..9ab523797 100644 --- a/skins/elastic/templates/mail.html +++ b/skins/elastic/templates/mail.html @@ -36,7 +36,7 @@ <roundcube:if condition="env:threads" /> <a href="#threads" class="threads disabled" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><span class="inner"><roundcube:label name="threads" /></span></a> <roundcube:endif /> - <roundcube:object name="listmenulink" class="settings active" label="options" innerclass="inner" /> + <roundcube:object name="listmenulink" class="options active" label="options" innerclass="inner" /> <roundcube:container name="listcontrols" id="listcontrols" /> </div> <roundcube:button command="checkmail" type="link" class="button icon toolbar-button refresh" @@ -154,8 +154,8 @@ <div id="threadselect-menu" class="popupmenu"> <h3 id="aria-label-threadselectmenu" class="voice"><roundcube:label name="arialabelthreadselectmenu" /></h3> <ul class="menu listing" role="menu" aria-labelledby="aria-label-threadselectmenu"> - <roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all disabled" classAct="expand all active" /> <roundcube:button command="expand-unread" type="link-menuitem" label="expand-unread" class="expand unread disabled" classAct="expand unread active" /> + <roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all disabled" classAct="expand all active" /> <roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none disabled" classAct="expand none active" /> </ul> </div> |