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

Point group#253 #295

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Point group#253 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
313d800
create issue#253
Feb 20, 2025
9a332d6
select edit mode: modify 1-5
Mar 12, 2025
9a8c9c5
Merge branch 'origin/point-group#253' - resolved conflicts
Mar 12, 2025
de571a4
adjust the buttons and spaces
Mar 21, 2025
a7e96aa
decrease space
Mar 21, 2025
f19a2f0
change the color of outline
Mar 21, 2025
0e73f2d
retrieve some lines
Mar 21, 2025
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
50 changes: 37 additions & 13 deletions app/components/point-group.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// https://github.com/EnCiv/civil-pursuit/issues/35
// https://github.com/EnCiv/civil-pursuit/issues/80
// https://github.com/EnCiv/civil-pursuit/issues/253

'use strict'

Expand Down Expand Up @@ -218,7 +219,7 @@ const PointGroup = props => {
vState={'default'}
className={cx(classes.selectPointsPassDown, classes.noBoxShadow)}
>
<div className={classes.pointBottomButtons}>
<div className={cx(classes.pointWidthButton, classes.selectLeadButton)}>
<div className={classes.pointWidthButton}>
<ModifierButton
className={classes.pointWidthButton}
Expand Down Expand Up @@ -384,6 +385,8 @@ const useStylesFromThemeFunction = createUseStyles(theme => ({
},

contentContainer: {
backgroundColor: `${theme.colors.pointDefault} !important`,
outline: `0.1875rem solid ${theme.colors.pointDefault} !important`,
padding: '2.1875rem 1.875rem',
display: 'flex',
flexDirection: 'column',
Expand Down Expand Up @@ -413,12 +416,18 @@ const useStylesFromThemeFunction = createUseStyles(theme => ({
},
},

ungroupButton: {},
ungroupButton: {
flex: '1 1 auto',
[`@media (max-width: ${theme.condensedWidthBreakPoint})`]: {
maxWidth: '9rem',
paddingLeft: '4rem',
},
},

doneButton: {
width: '17rem',
[`@media (max-width: ${theme.condensedWidthBreakPoint})`]: {
width: '7rem',
width: '16rem',
},
},

Expand All @@ -428,15 +437,25 @@ const useStylesFromThemeFunction = createUseStyles(theme => ({
color: '#5d5d5d',
fontWeight: '600',
lineHeight: '1.5rem',
marginTop: '5rem',
},

bottomButtonsTwo: {},
bottomButtonsTwo: {
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
'& span': {
flex: '1 1 auto',
textAlign: 'center',
minWidth: '9rem',
},
},
bottomButtonsOne: {},

bottomButtons: {
boxSizing: 'border-box',
width: '100%',
padding: '1.5rem 1rem 0 1rem',
padding: '0rem 1rem 0 1rem',
display: 'flex',
'&$bottomButtonsTwo': {
'& span': {
Expand Down Expand Up @@ -467,27 +486,32 @@ const useStylesFromThemeFunction = createUseStyles(theme => ({
selectPointsContainer: {
display: 'grid',
gridTemplateColumns: 'repeat(auto-fill, minmax(calc(min(100%,20rem)), 1fr))',
gap: '2rem',
width: '100%',
},

selectPoints: {
position: 'relative',
flex: '1 1 41%',
height: 'inherit',
// margin: '1rem 1.5rem',
flex: '1 1 auto',
padding: '0rem 0.5rem !important',
[`@media (max-width: ${theme.condensedWidthBreakPoint})`]: {
flex: '0 0 100%',
margin: '1rem 0',
margin: '0.5rem 0',
},
},

selectPointsPassDown: {
height: '100%',
height: '95%',
},

pointWidthButton: {
margin: '.5rem',
width: '100%',
textAlign: 'center',
[`@media (max-width: ${theme.condensedWidthBreakPoint})`]: {
width: '100%',
},
},

selectLeadButton: {
marginTop: '1rem',
},

invisibleElement: {
Expand Down
1 change: 1 addition & 0 deletions app/components/theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const Theme = {
svgArrow: 'rgb(206, 206, 206)',
transparent: 'transparent',
tabSelected: '#DCE8F2',
pointDefault: '#FFFFFF',
},
font: {
fontFamily: 'Inter',
Expand Down