diff --git a/Jenkinsfile b/Jenkinsfile
index 97f61891f..a2185455d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -151,7 +151,7 @@ pipeline {
if (!env.COMMITTER_EMAIL) return
try {
mail(
- to: env.GIT_COMMITTER_EMAIL,
+ to: env.COMMITTER_EMAIL,
subject: "Pipeline: ${env.JOB_NAME} (${env.BUILD_NUMBER}): ${currentBuild.currentResult}",
body: "Check status at ${env.BUILD_URL}"
)
diff --git a/front/core/components/button/style.scss b/front/core/components/button/style.scss
index 47df4f7ef..84bd8659a 100644
--- a/front/core/components/button/style.scss
+++ b/front/core/components/button/style.scss
@@ -1,5 +1,5 @@
vn-button {
- & i[class="material-icons"] {
- margin-top: 6px;
+ & > button > vn-icon {
+ vertical-align: middle;
}
}
\ No newline at end of file
diff --git a/front/core/components/fetched-tags/style.scss b/front/core/components/fetched-tags/style.scss
deleted file mode 100644
index 775df2ca3..000000000
--- a/front/core/components/fetched-tags/style.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@import "variables";
-
-vn-fetched-tags {
- &.noTitle vn-one {
- display: none !important;
- }
- & > vn-horizontal {
- align-items: center;
-
- @media screen and (max-width: 1600px) {
- flex-direction: column;
- text-align: center;
-
- & > vn-one {
- padding-bottom: .2em;
- }
- }
- & > vn-one {
- min-width: 12em;
- }
- & > vn-auto > .inline-tag {
- display: inline-block;
- color: $color-font-secondary;
- margin-right: .4em;
- text-align: center;
- font-size: .8em;
- height: 1.25em;
- padding: .1em;
- border-radius: .1em;
- width: 4em;
- border: 1px solid $color-font-secondary;
-
- &.empty {
- border: 1px solid $color-bg;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/front/core/components/index.js b/front/core/components/index.js
index d967bbb9a..411048985 100644
--- a/front/core/components/index.js
+++ b/front/core/components/index.js
@@ -40,7 +40,6 @@ import './input-range';
import './chip';
import './input-number';
import './input-time';
-import './fetched-tags';
import './log';
import './treeview';
import './treeview/child';
diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss
index 793170e75..54b40db6d 100644
--- a/front/core/components/table/style.scss
+++ b/front/core/components/table/style.scss
@@ -72,10 +72,11 @@ vn-table {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- max-width: 6em;
+ max-width: 5em;
&[number] {
text-align: right;
+ width: 6em;
}
&[center] {
text-align: center;
@@ -85,7 +86,7 @@ vn-table {
text-align: center;
}
&[expand] {
- max-width: 40em;
+ max-width: 10em;
min-width: 0;
}
vn-icon.bright, i.bright {
diff --git a/front/core/styles/index.js b/front/core/styles/index.js
index 0912fcd20..c3503f3d5 100644
--- a/front/core/styles/index.js
+++ b/front/core/styles/index.js
@@ -1,3 +1,4 @@
+import './md-override.scss';
import './mdl-override.scss';
import './mdi-override.css';
import './zoom-image.scss';
diff --git a/front/core/styles/md-override.scss b/front/core/styles/md-override.scss
new file mode 100644
index 000000000..ba71a9a77
--- /dev/null
+++ b/front/core/styles/md-override.scss
@@ -0,0 +1,11 @@
+
+html {
+ background-color: initial;
+}
+
+// Disable ng-repeat effects
+
+.ng-enter,
+.ng-leave {
+ transition: none !important;
+}
diff --git a/front/core/styles/mdl-override.scss b/front/core/styles/mdl-override.scss
index bc8f46b9f..4c7b295b8 100644
--- a/front/core/styles/mdl-override.scss
+++ b/front/core/styles/mdl-override.scss
@@ -20,7 +20,7 @@ body {
.mdl-textfield--floating-label.has-placeholder .mdl-textfield__label {
color: $color-main !important;
}
-.mdl-checkbox.is-checked .mdl-checkbox__box-outline, {
+.mdl-checkbox.is-checked .mdl-checkbox__box-outline {
border: 2px solid $color-main;
}
fieldset[disabled] .mdl-checkbox .mdl-checkbox__box-outline, .mdl-checkbox.is-disabled .mdl-checkbox__box-outline {
diff --git a/front/salix/styles/effects.scss b/front/salix/styles/effects.scss
index 948b94dba..a337acce1 100644
--- a/front/salix/styles/effects.scss
+++ b/front/salix/styles/effects.scss
@@ -23,9 +23,3 @@
background-color: $color-active;
color: $color-active-font;
}
-
-// Disable ng-repeat effects
-.ng-enter, .ng-leave {
- -webkit-transition: none !important;
- transition: none !important
-}
\ No newline at end of file
diff --git a/front/salix/styles/layout.scss b/front/salix/styles/layout.scss
index 75a7d603c..7cf468725 100644
--- a/front/salix/styles/layout.scss
+++ b/front/salix/styles/layout.scss
@@ -1,17 +1,4 @@
-html, body {
- height: 100%;
- margin: 0px;
- padding: 0px;
-}
-
-html [full-height], .full-height {
- height: 100%;
-}
-html [self-scroll], .self-scroll {
- overflow: auto;
-}
-
/* Horizontal & vertical */
html [vn-horizontal], vn-horizontal, .vn-horizontal,
diff --git a/front/salix/styles/misc.scss b/front/salix/styles/misc.scss
index 3668f28aa..14a64cc2c 100644
--- a/front/salix/styles/misc.scss
+++ b/front/salix/styles/misc.scss
@@ -1,6 +1,11 @@
@import "./variables";
@import "./effects";
+html, body {
+ margin: 0;
+ padding: 0;
+}
+
a:focus,
input:focus,
button:focus {
diff --git a/modules/item/front/fetched-tags/index.html b/modules/item/front/fetched-tags/index.html
new file mode 100644
index 000000000..546e5d67d
--- /dev/null
+++ b/modules/item/front/fetched-tags/index.html
@@ -0,0 +1,12 @@
+
+ {{::$ctrl.title}}
+
+
+ {{::fetchedTag.value}}
+
+
+
\ No newline at end of file
diff --git a/front/core/components/fetched-tags/index.js b/modules/item/front/fetched-tags/index.js
similarity index 97%
rename from front/core/components/fetched-tags/index.js
rename to modules/item/front/fetched-tags/index.js
index 3cccb97c3..508764c9e 100644
--- a/front/core/components/fetched-tags/index.js
+++ b/modules/item/front/fetched-tags/index.js
@@ -1,4 +1,4 @@
-import ngModule from '../../module';
+import ngModule from '../module';
import './style.scss';
export default class FetchedTags {
diff --git a/modules/item/front/fetched-tags/style.scss b/modules/item/front/fetched-tags/style.scss
new file mode 100644
index 000000000..baada9075
--- /dev/null
+++ b/modules/item/front/fetched-tags/style.scss
@@ -0,0 +1,56 @@
+@import "variables";
+
+vn-fetched-tags {
+ &.noTitle vn-one {
+ display: none !important;
+ }
+ & > vn-horizontal {
+ align-items: center;
+
+ & > vn-one {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ min-width: 5em;
+ }
+ & > vn-auto {
+ display: flex;
+ padding-left: .4em;
+ min-width: 12em;
+
+ & > .inline-tag {
+ display: inline-block;
+ color: $color-font-secondary;
+ margin-left: .4em;
+ text-align: center;
+ font-size: .8em;
+ height: 1.25em;
+ padding: .1em;
+ border-radius: .1em;
+ width: 4em;
+ min-width: 4em;
+ border: 1px solid $color-spacer;
+
+ &.empty {
+ border: 1px solid $color-spacer-light;
+ }
+ }
+ }
+ @media screen and (max-width: 1600px) {
+ flex-direction: column;
+
+ & > vn-one {
+ padding-bottom: .2em;
+ }
+ & > vn-auto {
+ white-space: initial;
+ padding-left: 0;
+ flex-wrap: wrap;
+ justify-content: center;
+
+ & > .inline-tag {
+ margin: .1em;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/item/front/index.js b/modules/item/front/index.js
index 3bb2942a8..aacaffe85 100644
--- a/modules/item/front/index.js
+++ b/modules/item/front/index.js
@@ -8,6 +8,7 @@ import './card';
import './descriptor';
import './descriptor-popover';
import './data';
+import './fetched-tags';
import './tags';
import './tax';
// import './history';
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 24517d2a6..82e6bff8c 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -54,15 +54,15 @@
-
+
-
- Item
+
+
Id
- Description
+ Item
Quantity
Price
Disc
@@ -71,12 +71,12 @@
-
+
-
+
-
+
![]()
-
+
Item
Description
Quantity
@@ -66,7 +66,7 @@
-
+