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

[CL-836] Extract base css variables (#14733)

* Extract base variables

* Get tw to consume font css variables
This commit is contained in:
Oscar Hinton
2025-08-29 10:43:38 +02:00
committed by GitHub
parent 774505a89a
commit 63af0ad711
9 changed files with 31 additions and 32 deletions

View File

@@ -1,4 +1,3 @@
@import "../../../../../libs/angular/src/scss/webfonts.css";
@import "../../../../../libs/angular/src/scss/bwicons/styles/style.scss";
@import "variables.scss";
@import "../../../../../libs/angular/src/scss/icons.scss";

View File

@@ -1,4 +1,3 @@
@import "../../../../libs/angular/src/scss/webfonts.css";
@import "../../../../libs/angular/src/scss/bwicons/styles/style.scss";
@import "@angular/cdk/overlay-prebuilt.css";
@import "variables.scss";

View File

@@ -1,6 +1,5 @@
@import "./variables";
@import "../../../../libs/angular/src/scss/webfonts.css";
@import "../../../../libs/angular/src/scss/bwicons/styles/style.scss";
@import "../../../../libs/angular/src/scss/icons.scss";
@import "../../../../libs/components/src/multi-select/scss/bw.theme";

View File

@@ -1,8 +0,0 @@
@font-face {
font-family: Roboto;
src:
url("webfonts/roboto.woff2") format("woff2 supports variations"),
url("webfonts/roboto.woff2") format("woff2-variations");
font-display: swap;
font-weight: 100 900;
}

View File

@@ -3,7 +3,6 @@ $card-icons-base: "../../src/billing/images/cards/";
@import "./variables";
@import "../../angular/src/scss/webfonts.css";
@import "../../angular/src/scss/bwicons/styles/style.scss";
@import "../../angular/src/scss/icons.scss";
@import "multi-select/scss/bw.theme.scss";

View File

@@ -0,0 +1,27 @@
/**
* This file contains CSS variables that can be used across frontend systems.
* This allows us to share styling between Angular, content scripts and more.
*/
/**
* Font faces
*/
@font-face {
font-family: Roboto;
src:
url("~@bitwarden/components/src/webfonts/roboto.woff2") format("woff2 supports variations"),
url("~@bitwarden/components/src/webfonts/roboto.woff2") format("woff2-variations");
font-display: swap;
font-weight: 100 900;
}
/**
* CSS variables
*/
:root {
--font-sans:
Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
"Segoe UI Symbol", "Noto Color Emoji";
--font-serif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
--font-mono: Menlo, SFMono-Regular, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
}

View File

@@ -1,3 +1,4 @@
@import "theme.css";
@import "@angular/cdk/a11y-prebuilt.css";
@import "@angular/cdk/text-field-prebuilt.css";
@import "./reset.css";

View File

@@ -138,26 +138,9 @@ module.exports = {
},
},
fontFamily: {
sans: [
"Roboto",
'"Helvetica Neue"',
"Helvetica",
"Arial",
"sans-serif",
'"Apple Color Emoji"',
'"Segoe UI Emoji"',
'"Segoe UI Symbol"',
],
serif: ["ui-serif", "Georgia", "Cambria", '"Times New Roman"', "Times", "serif"],
mono: [
"Menlo",
"SFMono-Regular",
"Monaco",
"Consolas",
'"Liberation Mono"',
'"Courier New"',
"monospace",
],
sans: "var(--font-sans)",
serif: "var(--font-serif)",
mono: "var(--font-mono)",
},
ringOffsetColor: ({ theme }) => ({
DEFAULT: theme("colors.background"),