espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

icons change

Browse Source
This commit is contained in:
yuri
2018-11-08 17:23:06 +02:00
parent c6fc914a4e
commit cb82f0df0c
8 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/res/templates/dashlet.tpl
+1 -1
View File
@@ -4,7 +4,7 @@
{{#each buttonList}}
<button type="button" class="btn btn-{{#if ../../style}}{{../../style}}{{else}}link{{/if}} btn-sm action{{#if hidden}} hidden{{/if}}" data-action="{{name}}" title="{{#if title}}{{translate title}}{{/if}}">{{#if html}}{{{html}}}{{else}}{{translate label}}{{/if}}</button>
{{/each}}
<button class="dropdown-toggle btn btn-link btn-sm menu-button" data-toggle="dropdown"><span class="caret"></span></button>
<button class="dropdown-toggle btn btn-link btn-sm menu-button" data-toggle="dropdown"><span class="fas fa-ellipsis-h"></span></button>
<ul class="dropdown-menu dropdown-menu-with-icons" role="menu">
{{#each actionList}}
<li><a data-action="{{name}}" class="action" href="{{#if url}}{{url}}{{else}}javascript:{{/if}}"{{#each data}} data-{{hyphen @key}}="{{./this}}"{{/each}}>{{#if iconHtml}}{{{iconHtml}}}{{else}}<span class="empty-icon">&nbsp;</span>{{/if}}<span class="item-text">{{#if html}}{{{html}}}{{else}}{{translate label}}{{/if}}</span></a></li>
client/res/templates/record/detail.tpl
+2 -2
View File
@@ -5,7 +5,7 @@
{{#each buttonList}}{{button name scope=../../entityType label=label style=style hidden=hidden html=html}}{{/each}}
{{#if dropdownItemList}}
<button type="button" class="btn btn-default dropdown-toggle dropdown-item-list-button{{#if dropdownItemListEmpty}} hidden{{/if}}" data-toggle="dropdown">
<span class="caret wide"></span>
<span class="fas fa-ellipsis-h"></span>
</button>
<ul class="dropdown-menu pull-left">
{{#each dropdownItemList}}
@@ -40,7 +40,7 @@
{{#each buttonEditList}}{{button name scope=../../entityType label=label style=style hidden=hidden html=html}}{{/each}}
{{#if dropdownEditItemList}}
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret wide"></span>
<span class="fas fa-ellipsis-h"></span>
</button>
<ul class="dropdown-menu pull-left">
{{#each dropdownEditItemList}}
client/res/templates/record/edit.tpl
+1 -1
View File
@@ -5,7 +5,7 @@
{{#each buttonList}}{{button name scope=../../entityType label=label style=style html=html}}{{/each}}
{{#if dropdownItemList}}
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret wide"></span>
<span class="fas fa-ellipsis-h"></span>
</button>
<ul class="dropdown-menu pull-left">
{{#each dropdownItemList}}
client/res/templates/record/panel-actions.tpl
+1 -1
View File
@@ -4,7 +4,7 @@
{{#if actionList}}
<button type="button" class="btn btn-{{#if defs.style}}{{defs.style}}{{else}}default{{/if}} btn-sm dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
<span class="fas fa-ellipsis-h"></span>
</button>
<ul class="dropdown-menu">
{{#each actionList}}
client/res/templates/record/search.tpl
+5 -5
View File
@@ -29,7 +29,7 @@
</div>
{{#unless textFilterDisabled}}<input type="text" class="form-control text-filter" name="textFilter" value="{{textFilter}}" tabindex="1">{{/unless}}
<div class="input-group-btn">
<button type="button" class="btn btn-primary search btn-icon btn-icon-x-wide" data-action="search">
<button type="button" class="btn btn-primary search btn-icon btn-icon-x-wide" data-action="search" title="{{translate 'Search'}}">
<span class="fa fa-search"></span>
</button>
</div>
@@ -37,11 +37,11 @@
</div>
<div class="form-group col-md-6 col-sm-5">
<div class="btn-group search-right-buttons-group">
<button type="button" class="btn btn-default" data-action="reset">
<span class="fas fa-redo-alt fa-sm"></span>&nbsp;{{translate 'Reset'}}
<button type="button" class="btn btn-default btn-icon-x-wide" data-action="reset" title="{{translate 'Reset'}}">
<span class="fas fa-redo-alt"></span>
</button>
<button type="button" class="btn btn-default dropdown-toggle add-filter-button" data-toggle="dropdown" tabindex="-1">
{{translate 'Add Field'}} <span class="caret"></span>
<button type="button" class="btn btn-default btn-icon-wide dropdown-toggle add-filter-button" data-toggle="dropdown" tabindex="-1" title="{{translate 'Add Field'}}">
<span class="fas fa-ellipsis-v"></span>
</button>
<ul class="dropdown-menu pull-right filter-list">
{{#each advancedFields}}
frontend/less/espo/custom.less
+9 -4
View File
@@ -1145,6 +1145,10 @@ table.less-padding td.cell[data-name="buttons"] > .btn-group {
margin-right: -13px;
}
.panel > .panel-heading > .btn-group > .btn {
color: @gray-soft;
}
.dashboard-header .dashboard-buttons {
margin-left: 10px;
}
@@ -1159,10 +1163,6 @@ table.less-padding td.cell[data-name="buttons"] > .btn-group {
cursor: default;
}
.panel.dashlet > .panel-heading > .btn-group .btn-link {
color: @text-color;
}
.panel.dashlet > .panel-heading > .btn-group > .btn + .dropdown-toggle {
padding-left: @padding-small-horizontal;
padding-right: @padding-small-horizontal;
@@ -2353,6 +2353,11 @@ a.field-info > span.fa-info-circle {
}
}
.btn > .fa-ellipsis-v {
position: relative;
top: 1px;
}
.btn.btn-icon-wide {
width: 54px;
}
frontend/less/espo/variables.less
+2
View File
@@ -94,6 +94,8 @@
@white-color: #fafbfc;
@gray-soft: lighten(@gray-base, 39.5%);
@body-bg: #FEFEFE;
@panel-bg: #FFF;
frontend/less/hazyblue-vertical/custom.less
+13 -3
View File
@@ -23,6 +23,16 @@
}
}
.btn-default > .fa,
.btn-default > .fas {
color: @gray-soft;
}
.btn-default.disabled > .fa,
.btn-default.disabled > .fas {
color: @gray-light;
}
.panel-heading {
border-bottom-width: 0;
}
@@ -32,16 +42,16 @@
border-color: @btn-default-border;
}
.panel .panel-heading .btn-default {
.panel > .panel-heading > .btn-group > .btn {
background-color: @panel-default-heading-bg;
border-color: @panel-default-heading-bg;
}
.panel .panel-heading .open .btn {
.panel > .panel-heading .open .btn {
border-color: transparent;
}
.panel .panel-heading .btn-default {
.panel > .panel-heading .btn-default {
&:active,
&.active {
.box-shadow(none);