Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(select): change arrow trigger position to absolute #60

Merged
merged 7 commits into from
Jul 1, 2019
Merged

fix(select): change arrow trigger position to absolute #60

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e0ac7d
fix(select): change arrow position to absolute
efux Jun 26, 2019
5c2d885
fix(select): change test results
efux Jun 26, 2019
3d2f847
fix(select): remove debug outputs
efux Jun 26, 2019
892c4f8
Merge remote-tracking branch 'origin/master' into feature/business-se…
efux Jun 26, 2019
1b45149
fix(select): change gray color to fit style guide
efux Jun 26, 2019
94f6f65
fix(business/select): calculate 5k based on base values
efux Jun 28, 2019
5c6274d
fix(select): change position of arrow when using native select
efux Jun 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion projects/sbb-esta/angular-public/src/lib/autocomplete/styles/_autocomplete-variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ $autocompleteColor: $sbbColorGrey;
$autocompleteInputActiveBorderBottomColor: $sbbColorCloud;

@if $sbbBusiness {
$autocompleteBorder: 1px solid $sbbColorGrey;
$autocompleteBorder: 1px solid $sbbColorGranite;
$autocompleteShadow: 0 4px 0 rgba(0, 0, 0, 0.15);
$autocompleteShadowReverse: 0 -4px 0 rgba(0, 0, 0, 0.15);
$autocompleteColor: $sbbColorGranite;
}

$autocompleteBorderTopReverse: $autocompleteBorder;
4 changes: 4 additions & 0 deletions projects/sbb-esta/angular-public/src/lib/option/styles/_option-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
@if $selectMode == true {
cursor: default;
color: $sbbColorGrey;

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

&:first-of-type {
Expand Down
4 changes: 2 additions & 2 deletions projects/sbb-esta/angular-public/src/lib/select/select/select.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2370,7 +2370,7 @@ describe('SelectComponent', () => {
);

const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
expect(pane.style.minWidth).toEqual('330px');
expect(pane.style.minWidth).toEqual('362px');

expect(fixture.componentInstance.select.panelOpen).toBe(true);
expect(overlayContainerElement.textContent).toContain('Steak');
Expand Down Expand Up @@ -2530,7 +2530,7 @@ describe('SelectComponent', () => {
fixture.detectChanges();

const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
expect(pane.style.minWidth).toBe('230px');
expect(pane.style.minWidth).toBe('262px');
});
});

Expand Down
37 changes: 35 additions & 2 deletions projects/sbb-esta/angular-public/src/lib/select/styles/_select-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,21 @@
@mixin selectBase {
.sbb-select-trigger {
@include inputfields;
position: relative;
cursor: pointer;
display: flex;
align-items: center;
padding-right: $selectTriggerPaddingRight;
padding-right: toPx($selectTriggerPaddingRight);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

padding-right should also be applied for native select.


@include publicOnly() {
@include mq($from: desktop4k) {
padding-right: toPx($selectTriggerPaddingRight * $scalingFactor4k);
}

@include mq($from: desktop5k) {
padding-right: 92px;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Usually the desktop5k variant is simply calculated with the $scalingFactor5k. Why is this not the case here?

}
}

&[aria-expanded='true'] {
@include autocompleteInputActive();
Expand All @@ -29,23 +40,45 @@
}

.sbb-select-arrow-wrapper {
@include svgIconColor($sbbColorGrey);
@include absoluteCenterY();
right: toPx($selectArrowRight);

width: toPx($selectArrowWidthHeight);
height: toPx($selectArrowWidthHeight);

@include publicOnly() {
@include svgIconColor($sbbColorGrey);

@include mq($from: desktop4k) {
right: toPx($selectArrowRight * $scalingFactor4k);
width: toPx($selectArrowWidthHeight * $scalingFactor4k);
height: toPx($selectArrowWidthHeight * $scalingFactor4k);
}

@include mq($from: desktop5k) {
right: 28px;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same question as for padding-right.

width: toPx($selectArrowWidthHeight * $scalingFactor5k);
height: toPx($selectArrowWidthHeight * $scalingFactor5k);
}
}

@include businessOnly() {
@include svgIconColor($sbbColorGranite);
}

&-rotate {
transform-origin: toPx($selectArrowWidthHeight / 2) toPx($selectArrowWidthHeight / 4);

@include publicOnly() {
@include mq($from: desktop4k) {
transform-origin: toPx($selectArrowWidthHeight * $scalingFactor4k / 2) toPx($selectArrowWidthHeight * $scalingFactor4k / 4);
}

@include mq($from: desktop5k) {
transform-origin: toPx($selectArrowWidthHeight * $scalingFactor5k / 2) toPx($selectArrowWidthHeight * $scalingFactor5k / 4);
}
}

transform: rotate(180deg);
}
}
Expand Down
6 changes: 4 additions & 2 deletions projects/sbb-esta/angular-public/src/lib/select/styles/_select-variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

$selectMaxWidth: 480;
$selectArrowWidthHeight: 24;
$selectTriggerPaddingRight: 12px;
$selectArrowRight: 12;
$selectTriggerPaddingRight: 44;

@if $sbbBusiness {
$selectTriggerPaddingRight: 6px;
$selectTriggerPaddingRight: 38;
$selectArrowRight: 6;
}
1 change: 1 addition & 0 deletions projects/sbb-esta/angular-public/src/styles/common/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@

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

&:focus {
border-color: $sbbColorGranite;
Expand Down