Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

[Enhancement] adjust button color in light theme (#1004)

Shan He880b0784d7b1
diff --git a/src/components/common/icons/draw-polygon.js b/src/components/common/icons/draw-polygon.js
index 9f41e8926..4ed32bd8b 100644
--- a/src/components/common/icons/draw-polygon.js
+++ b/src/components/common/icons/draw-polygon.js
@@ -41,53 +41,19 @@ export default class DrawPolygon extends Component {
return (
<Base {...this.props}>
<path
- fillRule="evenodd"
- clipRule="evenodd"
d="M5 6L13 2L22 9L21 23L2 17L5 6Z"
stroke="currentColor"
fill="transparent"
strokeWidth="1.5"
/>
- <path
- fillRule="evenodd"
- clipRule="evenodd"
- d="M10 11C10.5523 11 11 10.5523 11 10C11 9.44772 10.5523 9 10 9C9.44772 9 9 9.44772 9 10C9 10.5523 9.44772 11 10 11Z"
- />
- <path
- fillRule="evenodd"
- clipRule="evenodd"
- d="M11.5 16C12.3284 16 13 15.3284 13 14.5C13 13.6716 12.3284 13 11.5 13C10.6716 13 10 13.6716 10 14.5C10 15.3284 10.6716 16 11.5 16Z"
- />
- <path
- fillRule="evenodd"
- clipRule="evenodd"
- d="M15.5 12C16.3284 12 17 11.3284 17 10.5C17 9.67157 16.3284 9 15.5 9C14.6716 9 14 9.67157 14 10.5C14 11.3284 14.6716 12 15.5 12Z"
- />
- <path
- fillRule="evenodd"
- clipRule="evenodd"
- d="M22 11C23.1046 11 24 10.1046 24 9C24 7.89543 23.1046 7 22 7C20.8954 7 20 7.89543 20 9C20 10.1046 20.8954 11 22 11Z"
- />
- <path
- fillRule="evenodd"
- clipRule="evenodd"
- d="M21 25C22.1046 25 23 24.1046 23 23C23 21.8954 22.1046 21 21 21C19.8954 21 19 21.8954 19 23C19 24.1046 19.8954 25 21 25Z"
- />
- <path
- fillRule="evenodd"
- clipRule="evenodd"
- d="M2 19C3.10457 19 4 18.1046 4 17C4 15.8954 3.10457 15 2 15C0.89543 15 0 15.8954 0 17C0 18.1046 0.89543 19 2 19Z"
- />
- <path
- fillRule="evenodd"
- clipRule="evenodd"
- d="M13 4C14.1046 4 15 3.10457 15 2C15 0.89543 14.1046 0 13 0C11.8954 0 11 0.89543 11 2C11 3.10457 11.8954 4 13 4Z"
- />
- <path
- fillRule="evenodd"
- clipRule="evenodd"
- d="M5 8C6.10457 8 7 7.10457 7 6C7 4.89543 6.10457 4 5 4C3.89543 4 3 4.89543 3 6C3 7.10457 3.89543 8 5 8Z"
- />
+ <path d="M10 11C10.5523 11 11 10.5523 11 10C11 9.44772 10.5523 9 10 9C9.44772 9 9 9.44772 9 10C9 10.5523 9.44772 11 10 11Z" />
+ <path d="M11.5 16C12.3284 16 13 15.3284 13 14.5C13 13.6716 12.3284 13 11.5 13C10.6716 13 10 13.6716 10 14.5C10 15.3284 10.6716 16 11.5 16Z" />
+ <path d="M15.5 12C16.3284 12 17 11.3284 17 10.5C17 9.67157 16.3284 9 15.5 9C14.6716 9 14 9.67157 14 10.5C14 11.3284 14.6716 12 15.5 12Z" />
+ <path d="M22 11C23.1046 11 24 10.1046 24 9C24 7.89543 23.1046 7 22 7C20.8954 7 20 7.89543 20 9C20 10.1046 20.8954 11 22 11Z" />
+ <path d="M21 25C22.1046 25 23 24.1046 23 23C23 21.8954 22.1046 21 21 21C19.8954 21 19 21.8954 19 23C19 24.1046 19.8954 25 21 25Z" />
+ <path d="M2 19C3.10457 19 4 18.1046 4 17C4 15.8954 3.10457 15 2 15C0.89543 15 0 15.8954 0 17C0 18.1046 0.89543 19 2 19Z" />
+ <path d="M13 4C14.1046 4 15 3.10457 15 2C15 0.89543 14.1046 0 13 0C11.8954 0 11 0.89543 11 2C11 3.10457 11.8954 4 13 4Z" />
+ <path d="M5 8C6.10457 8 7 7.10457 7 6C7 4.89543 6.10457 4 5 4C3.89543 4 3 4.89543 3 6C3 7.10457 3.89543 8 5 8Z" />
</Base>
);
}
diff --git a/src/components/common/styled-components.js b/src/components/common/styled-components.js
index 937be68d8..abfad25cb 100644
--- a/src/components/common/styled-components.js
+++ b/src/components/common/styled-components.js
@@ -540,8 +540,9 @@ export const StyledFilteredOption = styled.div`
export const StyledType = styled.div`
border-radius: 2px;
border: 1px solid
- ${props => (props.selected ? props.theme.primaryBtnBgd : props.theme.selectBorderColorLT)};
- color: ${props => (props.selected ? props.theme.primaryBtnBgd : props.theme.selectBorderColorLT)};
+ ${props => (props.selected ? props.theme.primaryBtnBgdHover : props.theme.selectBorderColorLT)};
+ color: ${props =>
+ props.selected ? props.theme.primaryBtnBgdHover : props.theme.selectBorderColorLT};
cursor: pointer;
font-weight: 500;
height: 100px;
diff --git a/src/components/common/toolbar-item.js b/src/components/common/toolbar-item.js
index 09f4b5122..3a97f5897 100644
--- a/src/components/common/toolbar-item.js
+++ b/src/components/common/toolbar-item.js
@@ -24,7 +24,7 @@ import styled from 'styled-components';
const StyledDiv = styled.div.attrs({
className: 'toolbar-item'
})`
- color: ${props => (props.active ? 'white' : props.theme.textColor)};
+ color: ${props => (props.active ? props.theme.titleTextColor : props.theme.textColor)};
`;
const ToolbarItem = React.memo(props => (
diff --git a/src/components/map/map-control.js b/src/components/map/map-control.js
index e2fd2eda5..1dc5ad649 100644
--- a/src/components/map/map-control.js
+++ b/src/components/map/map-control.js
@@ -269,7 +269,6 @@ const MapDrawPanel = React.memo(
label={editor.visible ? 'hide' : 'show'}
iconHeight="22px"
icon={editor.visible ? EyeSeen : EyeUnseen}
- active
/>
</StyledToolbar>
) : null}
diff --git a/src/styles/base.js b/src/styles/base.js
index 0f1a66cf8..335d9beda 100644
--- a/src/styles/base.js
+++ b/src/styles/base.js
@@ -1103,6 +1103,10 @@ export const themeLT = {
panelBackgroundHover: '#F7F7F7',
panelBorderColor: '#D3D8E0',
+ sideBarCloseBtnBgd: '#F7F7F7',
+ sideBarCloseBtnColor: textColorLT,
+ sideBarCloseBtnBgdHover: '#F7F7F7',
+
secondaryInputBgd: '#F7F7F7',
secondaryInputBgdActive: '#F7F7F7',
secondaryInputBgdHover: '#FFFFFF',
@@ -1172,6 +1176,10 @@ export const themeBS = {
secondaryBtnBgd: '#E2E2E2',
secondaryBtnBgdHover: '#CBCBCB',
+ sideBarCloseBtnBgd: '#E2E2E2',
+ sideBarCloseBtnColor: '#000000',
+ sideBarCloseBtnBgdHover: '#FFFFFF',
+
floatingBtnBgd: '#FFFFFF',
floatingBtnActBgd: '#EEEEEE',
floatingBtnBgdHover: '#EEEEEE',