Skip to content
Snippets Groups Projects
Unverified Commit 9da05543 authored by Neil's avatar Neil Committed by GitHub
Browse files

Dark Theme color fixes (#2048)

* subdued fix

* notes

* fixes

* upcoming

* autocomplete menu

* make notes consistenet on budget page

* VRT updates
parent 8a721bf2
No related branches found
No related tags found
No related merge requests found
Showing
with 45 additions and 28 deletions
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -145,7 +145,7 @@ export default function NotesButton({ ...@@ -145,7 +145,7 @@ export default function NotesButton({
id, id,
width = 12, width = 12,
height = 12, height = 12,
defaultColor = theme.pageBackgroundModalActive, defaultColor = theme.buttonNormalText,
tooltipPosition, tooltipPosition,
style, style,
}: NotesButtonProps) { }: NotesButtonProps) {
......
...@@ -66,6 +66,7 @@ function SidebarCategory({ ...@@ -66,6 +66,7 @@ function SidebarCategory({
<View style={{ flexShrink: 0, marginLeft: 5 }}> <View style={{ flexShrink: 0, marginLeft: 5 }}>
<Button <Button
type="bare" type="bare"
className="hover-visible"
onClick={e => { onClick={e => {
e.stopPropagation(); e.stopPropagation();
setMenuOpen(true); setMenuOpen(true);
...@@ -112,6 +113,7 @@ function SidebarCategory({ ...@@ -112,6 +113,7 @@ function SidebarCategory({
<NotesButton <NotesButton
id={category.id} id={category.id}
style={dragging && { color: 'currentColor' }} style={dragging && { color: 'currentColor' }}
defaultColor={theme.pageTextLight}
/> />
</View> </View>
); );
...@@ -121,10 +123,15 @@ function SidebarCategory({ ...@@ -121,10 +123,15 @@ function SidebarCategory({
innerRef={innerRef} innerRef={innerRef}
style={{ style={{
width: 200, width: 200,
'& button': { display: 'none' }, overflow: 'hidden',
'& .hover-visible': {
display: 'none',
},
...(!dragging && ...(!dragging &&
!dragPreview && { !dragPreview && {
'&:hover button': { display: 'flex', color: theme.tableTextHover }, '&:hover .hover-visible': {
display: 'flex',
},
}), }),
...(dragging && { color: theme.formInputTextPlaceholderSelected }), ...(dragging && { color: theme.formInputTextPlaceholderSelected }),
// The zIndex here forces the the view on top of a row below // The zIndex here forces the the view on top of a row below
......
...@@ -95,6 +95,7 @@ function SidebarGroup({ ...@@ -95,6 +95,7 @@ function SidebarGroup({
<View style={{ marginLeft: 5, flexShrink: 0 }}> <View style={{ marginLeft: 5, flexShrink: 0 }}>
<Button <Button
type="bare" type="bare"
className="hover-visible"
onClick={e => { onClick={e => {
e.stopPropagation(); e.stopPropagation();
setMenuOpen(true); setMenuOpen(true);
...@@ -137,7 +138,11 @@ function SidebarGroup({ ...@@ -137,7 +138,11 @@ function SidebarGroup({
)} )}
</View> </View>
<View style={{ flex: 1 }} /> <View style={{ flex: 1 }} />
<NotesButton id={group.id} /> <NotesButton
id={group.id}
style={dragPreview && { color: 'currentColor' }}
defaultColor={theme.pageTextLight}
/>
</> </>
)} )}
</View> </View>
...@@ -150,8 +155,15 @@ function SidebarGroup({ ...@@ -150,8 +155,15 @@ function SidebarGroup({
...style, ...style,
width: 200, width: 200,
backgroundColor: theme.tableRowHeaderBackground, backgroundColor: theme.tableRowHeaderBackground,
'& button': { display: 'none' }, overflow: 'hidden',
'&:hover button': { display: 'flex', color: theme.tableTextHover }, '& .hover-visible': {
display: 'none',
},
...(!dragPreview && {
'&:hover .hover-visible': {
display: 'flex',
},
}),
...(dragPreview && { ...(dragPreview && {
paddingLeft: 10, paddingLeft: 10,
zIndex: 10000, zIndex: 10000,
......
...@@ -126,7 +126,7 @@ export default function BudgetSummary({ month }: BudgetSummaryProps) { ...@@ -126,7 +126,7 @@ export default function BudgetSummary({ month }: BudgetSummaryProps) {
width={15} width={15}
height={15} height={15}
tooltipPosition="bottom-right" tooltipPosition="bottom-right"
defaultColor={theme.pageTextSubdued} // notes page color defaultColor={theme.pageTextLight}
/> />
</View> </View>
<View style={{ userSelect: 'none' }}> <View style={{ userSelect: 'none' }}>
......
...@@ -429,8 +429,8 @@ export function FilterButton({ onApply, compact, hover }) { ...@@ -429,8 +429,8 @@ export function FilterButton({ onApply, compact, hover }) {
style={{ style={{
lineHeight: 1.5, lineHeight: 1.5,
padding: '6px 10px', padding: '6px 10px',
backgroundColor: theme.menuAutoCompleteBackground, backgroundColor: theme.menuBackground,
color: theme.menuAutoCompleteText, color: theme.menuItemText,
}} }}
> >
<Text>Filters</Text> <Text>Filters</Text>
......
...@@ -31,8 +31,8 @@ const GraphButton = ({ ...@@ -31,8 +31,8 @@ const GraphButton = ({
style={{ style={{
lineHeight: 1.5, lineHeight: 1.5,
padding: '6px 10px', padding: '6px 10px',
backgroundColor: theme.menuAutoCompleteBackground, backgroundColor: theme.menuBackground,
color: theme.menuAutoCompleteText, color: theme.menuItemText,
}} }}
> >
<Text>{title}</Text> <Text>{title}</Text>
......
...@@ -58,10 +58,8 @@ class Tooltip extends Component { ...@@ -58,10 +58,8 @@ class Tooltip extends Component {
borderRadius: 2, borderRadius: 2,
boxShadow: light ? 'none' : '0 1px 6px rgba(0, 0, 0, .20)', boxShadow: light ? 'none' : '0 1px 6px rgba(0, 0, 0, .20)',
// TODO: Transparent background // TODO: Transparent background
backgroundColor: light backgroundColor: light ? 'transparent' : theme.menuBackground,
? 'transparent' color: light ? 'inherit' : theme.menuItemText,
: theme.menuAutoCompleteBackground,
color: light ? 'inherit' : theme.menuAutoCompleteText,
padding: 10, padding: 10,
}, },
!light && !light &&
...@@ -71,7 +69,7 @@ class Tooltip extends Component { ...@@ -71,7 +69,7 @@ class Tooltip extends Component {
borderTop: '7px solid transparent', borderTop: '7px solid transparent',
borderBottom: '7px solid transparent', borderBottom: '7px solid transparent',
[position === 'right' ? 'borderRight' : 'borderLeft']: [position === 'right' ? 'borderRight' : 'borderLeft']:
'7px solid ' + theme.menuAutoCompleteBackground, '7px solid ' + theme.menuBackground,
[position === 'right' ? 'left' : 'right']: -6, [position === 'right' ? 'left' : 'right']: -6,
top: 'calc(50% - 7px)', top: 'calc(50% - 7px)',
// eslint-disable-next-line rulesdir/typography // eslint-disable-next-line rulesdir/typography
......
...@@ -50,8 +50,8 @@ const CustomTooltip = ({ ...@@ -50,8 +50,8 @@ const CustomTooltip = ({
pointerEvents: 'none', pointerEvents: 'none',
borderRadius: 2, borderRadius: 2,
boxShadow: '0 1px 6px rgba(0, 0, 0, .20)', boxShadow: '0 1px 6px rgba(0, 0, 0, .20)',
backgroundColor: theme.menuAutoCompleteBackground, backgroundColor: theme.menuBackground,
color: theme.menuAutoCompleteText, color: theme.menuItemText,
padding: 10, padding: 10,
})}`} })}`}
> >
......
...@@ -67,8 +67,8 @@ const CustomTooltip = ({ ...@@ -67,8 +67,8 @@ const CustomTooltip = ({
pointerEvents: 'none', pointerEvents: 'none',
borderRadius: 2, borderRadius: 2,
boxShadow: '0 1px 6px rgba(0, 0, 0, .20)', boxShadow: '0 1px 6px rgba(0, 0, 0, .20)',
backgroundColor: theme.menuAutoCompleteBackground, backgroundColor: theme.menuBackground,
color: theme.menuAutoCompleteText, color: theme.menuItemText,
padding: 10, padding: 10,
})}`} })}`}
> >
......
...@@ -44,8 +44,8 @@ const CustomTooltip = ({ active, payload, label }: CustomTooltipProps) => { ...@@ -44,8 +44,8 @@ const CustomTooltip = ({ active, payload, label }: CustomTooltipProps) => {
pointerEvents: 'none', pointerEvents: 'none',
borderRadius: 2, borderRadius: 2,
boxShadow: '0 1px 6px rgba(0, 0, 0, .20)', boxShadow: '0 1px 6px rgba(0, 0, 0, .20)',
backgroundColor: theme.menuAutoCompleteBackground, backgroundColor: theme.menuBackground,
color: theme.menuAutoCompleteText, color: theme.menuItemText,
padding: 10, padding: 10,
})}`} })}`}
> >
......
...@@ -50,8 +50,8 @@ const CustomTooltip = ({ active, payload, label }: CustomTooltipProps) => { ...@@ -50,8 +50,8 @@ const CustomTooltip = ({ active, payload, label }: CustomTooltipProps) => {
pointerEvents: 'none', pointerEvents: 'none',
borderRadius: 2, borderRadius: 2,
boxShadow: '0 1px 6px rgba(0, 0, 0, .20)', boxShadow: '0 1px 6px rgba(0, 0, 0, .20)',
backgroundColor: theme.menuAutoCompleteBackground, backgroundColor: theme.menuBackground,
color: theme.menuAutoCompleteText, color: theme.menuItemText,
padding: 10, padding: 10,
})}`} })}`}
> >
......
...@@ -43,8 +43,8 @@ const CustomTooltip = ({ active, payload, label }: CustomTooltipProps) => { ...@@ -43,8 +43,8 @@ const CustomTooltip = ({ active, payload, label }: CustomTooltipProps) => {
pointerEvents: 'none', pointerEvents: 'none',
borderRadius: 2, borderRadius: 2,
boxShadow: '0 1px 6px rgba(0, 0, 0, .20)', boxShadow: '0 1px 6px rgba(0, 0, 0, .20)',
backgroundColor: theme.menuAutoCompleteBackground, backgroundColor: theme.menuBackground,
color: theme.menuAutoCompleteText, color: theme.menuItemText,
padding: 10, padding: 10,
})}`} })}`}
> >
......
...@@ -79,8 +79,8 @@ function NetWorthGraph({ ...@@ -79,8 +79,8 @@ function NetWorthGraph({
pointerEvents: 'none', pointerEvents: 'none',
borderRadius: 2, borderRadius: 2,
boxShadow: '0 1px 6px rgba(0, 0, 0, .20)', boxShadow: '0 1px 6px rgba(0, 0, 0, .20)',
backgroundColor: theme.menuAutoCompleteBackground, backgroundColor: theme.menuBackground,
color: theme.menuAutoCompleteText, color: theme.menuItemText,
padding: 10, padding: 10,
}, },
style, style,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment