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/consistency with button animations #2351

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix/consistency with button animations #2351

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb0dbc3
Can't create the a ripple effect for card-portrait, will contact team…
kwAsant Jul 8, 2024
554f33d
fix: ensured that ripple effect is consistent for card-portrait and b…
kwAsant Jul 9, 2024
d3cea39
fix: added ripple effect to tiles however uncertain on if this is req…
kwAsant Jul 9, 2024
96cea77
fix: Removed ripple effect from the tile.
kwAsant Jul 9, 2024
05659a1
fix: Adding changes as requested by Johnny
kwAsant Jul 15, 2024
356e638
Merge branch 'master' into fix/consistency_with_button_animations
esmeetewinkel Jul 16, 2024
98b75a4
fix: Consistency of ripple effects have been made consistent across t…
kwAsant Aug 28, 2024
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
5 changes: 4 additions & 1 deletion src/app/shared/components/template/components/button/button.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,18 @@
[attr.data-rowname]="_row.name"
></plh-template-component>
</span>
<ion-ripple-effect></ion-ripple-effect>
Copy link
Collaborator

Choose a reason for hiding this comment

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

The card variant already had a ripple effect, so this can be removed as it is redundant

</ion-button>

<!-- "card-portrait" variant. This variant is not achievable using an ion-button -->
<div
*ngSwitchCase="true"
class="button-container"
class="button-container ion-activatable"
(click)="triggerActions('click')"
[attr.data-variant]="params.variant"
[attr.data-has-children]="_row.rows ? true : false"
>
<ion-ripple-effect type="unbound"></ion-ripple-effect>
kwAsant marked this conversation as resolved.
Show resolved Hide resolved
<img *ngIf="params.image" src="{{ params.image | plhAsset }}" />
<div *ngIf="_row.value" [class]="'button-text ' + params.textAlign">
{{ _row.value }}
Expand All @@ -47,6 +49,7 @@
[parent]="parent"
[attr.data-rowname]="_row.name"
></plh-template-component>
<ion-ripple-effect></ion-ripple-effect>
Copy link
Collaborator

Choose a reason for hiding this comment

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

This can be removed – the button itself already has a ripple effect applied by line 39

</span>
</div>
</ng-container>
1 change: 1 addition & 0 deletions src/app/shared/components/template/components/button/button.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ ion-button[data-variant~="card"] {
padding: 1.5rem 0.5rem 0.5rem;
// TODO: make a variable
width: 160px;
overflow: hidden;

&:active {
background-color: var(--ion-color-gray-light);
Expand Down
3 changes: 2 additions & 1 deletion src/app/shared/components/template/components/tile-component/tile-component.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div [class]="style" class="tile-wrapper default_style" (click)="triggerActions('click')">
<div [class]="style" class="tile-wrapper default_style ion-activatable" (click)="triggerActions('click')">
<div *ngIf="left_icon_src" class="left-icon">
<ion-icon *ngIf="!isCustomIcon" [name]="left_icon_src"></ion-icon>
</div>
Expand All @@ -24,6 +24,7 @@
alt=""
/>
<ion-icon *ngIf="!isCustomIcon" [name]="icon_src"></ion-icon>
<ion-ripple-effect></ion-ripple-effect>
</ion-button>
</div>
</div>
3 changes: 2 additions & 1 deletion src/app/shared/components/template/components/tile-component/tile-component.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $background-secondary-light: var(
--box-shadow: none;

box-shadow: none;
--ripple-color: transparent;
// --ripple-color: transparent; // why was this there?
kwAsant marked this conversation as resolved.
Show resolved Hide resolved
img {
width: 60px;
height: 60px;
Expand All @@ -61,6 +61,7 @@ $background-secondary-light: var(
box-shadow: var(--ion-default-box-shadow);
min-height: var(--tile-default-height);
border-radius: var(--ion-border-radius-standard);
overflow: hidden;
}

/***********************************************************************************************
Expand Down
Loading