Skip to content

Commit 6cedef5

Browse files
[CL-641][Defect][Web] More spacing defects including self-host environment (bitwarden#16285)
* Fix the selfhost ui issue * Fix the text warp * Add more space with text and button * Push the upload file button space change * resolve the space issue
1 parent fe692ac commit 6cedef5

3 files changed

Lines changed: 25 additions & 20 deletions

File tree

apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
></app-org-subscription-hidden>
1313

1414
<ng-container *ngIf="subscription && firstLoaded">
15-
<dl>
15+
<dl class="tw-mb-2">
1616
<dt>{{ "billingPlan" | i18n }}</dt>
1717
<dd>{{ subscription.planName }}</dd>
1818
<ng-container *ngIf="billingSyncSetUp">
@@ -44,7 +44,7 @@
4444
}}
4545
<div
4646
*ngIf="subscription.hasSeparateGracePeriod && !subscription.isInTrial"
47-
class="tw-text-muted"
47+
class="tw-text-muted tw-break-words tw-whitespace-normal tw-max-w-fit tw-inline-block"
4848
>
4949
{{
5050
"selfHostGracePeriodHelp"
@@ -61,6 +61,7 @@
6161
href="{{ this.cloudWebVaultUrl }}"
6262
target="_blank"
6363
rel="noreferrer"
64+
class="tw-mb-4"
6465
>
6566
{{ "launchCloudSubscription" | i18n }}
6667
</a>
@@ -93,7 +94,7 @@ <h2 class="tw-mt-5">
9394
</bit-hint>
9495
</bit-radio-button>
9596
<ng-container *ngIf="updateMethod === licenseOptions.SYNC">
96-
<div class="tw-mt-6">
97+
<div class="tw-mt-6 tw-flex tw-gap-2">
9798
<button
9899
bitButton
99100
buttonType="secondary"

apps/web/src/app/billing/shared/self-hosting-license-uploader/self-hosting-license-uploader.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
<p bitTypography="body1">{{ "uploadLicenseFileOrg" | i18n }}</p>
1+
<p bitTypography="body1" class="tw-break-words tw-whitespace-normal tw-mb-8">
2+
{{ "uploadLicenseFileOrg" | i18n }}
3+
</p>
24
<form [formGroup]="form" [bitSubmit]="submit">
35
<bit-form-field>
46
<bit-label>{{ description | i18n }}</bit-label>
5-
<div>
7+
<div class="tw-my-1">
68
<button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
79
{{ "chooseFile" | i18n }}
810
</button>
Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<form [formGroup]="updateLicenseForm" [bitSubmit]="submit">
22
<bit-form-field>
33
<bit-label *ngIf="showAutomaticSyncAndManualUpload">{{ "licenseFile" | i18n }}</bit-label>
4-
<div class="tw-pb-1 tw-pt-2">
4+
<div class="tw-pb-1 tw-pt-2 tw-flex tw-items-center tw-gap-3">
55
<button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
66
{{ "chooseFile" | i18n }}
77
</button>
8-
{{ this.licenseFile ? this.licenseFile.name : ("noFileChosen" | i18n) }}
8+
<span>{{ this.licenseFile ? this.licenseFile.name : ("noFileChosen" | i18n) }}</span>
99
</div>
1010
<input
1111
bitInput
@@ -24,17 +24,19 @@
2424
: "bitwarden_organization_license.json")
2525
}}</bit-hint>
2626
</bit-form-field>
27-
<button type="submit" buttonType="primary" bitButton bitFormButton>
28-
{{ "submit" | i18n }}
29-
</button>
30-
<button
31-
bitButton
32-
*ngIf="showCancel"
33-
bitFormButton
34-
buttonType="secondary"
35-
type="button"
36-
[bitAction]="cancel"
37-
>
38-
{{ "cancel" | i18n }}
39-
</button>
27+
<div class="tw-flex tw-gap-2 tw-mt-4">
28+
<button type="submit" buttonType="primary" bitButton bitFormButton>
29+
{{ "submit" | i18n }}
30+
</button>
31+
<button
32+
bitButton
33+
*ngIf="showCancel"
34+
bitFormButton
35+
buttonType="secondary"
36+
type="button"
37+
[bitAction]="cancel"
38+
>
39+
{{ "cancel" | i18n }}
40+
</button>
41+
</div>
4042
</form>

0 commit comments

Comments
 (0)