Skip to content

Issue SB-31128 fix: close btn alignment #3228

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

Merged
merged 3 commits into from
Nov 9, 2022
Merged

Issue SB-31128 fix: close btn alignment #3228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a6a1e1
Issue SB-31128 fix: close btn alignment
Nov 3, 2022
ee410b1
Issue
vpPavithra Nov 7, 2022
baea19e
Issue
vpPavithra Nov 7, 2022
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
2 changes: 1 addition & 1 deletion src/app/profile-settings/profile-settings.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ion-content class="padding-bottom-if-header">
<div class="">
<form [formGroup]="profileSettingsForm" class="ps-container">
<div role="button" aria-label="back" (click)="handleBackButton(true)" [ngClass]="{ 'back-btn-container': platform.is('android'), 'back-btn-container-ios': platform.is('ios')}">
<div role="button" aria-label="back" (click)="handleBackButton(true)" class='back-btn-container'>
<img src="assets/imgs/ic_back_black.svg" *ngIf="!hideBackButton && !(showQRScanner && isInitialScreen)"
class="top-back-button" alt="back">
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/user-type-selection/user-type-selection.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ion-content class="ion-padding" [ngClass]="{ 'ui-container': !platform.is('ios') }">
<div class="ui-container" *ngIf="platform.is('ios')"></div>
<div class="ui-container-ios" *ngIf="platform.is('ios')"></div>
<div class="ui-content">
<div class="back-btn-container" (click)="handleBackButton(true)" role="button" aria-label="back">
<img src="assets/imgs/ic_back_black.svg" *ngIf="!hideBackButton && !categoriesProfileData"
Expand Down
47 changes: 45 additions & 2 deletions src/assets/styles/component/_sb-popover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,49 @@
}
}

// ios
.sb-popover-header.ios {
border-radius: 4px 4px 0 0;
background-color: $info-color;
&::after {
background-image: none;
}
.sb-popover-toolbar {
min-height: 2.5rem;
max-height: 2.5rem;
background-color: $info-color;
border-radius: 4px 4px 0 0;
// @include padding(($base-block-space * 0.5), ($base-block-space * 1));
.toolbar-background {
border-radius: 4px 4px 0 0;
background-color: $info-color;
}
.sb-popover-close-btn {
color: $white-color;
}
.sb-popover-title {
font-size: ($font-size-base);
font-weight: bold;
//@extend line-height: 19px;
text-align: center;
color: $white-color;
@include padding(0);
// @include padding(0, ($base-block-space * 5) ,0,0);
}
}
.sb-modal-close {
position: absolute;
right: 0.313rem;
width: 1.25rem;
height: 1.25rem;
display: flex;
top: -1.125rem;
text-align: center;
justify-content: center;
align-items: center;
}
}

.ios .sb-popover-header {
margin-top: calc(constant(safe-area-inset-top)); //ios 11.2
margin-top: calc(env(safe-area-inset-top)); //ios 11.1
Expand Down Expand Up @@ -177,7 +220,7 @@
.sb-popover-header-ios {
border-radius: 4px 4px 0 0;
background-color: $info-color;
padding-top: 40px;

&::after {
background-image: none;
}
Expand Down Expand Up @@ -210,7 +253,7 @@
width: 1.25rem;
height: 1.25rem;
display: flex;
top: -0.125rem;
top: -1.125rem;
text-align: center;
justify-content: center;
align-items: center;
Expand Down
3 changes: 2 additions & 1 deletion src/assets/styles/themeable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,11 +1786,12 @@ html[data-theme="JOYFUL"]{
&::after {
content: '';
width: 100%;
height: 3.125rem;
height: 10.75rem;
display: block;
position: absolute;
z-index: 0;
top: 0;
left: 0;
border-bottom-left-radius: 20px;
background-color: var(--app-primary-header) !important;
background-image: url(/assets/imgs/header-background.svg);
Expand Down