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

cancel button css + item module refactor

This commit is contained in:
Carlos Jimenez Ruiz 2020-12-15 16:07:34 +01:00
parent 8e13fa7852
commit 1ba83e7741
8 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
front/core/components/button/style.scss
View File

@ -76,6 +76,13 @@
&:hover,
&:focus {
outline: none;
&.cancel {
&:hover,
&:focus {
background-color: transparent;
}
}
}
&.round {
border-radius: 50%;
@ -106,4 +113,14 @@
opacity: .7;
cursor: initial;
}
&.cancel {
color: $color-button;
background-color: transparent;
box-shadow: none;
&:not(.disabled) {
&:hover {
color: lighten($color-button, 10%);
}
}
}
}

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

@ -43,8 +43,15 @@
</vn-card>
<vn-button-bar>
<vn-submit
ng-if="watcher.dataChanged()"
disabled="!watcher.dataChanged()"
label="Save">
</vn-submit>
<!-- # #2680 Undo changes button bugs -->
<!-- <vn-button
class="cancel"
label="Undo changes"
disabled="!watcher.dataChanged()"
ng-click="watcher.loadOriginalData()">
</vn-button> -->
</vn-button-bar>
</form>

9
modules/item/front/basic-data/index.html
View File

@ -159,10 +159,15 @@
</vn-card>
<vn-button-bar>
<vn-submit
ng-if="watcher.dataChanged()"
disabled="!watcher.dataChanged()"
label="Save">
</vn-submit>
<vn-button label="Undo changes" ng-if="$ctrl.$scope.form.$dirty" ng-click="watcher.loadOriginalData()"></vn-button>
<vn-button
class="cancel"
label="Undo changes"
disabled="!watcher.dataChanged()"
ng-click="watcher.loadOriginalData()">
</vn-button>
</vn-button-bar>
</form>

10
modules/item/front/botanical/index.html
View File

@ -46,13 +46,15 @@
</vn-card>
<vn-button-bar>
<vn-submit
ng-if="watcher.dataChanged()"
disabled="!watcher.dataChanged()"
label="Save">
</vn-submit>
<vn-button
ng-if="watcher.dataChanged()"
<!-- # #2680 Undo changes button bugs -->
<!-- <vn-button
class="cancel"
label="Undo changes"
disabled="!watcher.dataChanged()"
ng-click="watcher.loadOriginalData()">
</vn-button>
</vn-button> -->
</vn-button-bar>
</form>

3
modules/item/front/create/index.html
View File

@ -61,10 +61,11 @@
</vn-card>
<vn-button-bar>
<vn-submit
ng-if="watcher.dataChanged()"
disabled="!watcher.dataChanged()"
label="Create">
</vn-submit>
<vn-button
class="cancel"
label="Cancel"
ui-sref="item.index">
</vn-button>

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

@ -58,8 +58,15 @@
</vn-card>
<vn-button-bar>
<vn-submit
ng-if="watcher.dataChanged()"
disabled="!watcher.dataChanged()"
label="Save">
</vn-submit>
<!-- # #2680 Undo changes button bugs -->
<!-- <vn-button
class="cancel"
label="Undo changes"
disabled="!watcher.dataChanged()"
ng-click="watcher.loadOriginalData()">
</vn-button> -->
</vn-button-bar>
</form>

2
modules/item/front/tags/index.html
View File

@ -74,7 +74,7 @@
</vn-card>
<vn-button-bar>
<vn-submit
ng-if="watcher.dataChanged()"
disabled="!watcher.dataChanged()"
label="Save">
</vn-submit>
</vn-button-bar>

5
modules/item/front/tax/index.html
View File

@ -29,13 +29,14 @@
</vn-card>
<vn-button-bar>
<vn-submit
ng-if="watcher.dataChanged()"
disabled="!watcher.dataChanged()"
label="Save">
</vn-submit>
<!-- # #2680 Undo changes button bugs -->
<!-- <vn-button
class="cancel"
label="Undo changes"
ng-if="watcher.dataChanged()"
disabled="!watcher.dataChanged()"
ng-click="watcher.loadOriginalData()">
</vn-button> -->
</vn-button-bar>