From f797e7df6ae260a7d2c17e0f1818e4b99e985392 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 15 Aug 2017 18:17:48 +0100 Subject: [PATCH] [ADF-1384] fix error and amount widget style problem (#2222) --- .../components/widgets/amount/amount.widget.scss | 14 +++++++++++++- .../widgets/container/container.widget.scss | 2 +- .../components/widgets/error/error.component.scss | 3 +++ .../components/widgets/error/error.component.ts | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.scss diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.scss b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.scss index 28f82b16c7..00df078807 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.scss +++ b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.scss @@ -5,11 +5,23 @@ &-amount-widget { width: 100%; vertical-align: baseline !important; - padding-left: 14px; + + .mat-input-element { + margin-left: 11px; + } } &-amount-widget__container { max-width: 100%; + + .mat-input-placeholder-wrapper { + top: -6px !important; + } + + .mat-input-placeholder-wrapper { + top: 0 !important; + left: 13px; + } } &-amount-widget__input .mat-focused { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss index 6a5fedac82..cd9eb7300a 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss +++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss @@ -38,7 +38,7 @@ container-widget{ } .mat-input-placeholder-wrapper{ - top:0px !important; + top:0 !important; } .mat-input-placeholder{ diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.scss b/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.scss new file mode 100644 index 0000000000..de1bd2e830 --- /dev/null +++ b/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.scss @@ -0,0 +1,3 @@ +.adf-error-text-container { + margin-top: 0 !important; +} diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.ts b/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.ts index 6c30d3c5b1..fa7b5c3c27 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.ts @@ -25,6 +25,7 @@ import { baseHost , WidgetComponent } from './../widget.component'; @Component({ selector: 'error-widget', templateUrl: './error.component.html', + styleUrls: ['./error.component.scss'], animations: [ trigger('transitionMessages', [ state('enter', style({opacity: 1, transform: 'translateY(0%)'})),