Skip to content
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.

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

Release 1.1.5 #150

Merged
merged 6 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "climateexplorerui",
"version": "1.1.4",
"version": "1.1.5",
"private": true,
"author": "Chia Network Inc. <[email protected]>",
"description": "User interface for the Chia Climate Explorer application",
Expand Down
2 changes: 1 addition & 1 deletion src/components/blocks/Connect.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const ConnectContainer = styled('div')`
cursor: pointer;
align-items: center;

color: ${props => props.theme.colors.default.primaryDark};
color: ${props => props.theme.colors.default.primary};

:hover {
color: ${props => props.theme.colors.default.primary};
Expand Down
2 changes: 1 addition & 1 deletion src/components/blocks/LocaleSwitcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Container = styled('div')`
.MuiSelect-root,
.MuiSvgIcon-root,
.MuiSelect-select {
color: ${props => props.theme.colors.default.primaryDark};
color: ${props => props.theme.colors.default.primary};
font-family: ${props => props.theme.typography.primary.semiBold};
}

Expand Down
6 changes: 2 additions & 4 deletions src/components/blocks/Pagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,9 @@ const PagesContainer = styled(ControlsContainer)`

const Pagination = withTheme(
({ pages, current, showLast = false, callback }) => {
// if current page number higher or equal than number of pages, first page is displayed
const currentPageNumber =
current && current > 0 && current < pages ? current : 1;
const currentPageNumber = current;
const numberOfPages = pages && pages !== 0 ? pages : 1;
const changeCurrentPageTo = value => callback(value - 1);
const changeCurrentPageTo = value => callback(value);
const backButtonIsDisabled = currentPageNumber === 1;
const nextButtonIsDisabled = currentPageNumber === numberOfPages;

Expand Down
4 changes: 3 additions & 1 deletion src/translations/tokens/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
"api-key": "Api Key",
"import-home-org": "Import Home",
"connect-to-remote": "Connect to Remote",
"update-home-org": "Home Update"
"update-home-org": "Home Update",
"add-valid-server-address": "Add valid server address",
"import": "Connect"
}