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

Style fixes

This commit is contained in:
Juan Ferrer 2019-02-20 14:34:16 +01:00
parent 90092a4f48
commit 8f1e41e744
17 changed files with 103 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -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}"
)

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

@ -1,5 +1,5 @@
vn-button {
& i[class="material-icons"] {
margin-top: 6px;
& > button > vn-icon {
vertical-align: middle;
}
}

38
front/core/components/fetched-tags/style.scss
View File

@ -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;
}
}
}
}

1
front/core/components/index.js
View File

@ -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';

5
front/core/components/table/style.scss
View File

@ -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 {

1
front/core/styles/index.js
View File

@ -1,3 +1,4 @@
import './md-override.scss';
import './mdl-override.scss';
import './mdi-override.css';
import './zoom-image.scss';

11
front/core/styles/md-override.scss Normal file
View File

@ -0,0 +1,11 @@
html {
background-color: initial;
}
// Disable ng-repeat effects
.ng-enter,
.ng-leave {
transition: none !important;
}

2
front/core/styles/mdl-override.scss
View File

@ -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 {

6
front/salix/styles/effects.scss
View File

@ -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
}

13
front/salix/styles/layout.scss
View File

@ -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,

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

@ -1,6 +1,11 @@
@import "./variables";
@import "./effects";
html, body {
margin: 0;
padding: 0;
}
a:focus,
input:focus,
button:focus {

12
modules/item/front/fetched-tags/index.html Normal file
View File

@ -0,0 +1,12 @@
<vn-horizontal>
<vn-one>{{::$ctrl.title}}</vn-one>
<vn-auto>
<section
class="inline-tag ellipsize"
ng-class="::{empty: !fetchedTag.value}"
ng-repeat="fetchedTag in $ctrl.tags track by $index"
title="{{::fetchedTag.name}}: {{::fetchedTag.value}}">
{{::fetchedTag.value}}
</section>
</vn-auto>
</vn-horizontal>

2
front/core/components/fetched-tags/index.js → modules/item/front/fetched-tags/index.js
View File

@ -1,4 +1,4 @@
import ngModule from '../../module';
import ngModule from '../module';
import './style.scss';
export default class FetchedTags {

56
modules/item/front/fetched-tags/style.scss Normal file
View File

@ -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;
}
}
}
}
}

1
modules/item/front/index.js
View File

@ -8,6 +8,7 @@ import './card';
import './descriptor';
import './descriptor-popover';
import './data';
import './fetched-tags';
import './tags';
import './tax';
// import './history';

14
modules/ticket/front/sale/index.html
View File

@ -54,15 +54,15 @@
<vn-table model="model">
<vn-thead>
<vn-tr>
<vn-th number>
<vn-th shrink>
<vn-multi-check
data="$ctrl.sales">
</vn-multi-check>
</vn-th>
<vn-th></vn-th>
<vn-th style="text-align: center">Item</vn-th>
<vn-th shrink></vn-th>
<vn-th shrink></vn-th>
<vn-th number>Id</vn-th>
<vn-th>Description</vn-th>
<vn-th>Item</vn-th>
<vn-th number>Quantity</vn-th>
<vn-th number>Price</vn-th>
<vn-th number>Disc</vn-th>
@ -71,12 +71,12 @@
</vn-thead>
<vn-tbody>
<vn-tr ng-repeat="sale in $ctrl.sales">
<vn-td number >
<vn-td shrink>
<vn-check
field="sale.checked">
</vn-check>
</vn-td>
<vn-td>
<vn-td shrink>
<a ui-sref="claim.card.basicData({id: sale.claim.claimFk})">
<vn-icon
ng-show="sale.claim.claimFk"
@ -94,7 +94,7 @@
icon="icon-reserve"
vn-tooltip="{{::$ctrl.$translate.instant('Reserved')}}"></vn-icon>
</vn-td>
<vn-td style="text-align: center">
<vn-td shrink>
<img
ng-src="{{::$ctrl.imagesPath}}/50x50/{{::sale.image}}"
zoom-image="{{::$ctrl.imagesPath}}/1600x900/{{::sale.image}}"

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

@ -55,7 +55,7 @@
<vn-table class="vn-grid">
<vn-thead>
<vn-tr>
<vn-th></vn-th>
<vn-th shrink></vn-th>
<vn-th number>Item</vn-th>
<vn-th>Description</vn-th>
<vn-th number>Quantity</vn-th>
@ -66,7 +66,7 @@
</vn-thead>
<vn-tbody>
<vn-tr ng-repeat="sale in $ctrl.summary.sales track by sale.id">
<vn-td>
<vn-td shrink>
<a ui-sref="claim.card.basicData({id: sale.claimBeginning.claimFk})">
<vn-icon
ng-show="sale.claimBeginning.claimFk"