Skip to content

Commit 19ee3d5

Browse files
committed
style(upgrades): Improve formatting of recommended plans and other fixes.
1 parent e53115a commit 19ee3d5

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

src/app/account-app/account-upgrades.component.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ <h1 style="margin: 10px 0 20px 0">One extra year for free!</h1>
9898
{{ plan.name.replace('Runbox', '') }}
9999
</mat-card-title>
100100
<mat-card-subtitle [ngClass]="{'themePaletteDarkGray': plan.over_quota.length > 0}">
101-
<h4><span *ngIf="current_sub && current_sub.pid == plan.pid"> Your current subscription </span></h4>
101+
<h4><span *ngIf="current_sub && current_sub.pid == plan.pid">Your current subscription</span></h4>
102102
</mat-card-subtitle>
103103
<mat-card-content>
104104
<div>
@@ -125,7 +125,7 @@ <h4 *ngFor="let us of addon_usages">
125125
</mat-card-content>
126126
<div *ngIf="plan.over_quota.length > 0">
127127
Your usage is too great for this plan:
128-
<ul>
128+
<ul class="overQuota">
129129
<li *ngFor="let oq of plan.over_quota">
130130
<span *ngIf="oq.type === 'bytes'">{{ (oq.current / 1024 / 1024 / 1024) | number:'1.2-2' }} GB {{ oq.quota }} used, while {{ (oq.allowed / 1024 / 1024 / 1024) | number:'1.2-2' }} GB </span>
131131
<span *ngIf="oq.type !== 'bytes'">{{ oq.current }} {{ oq.quota }} used, while {{ oq.allowed }}</span>
@@ -222,16 +222,17 @@ <h4 *ngFor="let us of addon_usages">
222222
<td class="planComponent priceForOneYear">Price for 1 year</td>
223223
<td *ngFor="let plan of subs_regular" class="oneYear">
224224
<div>
225-
{{ plan.currency }} {{ plan.price }} <span *ngIf="current_sub && current_sub.pid == plan.pid"> Your current {{ plan.type }} </span>
225+
{{ plan.currency }} {{ plan.price }}<br />
226226
</div>
227227
<div>
228228
<button mat-raised-button
229229
[color]="plan.is_downgrade ? 'accent' : 'primary'"
230230
(click)="orderMainProduct(plan.pid,1)"
231-
class="purchaseButton {{ plan.name.replace('Runbox', '') }}"
231+
class="purchaseButton {{ plan.name.replace('Runbox', '') }} {{ plan.over_quota.length > 0 ? 'themePaletteDarkGray' : '' }}"
232232
>
233233
{{ plan.is_downgrade ? 'Downgrade' : plan.is_upgrade ? 'Upgrade' : 'Select' }}
234-
</button>
234+
</button><br />
235+
<span *ngIf="current_sub && current_sub.pid == plan.pid"> Your current {{ plan.type }} </span>
235236
</div>
236237
</td>
237238
</tr>
@@ -246,8 +247,9 @@ <h4 *ngFor="let us of addon_usages">
246247
class="purchaseButton {{ plan.name.replace('Runbox', '') }}"
247248
>
248249
{{ plan.is_downgrade ? 'Downgrade' : plan.is_upgrade ? 'Upgrade' : 'Select' }}
249-
250250
</button>
251+
<br />
252+
<span *ngIf="current_sub && current_sub.pid == plan.pid"> Your current {{ plan.type }} </span>
251253
<div class="threeYearDifference">
252254
Save {{ plan.currency }} {{ plan.price * 3 - subs_three[i].price | number: '1.2-2' }}
253255
</div>

src/app/account-app/account-upgrades.component.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
}
3939

4040
.productCardFeatured {
41-
height: 450px;
41+
min-height: 450px;
4242
width: 30%;
4343
min-width: 250px;
4444
margin-right: 2%;
4545
padding: 0;
4646
text-align: center;
4747

4848
mat-card-title {
49-
padding: 10px 0;
49+
padding: 12px 0 8px 0;
5050
color: white;
5151
}
5252

@@ -91,6 +91,13 @@ ul.planComponents {
9191
}
9292

9393

94+
ul.overQuota {
95+
padding-left: 25px;
96+
text-align: left;
97+
list-style-type: square;
98+
font-size: 0.9em;
99+
}
100+
94101
#pricePlans {
95102
width: 100%;
96103
}

0 commit comments

Comments
 (0)