Skip to content

fix(theme): set correct background and text color for panels #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 26, 2024
Merged

fix(theme): set correct background and text color for panels #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a85bc5
fix(theme): set correct background and text color for panels
SamVerschueren Jun 25, 2024
0f8732f
Merge branch 'main' into fix/theme/panel-background-and-text
SamVerschueren Jun 25, 2024
078f726
Merge branch 'main' into fix/theme/panel-background-and-text
d3lm Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/demo/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ export const theme: ConfigBase['theme'] = {
},
panel: {
backgroundColor: 'var(--tk-elements-panel-backgroundColor)',
textColor: 'var(--tk-elements-panel-textColor)',
header: {
backgroundColor: 'var(--tk-elements-panel-header-backgroundColor)',
textColor: 'var(--tk-elements-panel-header-textColor)',
Expand Down
1 change: 1 addition & 0 deletions packages/astro/src/default/styles/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@

/* Panel */
--tk-elements-panel-backgroundColor: var(--tk-elements-app-backgroundColor);
--tk-elements-panel-textColor: var(--tk-elements-app-textColor);

/* Panel > Header */
--tk-elements-panel-header-backgroundColor: var(--tk-background-secondary);
Expand Down
1 change: 1 addition & 0 deletions packages/astro/src/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ export const theme: ConfigBase['theme'] = {
},
panel: {
backgroundColor: 'var(--tk-elements-panel-backgroundColor)',
textColor: 'var(--tk-elements-panel-textColor)',
header: {
backgroundColor: 'var(--tk-elements-panel-header-backgroundColor)',
textColor: 'var(--tk-elements-panel-header-textColor)',
Expand Down
7 changes: 1 addition & 6 deletions packages/components/react/src/BootScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@ export function BootScreen({ className, tutorialStore }: Props) {
const steps = useStore(tutorialStore.steps);

return (
<div
className={classNames(
'flex-grow w-full flex justify-center items-center text-sm bg-tk-elements-app-backgroundColor text-tk-elements-app-textColor',
className,
)}
>
<div className={classNames('flex-grow w-full flex justify-center items-center text-sm', className)}>
{steps ? (
<ul className="space-y-1">
{steps.map((step, index) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/components/react/src/Panels/EditorPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export function EditorPanel({
}, [id]);

return (
<PanelGroup className="bg-tk-elements-app-backgroundColor" direction="horizontal">
<PanelGroup className="bg-tk-elements-panel-backgroundColor" direction="horizontal">
<Panel className="flex flex-col" collapsible defaultSize={0} minSize={10} ref={fileTreePanelRef}>
<div className="panel-header border-r border-b border-tk-elements-app-borderColor">
<div className="panel-title">
Expand Down
2 changes: 1 addition & 1 deletion packages/components/react/src/Panels/PreviewPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const PreviewPanel = memo(

if (!hasPreviews) {
return (
<div className="flex flex-col h-full w-full">
<div className="panel-container bg-tk-elements-panel-backgroundColor text-tk-elements-panel-textColor">
<div className="panel-header border-b border-tk-elements-app-borderColor justify-between">
<div className="panel-title">
<div className="panel-icon i-ph-lightning-duotone"></div>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/react/src/Panels/TerminalPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function TerminalPanel({ theme, tutorialStore }: TerminalPanelProps) {
}, []);

return (
<div className="panel-container bg-tk-elements-app-backgroundColor">
<div className="panel-container bg-tk-elements-panel-backgroundColor text-tk-elements-panel-textColor">
<div className="panel-tabs-header overflow-x-hidden">
<div className="panel-title w-full">
<ul
Expand Down
3 changes: 2 additions & 1 deletion packages/components/react/src/Panels/WorkspacePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ export function WorkspacePanel({ tutorialStore, theme }: Props) {
maxSize={hasEditor ? 100 : 0}
collapsible={!hasEditor}
ref={editorPanelRef}
className="bg-tk-elements-panel-backgroundColor text-tk-elements-panel-textColor"
>
<EditorPanel
id={tutorialStore.ref}
Expand Down Expand Up @@ -209,7 +210,7 @@ export function WorkspacePanel({ tutorialStore, theme }: Props) {
onExpand={() => {
terminalExpanded.current = true;
}}
className={classNames({
className={classNames('bg-tk-elements-panel-backgroundColor text-tk-elements-panel-textColor', {
'border-t border-tk-elements-app-borderColor': hasPreviews,
})}
>
Expand Down