verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
gitea/salix/test This commit looks good Details

This commit is contained in:
Gerard 2019-02-21 12:58:05 +01:00
parent 6fb936a08a 413d2f2855
commit 1e199e9d5a
13 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/helpers/selectors.js
View File

@ -244,7 +244,7 @@ export default {
firstCodeInput: `vn-item-niche vn-horizontal:nth-child(1) > vn-textfield[label="Code"] input`, firstCodeInput: `vn-item-niche vn-horizontal:nth-child(1) > vn-textfield[label="Code"] input`,
secondWarehouseAutocomplete: `vn-item-niche vn-horizontal:nth-child(2) > vn-autocomplete[field="niche.warehouseFk"]`, secondWarehouseAutocomplete: `vn-item-niche vn-horizontal:nth-child(2) > vn-autocomplete[field="niche.warehouseFk"]`,
secondCodeInput: `vn-item-niche vn-horizontal:nth-child(2) > vn-textfield[label="Code"] input`, secondCodeInput: `vn-item-niche vn-horizontal:nth-child(2) > vn-textfield[label="Code"] input`,
secondNicheRemoveButton: `vn-item-niche vn-horizontal:nth-child(2) > vn-none > vn-icon[icon="delete"]`, secondNicheRemoveButton: `vn-item-niche vn-horizontal:nth-child(2) > vn-none > vn-icon-button[icon="delete"]`,
thirdWarehouseAutocomplete: `vn-item-niche vn-horizontal:nth-child(3) > vn-autocomplete[field="niche.warehouseFk"]`, thirdWarehouseAutocomplete: `vn-item-niche vn-horizontal:nth-child(3) > vn-autocomplete[field="niche.warehouseFk"]`,
thirdCodeInput: `vn-item-niche vn-horizontal:nth-child(3) > vn-textfield[label="Code"] input`, thirdCodeInput: `vn-item-niche vn-horizontal:nth-child(3) > vn-textfield[label="Code"] input`,
submitNichesButton: `vn-item-niche ${components.vnSubmit}` submitNichesButton: `vn-item-niche ${components.vnSubmit}`
@ -423,7 +423,7 @@ export default {
firstQuantityInput: 'vn-ticket-service vn-textfield[label="Quantity"] input', firstQuantityInput: 'vn-ticket-service vn-textfield[label="Quantity"] input',
firstPriceInput: 'vn-ticket-service vn-textfield[label="Price"] input', firstPriceInput: 'vn-ticket-service vn-textfield[label="Price"] input',
firstVatTypeAutocomplete: 'vn-ticket-service vn-autocomplete[label="Tax class"]', firstVatTypeAutocomplete: 'vn-ticket-service vn-autocomplete[label="Tax class"]',
fistDeleteServiceButton: 'vn-ticket-card > vn-main-block > div.content-block.ng-scope > vn-ticket-service > form > vn-card > div > vn-one:nth-child(1) > vn-horizontal:nth-child(1) > vn-auto > vn-icon[icon="delete"]', fistDeleteServiceButton: 'vn-ticket-card > vn-main-block > div.content-block.ng-scope > vn-ticket-service > form > vn-card > div > vn-one:nth-child(1) > vn-horizontal:nth-child(1) > vn-auto > vn-icon-button[icon="delete"]',
serviceLine: 'vn-ticket-service > form > vn-card > div > vn-one:nth-child(2) > vn-horizontal', serviceLine: 'vn-ticket-service > form > vn-card > div > vn-one:nth-child(2) > vn-horizontal',
saveServiceButton: `${components.vnSubmit}` saveServiceButton: `${components.vnSubmit}`
}, },

5
front/core/components/icon-button/style.scss
View File

@ -4,19 +4,22 @@ vn-icon-button {
outline: 0; outline: 0;
color: $color-main; color: $color-main;
display: inline-block; display: inline-block;
font-size: 18pt;
padding: .25em;
& > button { & > button {
background-color: transparent; background-color: transparent;
display: block; display: block;
color: inherit; color: inherit;
border: 0; border: 0;
padding: .25em; padding: 0;
&:hover { &:hover {
background-color: initial; background-color: initial;
} }
& > vn-icon { & > vn-icon {
display: block; display: block;
font-size: inherit;
} }
} }
} }

2
front/salix/components/app/style.scss
View File

@ -57,6 +57,8 @@ vn-app {
margin: $margin-medium; margin: $margin-medium;
form vn-horizontal { form vn-horizontal {
align-items: center;
& > * { & > * {
padding: .2em; padding: .2em;
} }

44
front/salix/components/main-menu/main-menu.html
View File

@ -5,31 +5,27 @@
class="unselectable"> class="unselectable">
{{currentUserName}} {{currentUserName}}
</div> </div>
<div> <vn-icon-button
<vn-icon id="apps"
id="apps" icon="apps"
icon="apps" vn-popover="apps-menu"
vn-popover="apps-menu" translate-attr="{title: 'Applications'}">
translate-attr="{title: 'Applications'}"> </vn-icon-button>
</vn-icon> <vn-icon-button
<vn-menu vn-id="apps-menu"> id="logout"
<ul pad-small> icon="exit_to_app"
<li ng-repeat="mod in ::$ctrl.modules" ui-sref="{{::mod.route.state}}"> translate-attr="{title: 'Logout'}"
<vn-icon icon="{{::mod.icon || 'photo'}}"></vn-icon> ng-click="$ctrl.onLogoutClick()">
<span translate>{{::mod.name}}</span> </vn-icon-button>
</li>
</ul>
</vn-menu>
</div>
<div>
<vn-icon
id="logout"
icon="exit_to_app"
translate-attr="{title: 'Logout'}"
ng-click="$ctrl.onLogoutClick()">
</vn-icon>
</div>
</div> </div>
<vn-menu vn-id="apps-menu">
<ul pad-small>
<li ng-repeat="mod in ::$ctrl.modules" ui-sref="{{::mod.route.state}}">
<vn-icon icon="{{::mod.icon || 'photo'}}"></vn-icon>
<span translate>{{::mod.name}}</span>
</li>
</ul>
</vn-menu>
<vn-user-configuration-popover <vn-user-configuration-popover
vn-id="popover"> vn-id="popover">
</vn-user-configuration-popover> </vn-user-configuration-popover>

16
front/salix/components/main-menu/style.scss
View File

@ -11,22 +11,20 @@ vn-main-menu {
align-items: center; align-items: center;
box-sizing: border-box; box-sizing: border-box;
& > * { & > *:hover {
cursor: pointer; color: $color-main;
padding-left: .6em;
&:hover {
color: $color-main;
}
} }
& > #user { & > #user {
vertical-align: middle; vertical-align: middle;
font-weight: bold; font-weight: bold;
margin-right: .2em; margin-right: .2em;
cursor: pointer;
} }
& > div > vn-icon { & > vn-icon-button {
display: block;
font-size: 2.1em; font-size: 2.1em;
color: inherit;
padding: 0;
margin-left: .3em;
} }
} }
vn-menu.vn-popover > div > div.content > ul { vn-menu.vn-popover > div > div.content > ul {

3
front/salix/styles/misc.scss
View File

@ -171,11 +171,12 @@ vn-tool-bar {
& > .buttons { & > .buttons {
align-items: center; align-items: center;
vn-icon { vn-icon-button {
opacity: .4; opacity: .4;
color: $color-main; color: $color-main;
margin-left: .5em; margin-left: .5em;
transition: opacity 250ms ease-out; transition: opacity 250ms ease-out;
padding: 0;
font-size: 2em; font-size: 2em;
&:hover { &:hover {

4
modules/client/front/contact/index.html
View File

@ -27,13 +27,13 @@
rule="clientContact.phone" vn-focus> rule="clientContact.phone" vn-focus>
</vn-textfield> </vn-textfield>
<vn-none> <vn-none>
<vn-icon <vn-icon-button
pointer pointer
margin-medium-v margin-medium-v
vn-tooltip="Remove contact" vn-tooltip="Remove contact"
icon="delete" icon="delete"
ng-click="model.remove($index)"> ng-click="model.remove($index)">
</vn-icon> </vn-icon-button>
</vn-none> </vn-none>
</vn-horizontal> </vn-horizontal>
<vn-one> <vn-one>

6
modules/client/front/index/index.html
View File

@ -39,11 +39,11 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-horizontal class="buttons"> <vn-horizontal class="buttons">
<vn-icon <vn-icon-button
ng-click="$ctrl.openSummary(client, $event)" ng-click="$ctrl.preview($event)"
vn-tooltip="Preview" vn-tooltip="Preview"
icon="desktop_windows"> icon="desktop_windows">
</vn-icon> </vn-icon-button>
</vn-horizontal> </vn-horizontal>
</vn-horizontal> </vn-horizontal>
</a> </a>

4
modules/item/front/barcode/index.html
View File

@ -22,13 +22,13 @@
vn-focus> vn-focus>
</vn-textfield> </vn-textfield>
<vn-none> <vn-none>
<vn-icon <vn-icon-button
vn-acl="buyer,replenisher" vn-acl="buyer,replenisher"
pointer pointer
vn-tooltip="Remove barcode" vn-tooltip="Remove barcode"
icon="delete" icon="delete"
ng-click="model.remove($index)"> ng-click="model.remove($index)">
</vn-icon> </vn-icon-button>
</vn-none> </vn-none>
</vn-horizontal> </vn-horizontal>
<vn-one> <vn-one>

4
modules/item/front/niche/index.html
View File

@ -30,13 +30,13 @@
vn-acl="buyer,replenisher"> vn-acl="buyer,replenisher">
</vn-textfield> </vn-textfield>
<vn-none> <vn-none>
<vn-icon <vn-icon-button
vn-acl="buyer,replenisher" vn-acl="buyer,replenisher"
pointer pointer
vn-tooltip="Remove niche" vn-tooltip="Remove niche"
icon="delete" icon="delete"
ng-click="model.remove($index)"> ng-click="model.remove($index)">
</vn-icon> </vn-icon-button>
</vn-none> </vn-none>
</vn-horizontal> </vn-horizontal>
<vn-one> <vn-one>

2
modules/order/front/catalog/index.html
View File

@ -80,7 +80,7 @@
</vn-one> </vn-one>
<vn-auto> <vn-auto>
<a href="" vn-tooltip="Add"> <a href="" vn-tooltip="Add">
<vn-icon icon="add_circle" ng-click="$ctrl.preview($event, item)"></vn-icon> <vn-icon-button icon="add_circle" ng-click="$ctrl.preview($event, item)"></vn-icon-button>
</a> </a>
</vn-auto> </vn-auto>
</vn-horizontal> </vn-horizontal>

4
modules/ticket/front/services/index.html
View File

@ -41,12 +41,12 @@
field="service.taxClassFk"> field="service.taxClassFk">
</vn-autocomplete> </vn-autocomplete>
<vn-auto pad-medium-top> <vn-auto pad-medium-top>
<vn-icon <vn-icon-button
pointer pointer
vn-tooltip="Remove service" vn-tooltip="Remove service"
icon="delete" icon="delete"
ng-click="model.remove($index)"> ng-click="model.remove($index)">
</vn-icon> </vn-icon-button>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
</vn-one> </vn-one>

4
modules/worker/front/index/index.html
View File

@ -40,11 +40,11 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-horizontal class="buttons"> <vn-horizontal class="buttons">
<vn-icon <vn-icon-button
ng-click="$ctrl.preview($event, worker)" ng-click="$ctrl.preview($event, worker)"
vn-tooltip="Preview" vn-tooltip="Preview"
icon="desktop_windows"> icon="desktop_windows">
</vn-icon> </vn-icon-button>
</vn-horizontal> </vn-horizontal>
</vn-horizontal> </vn-horizontal>
</a> </a>