Skip to content

Commit a5a5da1

Browse files
authored
Merge pull request #585 from neo4j-labs/task/fixDarkThemeMore
Other Theme Fixes
2 parents e3e4f14 + 2c890ee commit a5a5da1

File tree

7 files changed

+33
-19
lines changed

7 files changed

+33
-19
lines changed

docs/modules/ROOT/pages/user-guide/reports/pie-chart.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ slice.
7373
|Margin Left (px) |number |50 |The margin in pixels on the left side of
7474
the visualization.
7575

76-
|Margin Right (px) |number |24 |The margin in pixels on the right side
76+
|Margin Right (px) |number |50 |The margin in pixels on the right side
7777
of the visualization.
7878

79-
|Margin Top (px) |number |24 |The margin in pixels on the top side of
79+
|Margin Top (px) |number |50 |The margin in pixels on the top side of
8080
the visualization.
8181

82-
|Margin Bottom (px) |number |40 |The margin in pixels on the bottom side
82+
|Margin Bottom (px) |number |50 |The margin in pixels on the bottom side
8383
of the visualization.
8484

8585
|Hide Selections |on/off |off |If enabled, hides the property selector

src/card/settings/CardSettings.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ const NeoCardSettings = ({
9191
);
9292

9393
return (
94-
<div className={`card-view n-bg-palette-neutral-bg-weak ${expanded ? 'expanded' : ''} n-overflow-y-auto n-h-full`}>
94+
<div
95+
className={`card-view n-bg-palette-neutral-bg-weak n-text-palette-neutral-text-default ${
96+
expanded ? 'expanded' : ''
97+
} n-overflow-y-auto n-h-full`}
98+
>
9599
{cardSettingsHeader}
96100
<ReportItemContainer style={{ height: reportHeight }} className='-n-mt-2'>
97101
{cardSettingsContent}

src/card/view/CardView.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,9 @@ const NeoCardView = ({
213213

214214
return (
215215
<div
216-
className={`card-view n-bg-palette-neutral-bg-weak ${expanded ? 'expanded' : ''}`}
216+
className={`card-view n-bg-palette-neutral-bg-weak n-text-palette-neutral-text-default ${
217+
expanded ? 'expanded' : ''
218+
}`}
217219
style={settings && settings.backgroundColor ? { backgroundColor: settings.backgroundColor } : {}}
218220
>
219221
{reportHeader}

src/card/view/CardViewHeader.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ const NeoCardViewHeader = ({
7171
text: {
7272
primary: 'rgb(var(--palette-neutral-text))',
7373
},
74+
action: {
75+
disabled: 'rgb(var(--palette-neutral-text-weak))',
76+
},
7477
},
7578
});
7679

@@ -103,7 +106,7 @@ const NeoCardViewHeader = ({
103106
onBlur={() => {
104107
setEditing(false);
105108
}}
106-
className={'n-text-palette-neutral-text-default no-underline large'}
109+
className={'no-underline large'}
107110
label=''
108111
disabled={!editable}
109112
placeholder='Report name...'
@@ -117,6 +120,11 @@ const NeoCardViewHeader = ({
117120
size={'small'}
118121
style={{ paddingTop: '0px important!' }}
119122
variant={'standard'}
123+
sx={{
124+
'& .MuiInputBase-input.Mui-disabled': {
125+
WebkitTextFillColor: 'inherit',
126+
},
127+
}}
120128
/>
121129
</td>
122130
</tr>

src/chart/Utils.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ export const themeNivo = {
121121
textColor: 'rgb(var(--palette-neutral-text-default))',
122122
text: { fill: 'rgb(var(--palette-neutral-text-default))' },
123123
axis: {
124-
ticks: { text: { fill: 'rgb(var(--palette-light-neutral-text-default))' } },
124+
ticks: { text: { fill: 'rgb(var(--palette-neutral-text-default))' } },
125125
legend: { text: { fill: 'rgb(var(--palette-neutral-text-default))' } },
126126
},
127127
legends: {
128-
text: { fill: 'rgb(var(--palette-neutral-text-weak))' },
129-
title: { text: { fill: 'rgb(var(--palette-neutral-text-weak))' } },
130-
ticks: { text: { fill: 'rgb(var(--palette-neutral-text-weak))' } },
131-
hidden: { text: { fill: 'rgb(var(--palette-neutral-text-weak))' } },
128+
text: { fill: 'rgb(var(--palette-neutral-text-default))' },
129+
title: { text: { fill: 'rgb(var(--palette-neutral-text-default))' } },
130+
ticks: { text: { fill: 'rgb(var(--palette-neutral-text-default))' } },
131+
hidden: { text: { fill: 'rgb(var(--palette-neutral-text-default))' } },
132132
},
133133
markers: {
134134
text: { fill: 'rgb(var(--palette-neutral-text-default))' },

src/chart/pie/PieChart.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ const NeoPieChart = (props: ChartProps) => {
7373
const settings = props.settings ? props.settings : {};
7474
const legendHeight = 20;
7575
// TODO to retrieve all defaults from the ReportConfig.ts file instead of hardcoding them in the file
76-
const marginRight = settings.marginRight ? settings.marginRight : 24;
77-
const marginLeft = settings.marginLeft ? settings.marginLeft : 24;
78-
const marginTop = settings.marginTop ? settings.marginTop : 24;
79-
const marginBottom = settings.marginBottom ? settings.marginBottom : 40;
76+
const marginRight = settings.marginRight ? settings.marginRight : 50;
77+
const marginLeft = settings.marginLeft ? settings.marginLeft : 50;
78+
const marginTop = settings.marginTop ? settings.marginTop : 50;
79+
const marginBottom = settings.marginBottom ? settings.marginBottom : 50;
8080
const sortByValue = settings.sortByValue ? settings.sortByValue : false;
8181
const enableArcLabels = settings.enableArcLabels !== undefined ? settings.enableArcLabels : true;
8282
const enableArcLinkLabels = settings.enableArcLinkLabels !== undefined ? settings.enableArcLinkLabels : true;

src/config/ReportConfig.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,22 +606,22 @@ export const REPORT_TYPES = {
606606
marginLeft: {
607607
label: 'Margin Left (px)',
608608
type: SELECTION_TYPES.NUMBER,
609-
default: 24,
609+
default: 50,
610610
},
611611
marginRight: {
612612
label: 'Margin Right (px)',
613613
type: SELECTION_TYPES.NUMBER,
614-
default: 24,
614+
default: 50,
615615
},
616616
marginTop: {
617617
label: 'Margin Top (px)',
618618
type: SELECTION_TYPES.NUMBER,
619-
default: 24,
619+
default: 50,
620620
},
621621
marginBottom: {
622622
label: 'Margin Bottom (px)',
623623
type: SELECTION_TYPES.NUMBER,
624-
default: 40,
624+
default: 50,
625625
},
626626
refreshButtonEnabled: {
627627
label: 'Refreshable',

0 commit comments

Comments
 (0)