bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 09:43:23 +00:00
Code Issues Releases Wiki Activity

[AC-1418] Adjust labels and appearance to better match design

Browse Source
This commit is contained in:
Shane Melton
2023-06-22 14:21:21 -07:00
parent f1e9f96e27
commit 9100b05133
3 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
View File

@@ -151,7 +151,7 @@
> >
{{ "removeSponsorship" | i18n }} {{ "removeSponsorship" | i18n }}
</button> </button>
<h4 bitTypography="h4" class="tw-mt-9">{{ "storage" | i18n }}</h4> <h4 bitTypography="h4" class="tw-mt-7">{{ "storage" | i18n }}</h4>
<p bitTypography="body1"> <p bitTypography="body1">
{{ "subscriptionStorage" | i18n : sub.maxStorageGb || 0 : sub.storageName || "0 MB" }} {{ "subscriptionStorage" | i18n : sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}
</p> </p>
@@ -178,7 +178,7 @@
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="showAdjustSecretsManager"> <ng-container *ngIf="showAdjustSecretsManager">
<h3 bitTypography="h3" class="tw-mt-7">{{ "secretsManager" | i18n }}</h3> <h3 bitTypography="h3" class="tw-mt-9">{{ "secretsManager" | i18n }}</h3>
<app-sm-adjust-subscription <app-sm-adjust-subscription
[organizationId]="organizationId" [organizationId]="organizationId"
[options]="smOptions" [options]="smOptions"

12
apps/web/src/app/billing/organizations/secrets-manager/sm-adjust-subscription.component.html
View File

@@ -1,5 +1,5 @@
<form [formGroup]="formGroup" [bitSubmit]="submit"> <form [formGroup]="formGroup" [bitSubmit]="submit">
<bit-form-field class="tw-w-1/2"> <bit-form-field class="tw-w-2/3">
<bit-label>{{ "subscriptionSeats" | i18n }}</bit-label> <bit-label>{{ "subscriptionSeats" | i18n }}</bit-label>
<input bitInput id="smSeatCount" formControlName="seatCount" type="number" step="1" min="0" /> <input bitInput id="smSeatCount" formControlName="seatCount" type="number" step="1" min="0" />
<bit-hint> <bit-hint>
@@ -15,7 +15,7 @@
{{ "limitSmSubscriptionDesc" | i18n }} {{ "limitSmSubscriptionDesc" | i18n }}
</bit-hint> </bit-hint>
</bit-form-control> </bit-form-control>
<bit-form-field class="tw-w-1/2" *ngIf="formGroup.value.limitSeats"> <bit-form-field class="tw-w-2/3" *ngIf="formGroup.value.limitSeats">
<bit-label>{{ "maxSeatLimit" | i18n }}</bit-label> <bit-label>{{ "maxSeatLimit" | i18n }}</bit-label>
<input <input
bitInput bitInput
@@ -26,12 +26,12 @@
[min]="formGroup.value.seatCount" [min]="formGroup.value.seatCount"
/> />
<bit-hint> <bit-hint>
<strong>{{ "total" | i18n }}:</strong> <strong>{{ "maxSeatCost" | i18n }}:</strong>
{{ formGroup.value.seatLimit || 0 }} &times; {{ options.seatPrice | currency }} = {{ formGroup.value.seatLimit || 0 }} &times; {{ options.seatPrice | currency }} =
{{ maxSeatTotal | currency }} / {{ options.interval | i18n }} {{ maxSeatTotal | currency }} / {{ options.interval | i18n }}
</bit-hint> </bit-hint>
</bit-form-field> </bit-form-field>
<bit-form-field class="tw-w-1/2"> <bit-form-field class="tw-w-2/3">
<bit-label>{{ "additionalServiceAccounts" | i18n }}</bit-label> <bit-label>{{ "additionalServiceAccounts" | i18n }}</bit-label>
<input <input
bitInput bitInput
@@ -68,7 +68,7 @@
{{ "limitServiceAccountsDesc" | i18n }} {{ "limitServiceAccountsDesc" | i18n }}
</bit-hint> </bit-hint>
</bit-form-control> </bit-form-control>
<bit-form-field class="tw-w-1/2" *ngIf="formGroup.value.limitServiceAccounts"> <bit-form-field class="tw-w-2/3" *ngIf="formGroup.value.limitServiceAccounts">
<bit-label>{{ "serviceAccountLimit" | i18n }}</bit-label> <bit-label>{{ "serviceAccountLimit" | i18n }}</bit-label>
<input <input
bitInput bitInput
@@ -79,7 +79,7 @@
[min]="formGroup.value.serviceAccountCount" [min]="formGroup.value.serviceAccountCount"
/> />
<bit-hint> <bit-hint>
<strong>{{ "total" | i18n }}:</strong> <strong>{{ "maxServiceAccountCost" | i18n }}:</strong>
{{ formGroup.value.serviceAccountLimit || 0 }} &times; {{ formGroup.value.serviceAccountLimit || 0 }} &times;
{{ options.additionalServiceAccountPrice | currency }} = {{ options.additionalServiceAccountPrice | currency }} =
{{ maxServiceAccountTotal | currency }} / {{ options.interval | i18n }} {{ maxServiceAccountTotal | currency }} / {{ options.interval | i18n }}

6
apps/web/src/locales/en/messages.json
View File

@@ -404,8 +404,7 @@
"viewItem": { "viewItem": {
"message": "View item" "message": "View item"
}, },
"new": "new": {
{
"message": "New", "message": "New",
"description": "for adding new items" "description": "for adding new items"
}, },
@@ -6927,6 +6926,9 @@
"serviceAccountLimit": { "serviceAccountLimit": {
"message": "Service account limit (optional)" "message": "Service account limit (optional)"
}, },
"maxServiceAccountCost": {
"message": "Max potential service account cost"
},
"additionalServiceAccountsDesc": { "additionalServiceAccountsDesc": {
"message": "Your plan comes with $COUNT$ service accounts. You can add additional service accounts for $COST$ per month.", "message": "Your plan comes with $COUNT$ service accounts. You can add additional service accounts for $COST$ per month.",
"placeholders": { "placeholders": {