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

[Tech] Migre vers styled-components v6 #1197

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Tech] Migre vers styled-components v6 #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
112 changes: 56 additions & 56 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"redux-thunk": "2.4.2",
"rimraf": "5.0.5",
"rsuite": "5.45.0",
"styled-components": "5.3.11",
"styled-components": "6.1.8",
"timeago.js": "4.0.2",
"ts-jest": "^29.1.1",
"use-debounce": "10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/ConfirmationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const StyledDialog = styled(Dialog)`
> .Element-Button {
width: 136px;

:not(:first-child) {
&:not(:first-child) {
margin-left: 8px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const StyledDialog = styled(MuiDialog)<{
> .Element-Button {
width: 136px;

:not(:first-child) {
&:not(:first-child) {
margin-left: 8px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/Reportings/ReportingForm/FormComponents/Target/TargetDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const TargetWrapper = styled.div`
flex-direction: column;
align-items: flex-start;
gap: 8px;
:not(:last-child) {
&:not(:last-child) {
margin-bottom: 8px;
}
`
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/commonStyles/Input.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const CustomInput = styled(Input)`
cursor: text;
}

::placeholder {
&::placeholder {
font-size: 11px;
color: ${p => p.theme.color.slateGray};
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/layersSelector/administrative/AdministrativeLayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const Row = styled.span<{ $isGrouped: boolean }>`
width: stretch;
min-height: 36px;

:hover {
&:hover {
background: ${p => p.theme.color.blueYonder25};
}
& > :last-child {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/layersSelector/base/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const ListItem = styled.li`
border-bottom: 1px solid ${p => p.theme.color.lightGray};
line-height: 1.9em;

:hover {
&:hover {
background: ${p => p.theme.color.blueYonder25};
}
`
4 changes: 2 additions & 2 deletions frontend/src/features/layersSelector/utils/LayerSelector.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const Layer = styled.span<{ $metadataIsShown?: boolean; $selected?: boolean }>`
height: ${LAYER_SELECTOR_ROW_HEIGHT}px;
align-items: center;

:hover {
&:hover {
background: ${p => p.theme.color.blueYonder25};
}
`
Expand Down Expand Up @@ -65,7 +65,7 @@ const GroupWrapper = styled.li<{ $isPadded?: boolean }>`
color: ${p => p.theme.color.gunMetal};
border-bottom: 1px solid ${p => p.theme.color.lightGray};

:hover {
&:hover {
background: ${p => p.theme.color.blueYonder25};
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/map/controls/MapAttributionsBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const Button = styled.button`
width: 25px !important;
height: 25px !important;

:hover {
&:hover {
background: none;
}
`
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/map/overlays/semaphores/SemaphoreCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const StyledContactLine = styled.div`
const StyledCopyButton = styled(IconButton)`
padding: 0px;
.Element-IconBox {
:hover {
&:hover {
color: ${p => p.theme.color.blueYonder};
}
}
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/features/map/tools/interestPoint/EditInterestPoint.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ const CancelButton = styled.button`
padding: 5px 12px;
width: 130px;

:disabled {
&:disabled {
border: 1px solid ${p => p.theme.color.lightGray};
color: ${p => p.theme.color.slateGray};
}
Expand All @@ -214,8 +214,8 @@ const OkButton = styled.button`
padding: 5px 12px;
width: 130px;

:hover,
:focus {
&:hover,
&:focus {
background: ${p => p.theme.color.charcoal};
}
`
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/features/map/tools/measurements/CustomCircleRange.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const CancelButton = styled.button`
padding: 5px 12px;
width: 130px;

:disabled {
&:disabled {
border: 1px solid ${p => p.theme.color.lightGray};
color: ${p => p.theme.color.lightGray};
}
Expand All @@ -169,8 +169,8 @@ const OkButton = styled.button`
padding: 5px 12px;
width: 130px;

:hover,
:focus {
&:hover,
&:focus {
background: ${p => p.theme.color.charcoal};
}
`
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/missions/MissionForm/ActionForm/ControlForm/ControlForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ const ActionSummary = styled(Form.Group)`
`

const ActionFieldWrapper = styled.div`
:not(:first-child) {
&:not(:first-child) {
margin-left: 8px;
}
`
Expand Down
2 changes: 1 addition & 1 deletion ...issions/MissionForm/ActionForm/ControlForm/InfractionForm/InfractionFormHeaderVehicle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export function InfractionFormHeaderVehicle({ envActionIndex, infractionPath })

const FormColumn = styled.div`
display: inline-block;
:not(:last-child) {
&:not(:last-child) {
margin-right: 6px;
}
`
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/missions/MissionForm/ActionForm/ReportingForm/TargetDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ const TargetWrapper = styled.div`
flex-direction: column;
align-items: flex-start;
gap: 8px;
:not(:last-child) {
&:not(:last-child) {
margin-bottom: 8px;
}
`
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/missions/MissionForm/MissionFormBottomBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ const StyledButtonsContainer = styled.div`
`

const StyledButton = styled(Button)`
:not([disabled]) {
&:not([disabled]) {
svg {
color: ${p => p.theme.color.maximumRed};
}
Expand Down