mirror of
https://github.com/bitwarden/browser
synced 2025-12-10 05:13:29 +00:00
[CL-641][Defect][Web] More spacing defects including self-host environment (#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
This commit is contained in:
@@ -12,7 +12,7 @@
|
|||||||
></app-org-subscription-hidden>
|
></app-org-subscription-hidden>
|
||||||
|
|
||||||
<ng-container *ngIf="subscription && firstLoaded">
|
<ng-container *ngIf="subscription && firstLoaded">
|
||||||
<dl>
|
<dl class="tw-mb-2">
|
||||||
<dt>{{ "billingPlan" | i18n }}</dt>
|
<dt>{{ "billingPlan" | i18n }}</dt>
|
||||||
<dd>{{ subscription.planName }}</dd>
|
<dd>{{ subscription.planName }}</dd>
|
||||||
<ng-container *ngIf="billingSyncSetUp">
|
<ng-container *ngIf="billingSyncSetUp">
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
}}
|
}}
|
||||||
<div
|
<div
|
||||||
*ngIf="subscription.hasSeparateGracePeriod && !subscription.isInTrial"
|
*ngIf="subscription.hasSeparateGracePeriod && !subscription.isInTrial"
|
||||||
class="tw-text-muted"
|
class="tw-text-muted tw-break-words tw-whitespace-normal tw-max-w-fit tw-inline-block"
|
||||||
>
|
>
|
||||||
{{
|
{{
|
||||||
"selfHostGracePeriodHelp"
|
"selfHostGracePeriodHelp"
|
||||||
@@ -61,6 +61,7 @@
|
|||||||
href="{{ this.cloudWebVaultUrl }}"
|
href="{{ this.cloudWebVaultUrl }}"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noreferrer"
|
rel="noreferrer"
|
||||||
|
class="tw-mb-4"
|
||||||
>
|
>
|
||||||
{{ "launchCloudSubscription" | i18n }}
|
{{ "launchCloudSubscription" | i18n }}
|
||||||
</a>
|
</a>
|
||||||
@@ -93,7 +94,7 @@
|
|||||||
</bit-hint>
|
</bit-hint>
|
||||||
</bit-radio-button>
|
</bit-radio-button>
|
||||||
<ng-container *ngIf="updateMethod === licenseOptions.SYNC">
|
<ng-container *ngIf="updateMethod === licenseOptions.SYNC">
|
||||||
<div class="tw-mt-6">
|
<div class="tw-mt-6 tw-flex tw-gap-2">
|
||||||
<button
|
<button
|
||||||
bitButton
|
bitButton
|
||||||
buttonType="secondary"
|
buttonType="secondary"
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
<p bitTypography="body1">{{ "uploadLicenseFileOrg" | i18n }}</p>
|
<p bitTypography="body1" class="tw-break-words tw-whitespace-normal tw-mb-8">
|
||||||
|
{{ "uploadLicenseFileOrg" | i18n }}
|
||||||
|
</p>
|
||||||
<form [formGroup]="form" [bitSubmit]="submit">
|
<form [formGroup]="form" [bitSubmit]="submit">
|
||||||
<bit-form-field>
|
<bit-form-field>
|
||||||
<bit-label>{{ description | i18n }}</bit-label>
|
<bit-label>{{ description | i18n }}</bit-label>
|
||||||
<div>
|
<div class="tw-my-1">
|
||||||
<button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
|
<button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
|
||||||
{{ "chooseFile" | i18n }}
|
{{ "chooseFile" | i18n }}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<form [formGroup]="updateLicenseForm" [bitSubmit]="submit">
|
<form [formGroup]="updateLicenseForm" [bitSubmit]="submit">
|
||||||
<bit-form-field>
|
<bit-form-field>
|
||||||
<bit-label *ngIf="showAutomaticSyncAndManualUpload">{{ "licenseFile" | i18n }}</bit-label>
|
<bit-label *ngIf="showAutomaticSyncAndManualUpload">{{ "licenseFile" | i18n }}</bit-label>
|
||||||
<div class="tw-pb-1 tw-pt-2">
|
<div class="tw-pb-1 tw-pt-2 tw-flex tw-items-center tw-gap-3">
|
||||||
<button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
|
<button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
|
||||||
{{ "chooseFile" | i18n }}
|
{{ "chooseFile" | i18n }}
|
||||||
</button>
|
</button>
|
||||||
{{ this.licenseFile ? this.licenseFile.name : ("noFileChosen" | i18n) }}
|
<span>{{ this.licenseFile ? this.licenseFile.name : ("noFileChosen" | i18n) }}</span>
|
||||||
</div>
|
</div>
|
||||||
<input
|
<input
|
||||||
bitInput
|
bitInput
|
||||||
@@ -24,17 +24,19 @@
|
|||||||
: "bitwarden_organization_license.json")
|
: "bitwarden_organization_license.json")
|
||||||
}}</bit-hint>
|
}}</bit-hint>
|
||||||
</bit-form-field>
|
</bit-form-field>
|
||||||
<button type="submit" buttonType="primary" bitButton bitFormButton>
|
<div class="tw-flex tw-gap-2 tw-mt-4">
|
||||||
{{ "submit" | i18n }}
|
<button type="submit" buttonType="primary" bitButton bitFormButton>
|
||||||
</button>
|
{{ "submit" | i18n }}
|
||||||
<button
|
</button>
|
||||||
bitButton
|
<button
|
||||||
*ngIf="showCancel"
|
bitButton
|
||||||
bitFormButton
|
*ngIf="showCancel"
|
||||||
buttonType="secondary"
|
bitFormButton
|
||||||
type="button"
|
buttonType="secondary"
|
||||||
[bitAction]="cancel"
|
type="button"
|
||||||
>
|
[bitAction]="cancel"
|
||||||
{{ "cancel" | i18n }}
|
>
|
||||||
</button>
|
{{ "cancel" | i18n }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
Reference in New Issue
Block a user