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

[CL-349] Allow @apply styles to be used in CL css (#13414)

This commit is contained in:
Vicki League
2025-02-20 12:56:22 -05:00
committed by GitHub
parent 3924bc9c84
commit 657902cdcc
11 changed files with 71 additions and 25 deletions

View File

@@ -1,4 +1,9 @@
/* eslint-disable no-undef, @typescript-eslint/no-require-imports */
module.exports = {
plugins: [require("tailwindcss"), require("autoprefixer"), require("postcss-nested")],
plugins: [
require("postcss-import"),
require("postcss-nested"),
require("tailwindcss"),
require("autoprefixer"),
],
};

View File

@@ -1,9 +1,9 @@
@import "../../../../../libs/components/src/tw-theme.css";
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "../../../../../libs/components/src/tw-theme.css";
@layer components {
/** Safari Support */
html.browser_safari .tw-styled-scrollbar::-webkit-scrollbar {

View File

@@ -49,7 +49,13 @@ const moduleRules = [
loader: MiniCssExtractPlugin.loader,
},
"css-loader",
"postcss-loader",
"resolve-url-loader",
{
loader: "postcss-loader",
options: {
sourceMap: true,
},
},
],
},
{
@@ -59,7 +65,13 @@ const moduleRules = [
loader: MiniCssExtractPlugin.loader,
},
"css-loader",
"sass-loader",
"resolve-url-loader",
{
loader: "sass-loader",
options: {
sourceMap: true,
},
},
],
},
{

View File

@@ -1,4 +1,9 @@
/* eslint-disable @typescript-eslint/no-require-imports, no-undef */
module.exports = {
plugins: [require("tailwindcss"), require("autoprefixer"), require("postcss-nested")],
plugins: [
require("postcss-import"),
require("postcss-nested"),
require("tailwindcss"),
require("autoprefixer"),
],
};

View File

@@ -1,5 +1,5 @@
@import "../../../../libs/components/src/tw-theme.css";
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "../../../../libs/components/src/tw-theme.css";

View File

@@ -121,7 +121,13 @@ const renderer = {
loader: MiniCssExtractPlugin.loader,
},
"css-loader",
"postcss-loader",
"resolve-url-loader",
{
loader: "postcss-loader",
options: {
sourceMap: true,
},
},
],
},
{
@@ -134,7 +140,13 @@ const renderer = {
},
},
"css-loader",
"sass-loader",
"resolve-url-loader",
{
loader: "sass-loader",
options: {
sourceMap: true,
},
},
],
},
// Hide System.import warnings. ref: https://github.com/angular/angular/issues/21560

View File

@@ -1,4 +1,9 @@
/* eslint-disable @typescript-eslint/no-require-imports, no-undef */
module.exports = {
plugins: [require("tailwindcss"), require("autoprefixer"), require("postcss-nested")],
plugins: [
require("postcss-import"),
require("postcss-nested"),
require("tailwindcss"),
require("autoprefixer"),
],
};

View File

@@ -1,9 +1,8 @@
@import "../../../../libs/components/src/tw-theme.css";
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "../../../../libs/components/src/tw-theme.css";
/*
* Web specific global styling.
*

View File

@@ -49,7 +49,13 @@ const moduleRules = [
loader: MiniCssExtractPlugin.loader,
},
"css-loader",
"sass-loader",
"resolve-url-loader",
{
loader: "sass-loader",
options: {
sourceMap: true,
},
},
],
},
{
@@ -59,7 +65,13 @@ const moduleRules = [
loader: MiniCssExtractPlugin.loader,
},
"css-loader",
"postcss-loader",
"resolve-url-loader",
{
loader: "postcss-loader",
options: {
sourceMap: true,
},
},
],
},
{

View File

@@ -1,5 +1,5 @@
@import "~ngx-toastr/toastr";
@import "./toast.tokens.css";
@import "ngx-toastr/toastr";
/* Override all default styles from `ngx-toaster` */
.toast-container .ngx-toastr {

View File

@@ -1,4 +1,9 @@
@import "@angular/cdk/a11y-prebuilt.css";
@import "./reset.css";
@import "./popover/popover.component.css";
@import "./toast/toast.tokens.css";
@import "./toast/toastr.css";
@import "./search/search.component.css";
:root {
--color-transparent-hover: rgb(0 0 0 / 0.02);
@@ -194,15 +199,6 @@
--tw-ring-offset-color: #002b36;
}
/** Used by CDK a11y services */
@import "@angular/cdk/a11y-prebuilt.css";
@import "./popover/popover.component.css";
@import "./search/search.component.css";
@import "./toast/toast.tokens.css";
@import "./toast/toastr.css";
/**
* tw-break-words does not work with table cells:
* https://github.com/tailwindlabs/tailwindcss/issues/835