sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 235: #850 #851 #852 Change Error Message Color Searchbar and Wording | Change Color on Select All and Arrow Up And Down in Filter Overlay | Remove Box Shadow From Shelf FIlter Overlay Select Filter Arrow

Browse Source 
Related work items: #850, #851, #852
This commit is contained in:
Sebastian Neumair
2020-07-21 08:00:18 +00:00
committed by Lorenz Hilpert
parent 259266d138 eb80bd8447
commit f6f36eba23
6 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/sales/src/app/modules/filter/filter-group/components/select-filter/select-filter.component.html
View File

@@ -5,8 +5,9 @@
>
<button
type="button"
class="isa-btn isa-p-0 isa-font-lightgrey isa-font-weight-emphasis"
class="isa-btn isa-p-0 isa-font-weight-emphasis"
[class.isa-font-color-customer]="module === 'Customer'"
[class.isa-font-lightgrey]="module !== 'Customer'"
*ngIf="!max"
(click)="selectAll()"
>
@@ -37,12 +38,13 @@
class="scroll-btn isa-btn isa-btn-circle isa-btn-default"
[class.up]="scrollPositionPersantage >= 20"
[class.down]="scrollPositionPersantage < 20"
[class.no-shadow]="module === 'Customer'"
(click)="scroll()"
>
<lib-icon
width="18px"
height="20px"
mt="3px"
name="Arrow_back_branch"
[name]="module === 'Customer' ? 'Arrow_back' : 'Arrow_back_branch'"
></lib-icon>
</button>

4
apps/sales/src/app/modules/filter/filter-group/components/select-filter/select-filter.component.scss
View File

@@ -28,6 +28,10 @@
right: 6px;
box-shadow: 0px 0px 20px 0px rgba(89, 100, 112, 0.5);
&.no-shadow {
box-shadow: none;
}
@include mq-desktop() {
bottom: 28px;
right: 16vw;

2
apps/sales/src/app/modules/shelf/components/searchbar/searchbar.component.html
View File

@@ -13,7 +13,7 @@
(keyup.enter)="triggerSearch('search')"
(keyup)="onInput($event)"
/>
<span class="isa-input-error" *ngIf="!!errorMessage.length">{{
<span class="isa-input-warning" *ngIf="!!errorMessage.length">{{
errorMessage
}}</span>
<button

2
apps/sales/src/app/modules/shelf/pages/shelf-search/search/search-input.component.ts
View File

@@ -48,7 +48,7 @@ import { isNullOrUndefined } from 'util';
})
export class ShelfSearchInputComponent
implements OnInit, AfterViewInit, OnDestroy {
NO_RESULT_ERROR_MESSAGE = 'Ergibt keine Suchergebnisse';
NO_RESULT_ERROR_MESSAGE = 'Keine Suchergebnisse';
GENERAL_ERROR_MESSAGE = 'Ein Fehler ist aufgetreten';
@Input() allowScan = false;

1
apps/sales/src/scss/_variables.scss
View File

@@ -19,6 +19,7 @@ $isa-customer: #557596;
$isa-customer-light: #a3b4c8;
$isa-customer-active: #59647a;
$isa-customer-active: #1f466c;
$isa-neutral-info: #be8100;
/* LAYOUT */
$layout-border-radius: 5px;

10
apps/sales/src/scss/modules/_input.scss
View File

@@ -26,7 +26,7 @@
}
&.error {
width: 35%;
width: 30%;
}
}
@@ -74,6 +74,14 @@
animation: errorShake 0.3s cubic-bezier(0.7, 0.07, 0.19, 0.97) both;
}
.isa-input-warning {
color: $isa-neutral-info;
font-size: 20px;
font-weight: 700;
line-height: 28px;
animation: errorShake 0.3s cubic-bezier(0.7, 0.07, 0.19, 0.97) both;
}
@keyframes errorShake {
10% {
transform: translate3d(-1px, 0, 0);