mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-04-01 02:41:39 -05:00
Fixed AdminX CSS scoping to prevent overriding old admin styles (#18523)
refs https://github.com/TryGhost/Product/issues/3832 Tailwind raises errors if you try to use `important: '.admin-x-settings'` and have custom styles for `.admin-x-settings`, hence adding a new base class. We should sort these out when we extract the design system. --- <!-- Leave the line below if you'd like GitHub Copilot to generate a summary from your commit --> <!-- copilot:summary --> ### <samp>🤖 Generated by Copilot at 1ddddf1</samp> Scoped base and theme styles to the `admin-x-settings` app by adding a class to the app root element and updating the `index.css` file. This improves the app's isolation and reduces code duplication.
This commit is contained in:
parent
49dc6f8cdc
commit
3680c16362
2 changed files with 33 additions and 37 deletions
|
@ -40,7 +40,7 @@ const queryClient = new QueryClient({
|
|||
|
||||
function App({ghostVersion, officialThemes, zapierTemplates, externalNavigate, darkMode = false, unsplashConfig, fetchKoenigLexical, sentryDSN, onUpdate, onInvalidate, onDelete}: AppProps) {
|
||||
const appClassName = clsx(
|
||||
'admin-x-settings h-[100vh] w-full overflow-y-auto overflow-x-hidden',
|
||||
'admin-x-settings admin-x-base h-[100vh] w-full overflow-y-auto overflow-x-hidden',
|
||||
darkMode && 'dark'
|
||||
);
|
||||
|
||||
|
|
|
@ -12,41 +12,42 @@
|
|||
font-weight: 100 900;
|
||||
}
|
||||
|
||||
body {
|
||||
@apply font-sans text-black text-base leading-normal;
|
||||
}
|
||||
.admin-x-base {
|
||||
& {
|
||||
@apply font-sans text-black text-base leading-normal;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
@apply font-bold tracking-tight leading-tighter;
|
||||
}
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
@apply font-bold tracking-tight leading-tighter;
|
||||
}
|
||||
|
||||
h1 {
|
||||
@apply text-4xl leading-supertight;
|
||||
}
|
||||
h1 {
|
||||
@apply text-4xl leading-supertight;
|
||||
}
|
||||
|
||||
h2 {
|
||||
@apply text-2xl;
|
||||
}
|
||||
h2 {
|
||||
@apply text-2xl;
|
||||
}
|
||||
|
||||
h3 {
|
||||
@apply text-xl;
|
||||
}
|
||||
h3 {
|
||||
@apply text-xl;
|
||||
}
|
||||
|
||||
h4 {
|
||||
@apply text-lg;
|
||||
}
|
||||
h4 {
|
||||
@apply text-lg;
|
||||
}
|
||||
|
||||
h5 {
|
||||
@apply text-md leading-supertight;
|
||||
}
|
||||
h5 {
|
||||
@apply text-md leading-supertight;
|
||||
}
|
||||
|
||||
h6 {
|
||||
@apply text-md leading-normal;
|
||||
h6 {
|
||||
@apply text-md leading-normal;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
:root {
|
||||
font-size: 62.5%;
|
||||
.admin-x-base {
|
||||
line-height: 1.5;
|
||||
-ms-text-size-adjust: 100%;
|
||||
-webkit-text-size-adjust: 100%;
|
||||
|
@ -55,31 +56,26 @@
|
|||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
-webkit-text-size-adjust: 100%;
|
||||
}
|
||||
|
||||
html, body, #root {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
letter-spacing: unset;
|
||||
}
|
||||
|
||||
.dark {
|
||||
.admin-x-base.dark {
|
||||
color: #FAFAFB;
|
||||
}
|
||||
|
||||
.dark .gh-loading-orb-container {
|
||||
.admin-x-base.dark .gh-loading-orb-container {
|
||||
background-color: #000000;
|
||||
}
|
||||
|
||||
.dark .gh-loading-orb {
|
||||
.admin-x-base.dark .gh-loading-orb {
|
||||
filter: invert(100%);
|
||||
}
|
||||
|
||||
.no-scrollbar::-webkit-scrollbar {
|
||||
.admin-x-base .no-scrollbar::-webkit-scrollbar {
|
||||
display: none; /* Chrome */
|
||||
}
|
||||
|
||||
.no-scrollbar {
|
||||
.admin-x-base .no-scrollbar {
|
||||
-ms-overflow-style: none; /* IE and Edge */
|
||||
scrollbar-width: none; /* Firefox */
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue