Skip to content

Commit

Permalink
fix(business/field): change gray color to fit style guide (#55)
Browse files Browse the repository at this point in the history
  • Loading branch information
efux authored and kyubisation committed Jun 25, 2019
1 parent 977fb78 commit fd3b6b4
Showing 1 changed file with 26 additions and 8 deletions.
34 changes: 26 additions & 8 deletions projects/sbb-esta/angular-public/src/styles/common/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,16 @@
display: none;
}

&:focus {
border-color: $sbbColorGrey;
}

@include businessOnly() {
border-width: 1px;

&:focus {
border-color: $sbbColorGranite;
}
}

@include publicOnly() {
Expand All @@ -67,10 +75,6 @@
}
}

&:focus {
border-color: $sbbColorGrey;
}

&.ng-touched.ng-invalid:not([aria-expanded='true']) {
color: $sbbColorError;
border-color: $sbbColorError;
Expand Down Expand Up @@ -102,18 +106,28 @@
line-height: pxToRem(16);
display: block;

@include mq($from: desktop4k) {
font-size: pxToRem(13 * $scalingFactor4k);
@include businessOnly() {
color: $sbbColorGranite;
}

@include mq($from: desktop5k) {
font-size: pxToRem(13 * $scalingFactor5k);
@include publicOnly() {
@include mq($from: desktop4k) {
font-size: pxToRem(13 * $scalingFactor4k);
}

@include mq($from: desktop5k) {
font-size: pxToRem(13 * $scalingFactor5k);
}
}
}

@mixin formlabel {
color: $sbbColorGrey;
font-size: pxToEm(13);

@include businessOnly() {
color: $sbbColorGranite;
}
}

@mixin inputField() {
Expand All @@ -129,5 +143,9 @@

&:focus {
border-color: $sbbColorGrey;

@include businessOnly() {
border-color: $sbbColorGranite;
}
}
}

0 comments on commit fd3b6b4

Please sign in to comment.