Skip to content

Commit

Permalink
Merge pull request #2826 from travis-ci/release_240529
Browse files Browse the repository at this point in the history
Release 240528
  • Loading branch information
DominikAlberski authored May 28, 2024
2 parents ea98609 + aadc2c4 commit c4b85f4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
1 change: 1 addition & 0 deletions app/styles/app/layouts/profile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ header.legacy-services-integration {

section.billing {
font-size: $font-size-m;
border-bottom: 2px $pebble-grey solid;

.plan-status-message {
color: $asphalt-grey;
Expand Down
13 changes: 6 additions & 7 deletions app/templates/components/billing/summary-v2.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class='plan'>
<div>
<span class="payment-details-label plan-label-color">Current plan:</span>
<p class='plan-name flex flex--v-center' data-test-plan-name='true'>
<p class='plan-name flex flex--v-center' data-test-plan-name='true'>
{{#if this.subscription.plan}}
{{this.subscription.plan.name}}
{{else}}
Expand Down Expand Up @@ -61,7 +61,7 @@
Expired {{moment-format this.subscription.validTo "MMMM D, YYYY"}}
{{/if}}
</span>

</p>
{{#if this.subscription.isManual}}
<div class='plan-overview__description' data-test-plan-description>
Expand Down Expand Up @@ -94,7 +94,7 @@
</div>
</section>
{{/if}}

</div>
{{/if}}
{{#if this.subscription.isNotManual }}
Expand Down Expand Up @@ -133,9 +133,9 @@
{{/if}}
{{/if}}
</div>
{{#if this.showPlanInfo}}
{{#if this.showPlanInfo}}
<div class='float-right flex plan-price-container'>
<span class="payment-details-label plan-price-label">Total:</span>
<span class="payment-details-label plan-price-label">Total:</span>
<span class="plan-price-info">
{{#if (or this.subscription.plan.isFree this.subscription.plan.isTrial)}}
Free
Expand All @@ -145,12 +145,11 @@
</span>
</div>
{{/if}}
</div>
</div>
{{/if}}
<!-- </div> -->
</div>

<hr />
{{#if (and this.subscription.isStripe this.showPlanInfo)}}
{{#if this.subscription.hasUserLicenseAddons}}
<Billing::UserUsage @subscription={{this.subscription}} @account={{this.account}}/>
Expand Down

0 comments on commit c4b85f4

Please sign in to comment.