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

2
Jenkinsfile vendored
View File

@ -151,7 +151,7 @@ pipeline {
if (!env.COMMITTER_EMAIL) return if (!env.COMMITTER_EMAIL) return
try { try {
mail( mail(
to: env.GIT_COMMITTER_EMAIL, to: env.COMMITTER_EMAIL,
subject: "Pipeline: ${env.JOB_NAME} (${env.BUILD_NUMBER}): ${currentBuild.currentResult}", subject: "Pipeline: ${env.JOB_NAME} (${env.BUILD_NUMBER}): ${currentBuild.currentResult}",
body: "Check status at ${env.BUILD_URL}" body: "Check status at ${env.BUILD_URL}"
) )

View File

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

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

View File

@ -40,7 +40,6 @@ import './input-range';
import './chip'; import './chip';
import './input-number'; import './input-number';
import './input-time'; import './input-time';
import './fetched-tags';
import './log'; import './log';
import './treeview'; import './treeview';
import './treeview/child'; import './treeview/child';

View File

@ -72,10 +72,11 @@ vn-table {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 6em; max-width: 5em;
&[number] { &[number] {
text-align: right; text-align: right;
width: 6em;
} }
&[center] { &[center] {
text-align: center; text-align: center;
@ -85,7 +86,7 @@ vn-table {
text-align: center; text-align: center;
} }
&[expand] { &[expand] {
max-width: 40em; max-width: 10em;
min-width: 0; min-width: 0;
} }
vn-icon.bright, i.bright { vn-icon.bright, i.bright {

View File

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

View File

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

View File

@ -20,7 +20,7 @@ body {
.mdl-textfield--floating-label.has-placeholder .mdl-textfield__label { .mdl-textfield--floating-label.has-placeholder .mdl-textfield__label {
color: $color-main !important; 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; border: 2px solid $color-main;
} }
fieldset[disabled] .mdl-checkbox .mdl-checkbox__box-outline, .mdl-checkbox.is-disabled .mdl-checkbox__box-outline { fieldset[disabled] .mdl-checkbox .mdl-checkbox__box-outline, .mdl-checkbox.is-disabled .mdl-checkbox__box-outline {

View File

@ -23,9 +23,3 @@
background-color: $color-active; background-color: $color-active;
color: $color-active-font; color: $color-active-font;
} }
// Disable ng-repeat effects
.ng-enter, .ng-leave {
-webkit-transition: none !important;
transition: none !important
}

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 */ /* Horizontal & vertical */
html [vn-horizontal], vn-horizontal, .vn-horizontal, html [vn-horizontal], vn-horizontal, .vn-horizontal,

View File

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

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>

View File

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

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

View File

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

View File

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

View File

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