1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-06 00:13:28 +00:00

[Cl-726] layout spacing updates (#15979)

This commit is contained in:
Will Martin
2025-09-19 11:32:30 -04:00
committed by GitHub
parent 792f7e9c55
commit cf929edb9c
14 changed files with 12 additions and 37 deletions

View File

@@ -12,7 +12,6 @@
<ng-container *ngIf="freeTrialWhenWarningsServiceDisabled$ | async as freeTrial"> <ng-container *ngIf="freeTrialWhenWarningsServiceDisabled$ | async as freeTrial">
<bit-banner <bit-banner
id="free-trial-banner" id="free-trial-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
icon="bwi-billing" icon="bwi-billing"
bannerType="premium" bannerType="premium"
[showClose]="false" [showClose]="false"
@@ -33,7 +32,6 @@
<ng-container *ngIf="resellerWarningWhenWarningsServiceDisabled$ | async as resellerWarning"> <ng-container *ngIf="resellerWarningWhenWarningsServiceDisabled$ | async as resellerWarning">
<bit-banner <bit-banner
id="reseller-warning-banner" id="reseller-warning-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
icon="bwi-billing" icon="bwi-billing"
bannerType="info" bannerType="info"
[showClose]="false" [showClose]="false"

View File

@@ -20,13 +20,7 @@
@let freeTrial = freeTrialWhenWarningsServiceDisabled$ | async; @let freeTrial = freeTrialWhenWarningsServiceDisabled$ | async;
@if (!refreshing && freeTrial?.shownBanner) { @if (!refreshing && freeTrial?.shownBanner) {
<bit-banner <bit-banner id="free-trial-banner" icon="bwi-billing" bannerType="premium" [showClose]="false">
id="free-trial-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
icon="bwi-billing"
bannerType="premium"
[showClose]="false"
>
{{ freeTrial.message }} {{ freeTrial.message }}
<a <a
bitLink bitLink
@@ -44,7 +38,6 @@
@if (!refreshing && resellerWarning) { @if (!refreshing && resellerWarning) {
<bit-banner <bit-banner
id="reseller-warning-banner" id="reseller-warning-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
icon="bwi-billing" icon="bwi-billing"
bannerType="info" bannerType="info"
[showClose]="false" [showClose]="false"

View File

@@ -140,11 +140,7 @@
</app-side-nav> </app-side-nav>
<ng-container *ngIf="organization$ | async as organization"> <ng-container *ngIf="organization$ | async as organization">
<bit-banner <bit-banner *ngIf="organization.isProviderUser" [showClose]="false">
*ngIf="organization.isProviderUser"
[showClose]="false"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
>
{{ "accessingUsingProvider" | i18n: organization.providerName }} {{ "accessingUsingProvider" | i18n: organization.providerName }}
</bit-banner> </bit-banner>
<app-tax-id-warning <app-tax-id-warning

View File

@@ -1,6 +1,5 @@
<bit-banner <bit-banner
id="free-trial-banner" id="free-trial-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
bannerType="premium" bannerType="premium"
icon="bwi-billing" icon="bwi-billing"
[showClose]="false" [showClose]="false"

View File

@@ -16,7 +16,6 @@ import { OrganizationFreeTrialWarning } from "../types";
@if (warning) { @if (warning) {
<bit-banner <bit-banner
id="free-trial-banner" id="free-trial-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
icon="bwi-billing" icon="bwi-billing"
bannerType="premium" bannerType="premium"
[showClose]="false" [showClose]="false"

View File

@@ -16,7 +16,6 @@ import { OrganizationResellerRenewalWarning } from "../types";
@if (warning) { @if (warning) {
<bit-banner <bit-banner
id="reseller-warning-banner" id="reseller-warning-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
icon="bwi-billing" icon="bwi-billing"
bannerType="info" bannerType="info"
[showClose]="false" [showClose]="false"

View File

@@ -1,6 +1,5 @@
<bit-banner <bit-banner
id="free-trial-banner" id="free-trial-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
bannerType="premium" bannerType="premium"
icon="bwi-billing" icon="bwi-billing"
[showClose]="false" [showClose]="false"

View File

@@ -90,12 +90,7 @@ type GetWarning$ = () => Observable<TaxIdWarningType | null>;
@let view = view$ | async; @let view = view$ | async;
@if (view) { @if (view) {
<bit-banner <bit-banner id="tax-id-warning-banner" bannerType="warning" (onClose)="trackDismissal()">
id="tax-id-warning-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
bannerType="warning"
(onClose)="trackDismissal()"
>
{{ view.message }} {{ view.message }}
<a <a
bitLink bitLink

View File

@@ -1,6 +1,6 @@
<header <header
*ngIf="routeData$ | async as routeData" *ngIf="routeData$ | async as routeData"
class="-tw-m-6 tw-mb-3 tw-flex tw-flex-col tw-p-6" class="-tw-mt-6 -tw-mx-8 tw-mb-3 tw-flex tw-flex-col tw-py-6 tw-px-8"
[ngClass]="{ [ngClass]="{
'tw-border-0 tw-border-b tw-border-solid tw-border-secondary-100 tw-bg-background-alt tw-pb-0': 'tw-border-0 tw-border-b tw-border-solid tw-border-secondary-100 tw-bg-background-alt tw-pb-0':
tabsContainer.childElementCount !== 0, tabsContainer.childElementCount !== 0,

View File

@@ -1,6 +1,5 @@
<bit-banner <bit-banner
id="free-trial-banner" id="free-trial-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
bannerType="premium" bannerType="premium"
icon="bwi-billing" icon="bwi-billing"
[showClose]="false" [showClose]="false"
@@ -20,7 +19,6 @@
<bit-banner <bit-banner
id="update-browser-banner" id="update-browser-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
bannerType="warning" bannerType="warning"
*ngIf="visibleBanners.includes(VisibleVaultBanner.OutdatedBrowser)" *ngIf="visibleBanners.includes(VisibleVaultBanner.OutdatedBrowser)"
(onClose)="dismissBanner(VisibleVaultBanner.OutdatedBrowser)" (onClose)="dismissBanner(VisibleVaultBanner.OutdatedBrowser)"
@@ -39,7 +37,6 @@
<bit-banner <bit-banner
id="kdf-settings-banner" id="kdf-settings-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
bannerType="warning" bannerType="warning"
*ngIf="visibleBanners.includes(VisibleVaultBanner.KDFSettings)" *ngIf="visibleBanners.includes(VisibleVaultBanner.KDFSettings)"
(onClose)="dismissBanner(VisibleVaultBanner.KDFSettings)" (onClose)="dismissBanner(VisibleVaultBanner.KDFSettings)"
@@ -52,7 +49,6 @@
<bit-banner <bit-banner
id="pending-auth-request-banner" id="pending-auth-request-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
bannerType="info" bannerType="info"
icon="bwi-info-circle" icon="bwi-info-circle"
*ngIf="visibleBanners.includes(VisibleVaultBanner.PendingAuthRequest)" *ngIf="visibleBanners.includes(VisibleVaultBanner.PendingAuthRequest)"
@@ -67,14 +63,12 @@
<app-verify-email <app-verify-email
id="verify-email-banner" id="verify-email-banner"
*ngIf="visibleBanners.includes(VisibleVaultBanner.VerifyEmail)" *ngIf="visibleBanners.includes(VisibleVaultBanner.VerifyEmail)"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
(onDismiss)="dismissBanner(VisibleVaultBanner.VerifyEmail)" (onDismiss)="dismissBanner(VisibleVaultBanner.VerifyEmail)"
(onVerified)="dismissBanner(VisibleVaultBanner.VerifyEmail)" (onVerified)="dismissBanner(VisibleVaultBanner.VerifyEmail)"
></app-verify-email> ></app-verify-email>
<bit-banner <bit-banner
id="premium-banner" id="premium-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
bannerType="premium" bannerType="premium"
*ngIf="premiumBannerVisible$ | async" *ngIf="premiumBannerVisible$ | async"
(onClose)="dismissBanner(VisibleVaultBanner.Premium)" (onClose)="dismissBanner(VisibleVaultBanner.Premium)"

View File

@@ -1,7 +1,6 @@
<ng-container *ngIf="freeTrial$ | async as freeTrial"> <ng-container *ngIf="freeTrial$ | async as freeTrial">
<bit-banner <bit-banner
id="update-browser-banner" id="update-browser-banner"
class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"
bannerType="premium" bannerType="premium"
icon="bwi-billing" icon="bwi-billing"
[showClose]="false" [showClose]="false"

View File

@@ -27,6 +27,11 @@ const defaultIcon: Record<BannerType, string> = {
selector: "bit-banner", selector: "bit-banner",
templateUrl: "./banner.component.html", templateUrl: "./banner.component.html",
imports: [CommonModule, IconButtonModule, I18nPipe], imports: [CommonModule, IconButtonModule, I18nPipe],
host: {
// Account for bit-layout's padding
class:
"tw-flex tw-flex-col [bit-layout_&]:-tw-mx-8 [bit-layout_&]:-tw-my-6 [bit-layout_&]:tw-pb-6",
},
}) })
export class BannerComponent implements OnInit { export class BannerComponent implements OnInit {
readonly bannerType = input<BannerType>("info"); readonly bannerType = input<BannerType>("info");

View File

@@ -23,8 +23,9 @@
[id]="mainContentId" [id]="mainContentId"
tabindex="-1" tabindex="-1"
bitScrollLayoutHost bitScrollLayoutHost
class="tw-overflow-auto tw-max-h-screen tw-min-w-0 tw-flex-1 tw-bg-background tw-p-6 md:tw-ms-0 tw-ms-16" class="tw-overflow-auto tw-max-h-screen tw-min-w-0 tw-flex-1 tw-bg-background tw-p-8 tw-pt-6 md:tw-ms-0 tw-ms-16"
> >
<!-- ^ If updating this padding, also update the padding correction in bit-banner! ^ -->
<ng-content></ng-content> <ng-content></ng-content>
<!-- overlay backdrop for side-nav --> <!-- overlay backdrop for side-nav -->

View File

@@ -89,9 +89,7 @@ class KitchenSinkDialog {
selector: "bit-tab-main", selector: "bit-tab-main",
imports: [KitchenSinkSharedModule, KitchenSinkTable, KitchenSinkToggleList, KitchenSinkForm], imports: [KitchenSinkSharedModule, KitchenSinkTable, KitchenSinkToggleList, KitchenSinkForm],
template: ` template: `
<bit-banner bannerType="info" class="-tw-m-6 tw-flex tw-flex-col tw-pb-6"> <bit-banner bannerType="info"> Kitchen Sink test zone </bit-banner>
Kitchen Sink test zone
</bit-banner>
<p class="tw-mt-4"> <p class="tw-mt-4">
<bit-breadcrumbs> <bit-breadcrumbs>