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.

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

Jump to bottom

Changed confusing labels #625 #631

Merged
merged 2 commits into from
Jun 17, 2024
Merged

Changed confusing labels #625 #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d6a762
Changed confusing labels #625
jinamshah Jun 7, 2024
1a8e86d
PR updates
jinamshah Jun 17, 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
2 changes: 1 addition & 1 deletion src/components/Legend/Legend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
This file contains the CropLegendModal and it's styles
The CropLegendModal shows the color legend for the calendar view
The CropLegendModal shows the color legend for the calendar view (crop calendar)
*/

import {
Expand Down
8 changes: 4 additions & 4 deletions src/pages/CropSidebar/CropSidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-underscore-dangle */
/*
This file contains the CropSidebar and its styles
The CropSidebar is the sidebar which contains the filtering and calendar view components
The CropSidebar is the sidebar which contains the filtering and calendar view (crop calendar) components
*/

import {
Expand Down Expand Up @@ -306,7 +306,7 @@ const CropSidebar = ({
style={{ background: !comparisonView ? '#49a8ab' : '#e3f2f4' }}
startIcon={<ListIcon style={{ fontSize: 'larger' }} />}
>
LIST VIEW
CROP LIST
</LightButton>
<LightButton
onClick={() => setComparisonView(true)}
Expand Down Expand Up @@ -335,15 +335,15 @@ const CropSidebar = ({
style={{ background: !listView ? '#49a8ab' : '#e3f2f4' }}
startIcon={<ListIcon style={{ fontSize: 'larger' }} />}
>
LIST VIEW
CROP LIST
</LightButton>
<LightButton
onClick={() => setListView(true)}
color="secondary"
style={{ background: listView ? '#49a8ab' : '#e3f2f4' }}
startIcon={<CalendarToday style={{ fontSize: 'larger' }} />}
>
CALENDAR VIEW
CROP CALENDAR
</LightButton>
</>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Header/ToggleOptions/ToggleOptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const ToggleOptions = ({ pathname }) => {
onClick={setMyCoverCropActivationFlag}
>
<Typography variant="body2" sx={{ fontWeight: 'bold' }}>
VIEW MY LIST
MY SELECTED CROPS
</Typography>
</Button>
</Badge>
Expand Down
6 changes: 3 additions & 3 deletions src/shared/ProgressButtonsInner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const ProgressButtonsInner = ({
maxHeight: '35px',
minWidth: '70px',
fontSize: '13px',
marginLeft: progressRedux === 4 ? '-25px' : '0px',
marginLeft: progressRedux === 4 ? '-75px' : '0px',
}}
onClick={() => changeProgress('decrement')}
disabled={isDisabledBack}
Expand Down Expand Up @@ -80,14 +80,14 @@ const ProgressButtonsInner = ({
style={{
maxWidth: '90px',
maxHeight: '35px',
minWidth: progressRedux === 4 ? '130px' : '70px',
minWidth: progressRedux === 4 ? 'max-content' : '70px',
fontSize: '13px',
marginLeft: '3%',
}}
onClick={() => (progressRedux === 4 ? setMyCoverCropActivationFlag() : changeProgress('increment'))}
disabled={isDisabledNext || (progressRedux === 4 && selectedCropIdsRedux.length === 0)}
>
{progressRedux === 4 ? 'VIEW MY LIST' : 'NEXT'}
{progressRedux === 4 ? 'MY SELECTED CROPS' : 'NEXT'}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changing this text has left the button with 2 rows of text. Can you please adjust the size of the button so we can see how it looks when the text is on just one line. I can see we are adjusting the size of the button for this text already i just think it needs to be a little bigger so the text is on one line.

</LightButton>
</Badge>
)}
Expand Down