banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'thomascube-pr-elastic-icons'

Browse Source
pull/6908/head
Aleksander Machniak 5 years ago
parent 6ec3217f1e c5b844e235
commit 0dacbc8e0f
6 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
plugins/enigma/skins/elastic/templates/keys.html
Unescape Escape View File

@ -68,7 +68,7 @@
<h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="enigma.arialabelkeyexportoptions" /></h3> <h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="enigma.arialabelkeyexportoptions" /></h3>
<ul class="menu listing" role="menu" aria-labelledby="aria-label-export-menu"> <ul class="menu listing" role="menu" aria-labelledby="aria-label-export-menu">
<roundcube:button type="link-menuitem" command="plugin.enigma-key-export" label="exportall" prop="sub" class="export all disabled" classAct="export all active" /> <roundcube:button type="link-menuitem" command="plugin.enigma-key-export" label="exportall" prop="sub" class="export all disabled" classAct="export all active" />
<roundcube:button type="link-menuitem" command="plugin.enigma-key-export-selected" label="exportsel" prop="sub" class="export selection disabled" classAct="export selection active" /> <roundcube:button type="link-menuitem" command="plugin.enigma-key-export-selected" label="exportsel" prop="sub" class="export select disabled" classAct="export select active" />
</ul> </ul>
</div> </div>

7
skins/elastic/styles/widgets/buttons.less
Unescape Escape View File

@ -114,15 +114,18 @@ button.btn {
&.folders:before { &.folders:before {
content: @fa-var-folder-open; content: @fa-var-folder-open;
} }
&.options:before {
content: @fa-var-sliders-h;
}
&.tools:before, &.tools:before,
&.settings:before { &.settings:before {
content: @fa-var-wrench; content: @fa-var-cog;
} }
&.properties:before { &.properties:before {
content: @fa-var-info-circle; content: @fa-var-info-circle;
} }
&.select:before { &.select:before {
.font-icon-regular(@fa-var-check-circle); .font-icon-regular(@fa-var-check-square);
} }
&.insert.recipient:before { &.insert.recipient:before {
content: @fa-var-user-plus; content: @fa-var-user-plus;

26
skins/elastic/styles/widgets/menu.less
Unescape Escape View File

@ -370,9 +370,12 @@ a.toolbar-button {
&.contacts:before { &.contacts:before {
content: @fa-var-users; content: @fa-var-users;
} }
&.settings:before { &.options:before {
content: @fa-var-sliders-h; content: @fa-var-sliders-h;
} }
&.settings:before {
content: @fa-var-cog;
}
&.help:before { &.help:before {
content: @fa-var-life-ring; content: @fa-var-life-ring;
} }
@ -469,10 +472,11 @@ a.toolbar-button {
&.expand:before { &.expand:before {
content: @fa-var-angle-right; content: @fa-var-angle-right;
} }
&.expand.all:before, &.expand.all:before {
&.expand.none:before, content: @fa-var-angle-double-down;
&.expand.unread:before { }
content: @fa-var-comments; &.expand.none:before {
content: @fa-var-angle-double-up;
} }
&.export:before, &.export:before,
&.export.all:before, &.export.all:before,
@ -554,6 +558,7 @@ a.toolbar-button {
.font-icon-regular(@fa-var-envelope-open); .font-icon-regular(@fa-var-envelope-open);
} }
&.unread:before, &.unread:before,
&.expand.unread:before,
&.select.unread:before { &.select.unread:before {
.font-icon-solid(@fa-var-envelope); .font-icon-solid(@fa-var-envelope);
} }
@ -596,13 +601,13 @@ a.toolbar-button {
content: @fa-var-trash-alt; content: @fa-var-trash-alt;
} }
&.select:before { &.select:before {
.font-icon-regular(@fa-var-check-circle); content: @fa-var-mouse-pointer;
} }
&.select.all:before { &.select.all:before {
content: @fa-var-check-square; content: @fa-var-asterisk;
} }
&.select.invert:before { &.select.invert:before {
content: @fa-var-square; content: @fa-var-check-square;
} }
&.select.none:before { &.select.none:before {
.font-icon-solid(@fa-var-times); .font-icon-solid(@fa-var-times);
@ -611,14 +616,11 @@ a.toolbar-button {
.font-icon-solid(@fa-var-bars); .font-icon-solid(@fa-var-bars);
} }
&.selection:before { &.selection:before {
content: @fa-var-mouse-pointer; .font-icon-regular(@fa-var-check-square);
} }
&.send:before { &.send:before {
content: @fa-var-paper-plane; content: @fa-var-paper-plane;
} }
&.settings:before {
content: @fa-var-sliders-h;
}
&.showurl:before { &.showurl:before {
content: @fa-var-link; content: @fa-var-link;
} }

2
skins/elastic/templates/addressbook.html
Unescape Escape View File

@ -101,7 +101,7 @@
<h3 id="aria-label-export-menu" class="voice"><roundcube:label name="arialabelcontactexportoptions" /></h3> <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"> <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" 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> </ul>
</div> </div>

2
skins/elastic/templates/compose.html
Unescape Escape View File

@ -79,7 +79,7 @@
<span class="header-title"><roundcube:label name="compose" /></span> <span class="header-title"><roundcube:label name="compose" /></span>
<!-- toolbar --> <!-- toolbar -->
<div id="messagetoolbar" class="toolbar menu" role="toolbar" aria-labelledby="aria-label-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> <span class="inner"><roundcube:label name="optionsandattachments"></span>
</a> </a>
<roundcube:button command="savedraft" type="link" class="save draft disabled" classAct="save draft" <roundcube:button command="savedraft" type="link" class="save draft disabled" classAct="save draft"

4
skins/elastic/templates/mail.html
Unescape Escape View File

@ -36,7 +36,7 @@
<roundcube:if condition="env:threads" /> <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> <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: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" /> <roundcube:container name="listcontrols" id="listcontrols" />
</div> </div>
<roundcube:button command="checkmail" type="link" class="button icon toolbar-button refresh" <roundcube:button command="checkmail" type="link" class="button icon toolbar-button refresh"
@ -154,8 +154,8 @@
<div id="threadselect-menu" class="popupmenu"> <div id="threadselect-menu" class="popupmenu">
<h3 id="aria-label-threadselectmenu" class="voice"><roundcube:label name="arialabelthreadselectmenu" /></h3> <h3 id="aria-label-threadselectmenu" class="voice"><roundcube:label name="arialabelthreadselectmenu" /></h3>
<ul class="menu listing" role="menu" aria-labelledby="aria-label-threadselectmenu"> <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-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" /> <roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none disabled" classAct="expand none active" />
</ul> </ul>
</div> </div>

Write Preview
Loading…
Cancel
Save