bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-10 05:13:29 +00:00
Code Issues Releases Wiki Activity

[CL-351] Prevent tw-group styling conflicts by namespacing (#12261)

Browse Source
This commit is contained in:
Victoria League
2024-12-09 15:13:42 -05:00
committed by GitHub
parent 9c1e2ebd67
commit 4daba832a2
7 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
View File

@@ -350,7 +350,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
switch (cardState) { switch (cardState) {
case PlanCardState.Selected: { case PlanCardState.Selected: {
return [ return [
"tw-group",
"tw-cursor-pointer", "tw-cursor-pointer",
"tw-block", "tw-block",
"tw-rounded", "tw-rounded",

4
apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html
View File

@@ -17,12 +17,12 @@
? 'tw-bg-primary-600 tw-font-bold !tw-text-contrast tw-ring-offset-2 hover:tw-bg-primary-600' ? 'tw-bg-primary-600 tw-font-bold !tw-text-contrast tw-ring-offset-2 hover:tw-bg-primary-600'
: '' : ''
" "
class="tw-group tw-flex tw-h-24 tw-w-28 tw-flex-col tw-items-center tw-justify-center tw-rounded tw-p-1 tw-text-primary-600 tw-outline-none hover:tw-bg-background-alt hover:tw-text-primary-700 hover:tw-no-underline focus-visible:!tw-ring-2 focus-visible:!tw-ring-primary-700" class="tw-group/product-link tw-flex tw-h-24 tw-w-28 tw-flex-col tw-items-center tw-justify-center tw-rounded tw-p-1 tw-text-primary-600 tw-outline-none hover:tw-bg-background-alt hover:tw-text-primary-700 hover:tw-no-underline focus-visible:!tw-ring-2 focus-visible:!tw-ring-primary-700"
ariaCurrentWhenActive="page" ariaCurrentWhenActive="page"
> >
<i class="bwi {{ product.icon }} tw-text-4xl !tw-m-0 !tw-mb-1"></i> <i class="bwi {{ product.icon }} tw-text-4xl !tw-m-0 !tw-mb-1"></i>
<span <span
class="tw-max-w-24 tw-text-center tw-text-sm tw-leading-snug group-hover:tw-underline" class="tw-max-w-24 tw-text-center tw-text-sm tw-leading-snug group-hover/product-link:tw-underline"
>{{ product.name }}</span >{{ product.name }}</span
> >
</a> </a>

2
apps/web/src/app/settings/domain-rules.component.html
View File

@@ -54,7 +54,7 @@
</p> </p>
<bit-table *ngIf="!loading && global.length > 0"> <bit-table *ngIf="!loading && global.length > 0">
<ng-template body> <ng-template body>
<tr bitRow *ngFor="let d of global" class="tw-group"> <tr bitRow *ngFor="let d of global">
<td bitCell [ngClass]="{ 'table-list-strike': d.excluded }">{{ d.domains }}</td> <td bitCell [ngClass]="{ 'table-list-strike': d.excluded }">{{ d.domains }}</td>
<td bitCell> <td bitCell>
<button <button

2
bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html
View File

@@ -22,7 +22,7 @@
<div class="tw-relative"> <div class="tw-relative">
<div <div
*ngIf="planCard.selected" *ngIf="planCard.selected"
class="tw-bg-primary-600 tw-text-center !tw-text-contrast tw-text-sm tw-font-bold tw-py-1 group-hover:tw-bg-primary-700" class="tw-bg-primary-600 tw-text-center !tw-text-contrast tw-text-sm tw-font-bold tw-py-1 group-hover/plan-card-container:tw-bg-primary-700"
> >
{{ "selected" | i18n }} {{ "selected" | i18n }}
</div> </div>

2
bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts
View File

@@ -69,7 +69,7 @@ export class CreateClientDialogComponent implements OnInit {
switch (selected) { switch (selected) {
case true: { case true: {
return [ return [
"tw-group", "tw-group/plan-card-container",
"tw-cursor-pointer", "tw-cursor-pointer",
"tw-block", "tw-block",
"tw-rounded", "tw-rounded",

2
libs/components/src/layout/layout.component.html
View File

@@ -13,7 +13,7 @@
> >
</nav> </nav>
</div> </div>
<div class="tw-group tw-flex tw-w-full"> <div class="tw-flex tw-w-full">
<ng-content select="bit-side-nav, [slot=side-nav]"></ng-content> <ng-content select="bit-side-nav, [slot=side-nav]"></ng-content>
<main <main
[id]="mainContentId" [id]="mainContentId"

1
libs/components/src/table/sortable.component.ts
View File

@@ -99,7 +99,6 @@ export class SortableComponent implements OnInit {
get classList() { get classList() {
return [ return [
"tw-group",
"tw-min-w-max", "tw-min-w-max",
// Offset to border and padding // Offset to border and padding