diff --git a/packages/canon/src/components/Box/styles.css b/packages/canon/src/components/Box/styles.css index f3b24793cf..7a01d5aa3a 100644 --- a/packages/canon/src/components/Box/styles.css +++ b/packages/canon/src/components/Box/styles.css @@ -1,4 +1,5 @@ .canon-Box { font-family: var(--canon-font-regular); + font-weight: var(--canon-font-weight-regular); color: var(--canon-fg-primary); } diff --git a/packages/canon/src/components/Checkbox/styles.css b/packages/canon/src/components/Checkbox/styles.css index 386c6f4671..f026740698 100644 --- a/packages/canon/src/components/Checkbox/styles.css +++ b/packages/canon/src/components/Checkbox/styles.css @@ -24,6 +24,7 @@ gap: var(--canon-space-2); font-size: var(--canon-font-size-xs); font-family: var(--canon-font-regular); + font-weight: var(--canon-font-weight-regular); color: var(--canon-fg-primary); user-select: none; diff --git a/packages/canon/src/components/Input/Input.styles.css b/packages/canon/src/components/Input/Input.styles.css index fa196cfa20..4e3e6771ab 100644 --- a/packages/canon/src/components/Input/Input.styles.css +++ b/packages/canon/src/components/Input/Input.styles.css @@ -20,6 +20,7 @@ padding: 0 var(--canon-space-4); background-color: var(--canon-bg-elevated); font-size: var(--canon-font-size-3); + font-family: var(--canon-font-regular); font-weight: var(--canon-font-weight-regular); color: var(--canon-fg-primary); transition: border-color 0.2s ease-in-out, outline-color 0.2s ease-in-out; diff --git a/packages/canon/src/components/Table/styles.css b/packages/canon/src/components/Table/styles.css index 6bb470a423..b834485ff5 100644 --- a/packages/canon/src/components/Table/styles.css +++ b/packages/canon/src/components/Table/styles.css @@ -7,6 +7,8 @@ padding-bottom: var(--canon-space-0_5); padding-top: var(--canon-space-0_5); font-size: var(--canon-font-size-3); + font-family: var(--canon-font-regular); + font-weight: var(--canon-font-weight-regular); table { width: 100%; diff --git a/packages/canon/src/css/base.css b/packages/canon/src/css/base.css deleted file mode 100644 index b8bd0c4f81..0000000000 --- a/packages/canon/src/css/base.css +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2024 The Backstage Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -@import './normalize.css'; - -@layer base { - *, - html, - body { - font-family: var(--canon-font-regular); - font-weight: var(--canon-font-weight-regular); - } -} diff --git a/packages/canon/src/css/core.css b/packages/canon/src/css/core.css index cc0e5ab85a..ded8fcaa6e 100644 --- a/packages/canon/src/css/core.css +++ b/packages/canon/src/css/core.css @@ -15,7 +15,7 @@ */ /* Normalize */ -@import './base.css'; +@import './normalize.css'; @import './utilities.css'; /* Light theme tokens */