-
Notifications
You must be signed in to change notification settings - Fork 14
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
Remove styled-component #1147
Merged
Merged
Remove styled-component #1147
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dtrucs
force-pushed
the
RemoveStyledComponent
branch
from
June 6, 2024 15:19
c60fa0a
to
da8857e
Compare
dtrucs
force-pushed
the
RemoveStyledComponent
branch
from
June 20, 2024 08:17
da8857e
to
88bb3dd
Compare
dtrucs
force-pushed
the
RemoveStyledComponent
branch
from
July 9, 2024 10:06
88bb3dd
to
9241458
Compare
dtrucs
force-pushed
the
RemoveStyledComponent
branch
from
July 18, 2024 13:39
9241458
to
fc917dc
Compare
mabhub
reviewed
Jul 22, 2024
mabhub
reviewed
Jul 22, 2024
Comment on lines
+47
to
+62
<div | ||
className={cn( | ||
'content-WYSIWYG', | ||
'[&>ol]:my-2 desktop:[&>ol]:my-4 [&>ol]:ml-3', | ||
'[&>ol]:border-l-3 [&>ol]:border-primary3', | ||
'[&>ol>li]:relative [&>ol>li]:pl-12 [&>ol>li]:-ml-4 [&>ol>li]:mt-4 first:[&>ol>li]:mt-0 desktop:[&>ol>li]:mt-10 [&>ol>li]:[counter-increment:steps]', | ||
'before:[&>ol>li]:absolute before:[&>ol>li]:left-0 before:[&>ol>li]:top-1/2 before:[&>ol>li]:-translate-y-1/2', | ||
'before:[&>ol>li]:mr-4 desktop:before:[&>ol>li]:mr-6', | ||
'before:[&>ol>li]:content-[counter(steps)] before:[&>ol>li]:rounded-full before:[&>ol>li]:size-7', | ||
'before:[&>ol>li]:flex before:[&>ol>li]:items-center before:[&>ol>li]:justify-center', | ||
'before:[&>ol>li]:text-sm before:[&>ol>li]:text-white before:[&>ol>li]:bg-redMarker', | ||
'before:[&>ol>li]:shadow-md', | ||
)} | ||
> | ||
{parse(descriptionHtml)} | ||
</div> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd leave a ListWithSteps
component written like:
const ListWithSteps = ({ className = '', ...props }) => (
<div
className={cn(
className,
'content-WYSIWYG',
'[&>ol]:my-2 desktop:[&>ol]:my-4 [&>ol]:ml-3',
'[&>ol]:border-l-3 [&>ol]:border-primary3',
'[&>ol>li]:relative [&>ol>li]:pl-12 [&>ol>li]:-ml-4 [&>ol>li]:mt-4 first:[&>ol>li]:mt-0 desktop:[&>ol>li]:mt-10 [&>ol>li]:[counter-increment:steps]',
'before:[&>ol>li]:absolute before:[&>ol>li]:left-0 before:[&>ol>li]:top-1/2 before:[&>ol>li]:-translate-y-1/2',
'before:[&>ol>li]:mr-4 desktop:before:[&>ol>li]:mr-6',
'before:[&>ol>li]:content-[counter(steps)] before:[&>ol>li]:rounded-full before:[&>ol>li]:size-7',
'before:[&>ol>li]:flex before:[&>ol>li]:items-center before:[&>ol>li]:justify-center',
'before:[&>ol>li]:text-sm before:[&>ol>li]:text-white before:[&>ol>li]:bg-redMarker',
'before:[&>ol>li]:shadow-md',
)}
{...props}
/>
);
then:
<ListWithSteps>{parse(descriptionHtml)}</ListWithSteps>
mabhub
reviewed
Jul 22, 2024
@@ -19,7 +18,7 @@ export const DetailsGear: React.FC<DetailsGearProps> = ({ className, text }) => | |||
<BackPack /> | |||
</div> | |||
<div className="text-greyDarkColored desktop:font-bold text-Mobile-C2 desktop:text-P1 my-auto"> | |||
<HtmlText>{parse(text)}</HtmlText> | |||
<div className="content-WYSIWYG">{parse(text)}</div> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As HtmlText
is used multiple times, i would have leave it, but simply re-authored like:
const HtmlText = ({ className = '', ...props }) => (
<div
className={cn(className, 'content-WYSIWYG')}
{...props}
/>
);
mabhub
reviewed
Jul 22, 2024
mabhub
reviewed
Jul 22, 2024
mabhub
reviewed
Jul 22, 2024
mabhub
reviewed
Jul 22, 2024
dtrucs
force-pushed
the
RemoveStyledComponent
branch
2 times, most recently
from
August 8, 2024 11:08
a32ad79
to
34f8a5f
Compare
dtrucs
force-pushed
the
RemoveStyledComponent
branch
from
August 22, 2024 14:39
34f8a5f
to
0afd8a0
Compare
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5...v6) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Co-authored: Benjamin Marguin <benjamin.marguin@makina-corpus.com>
Co-authored-by: mab <benjamin.marguin@makina-corpus.com>
dtrucs
force-pushed
the
RemoveStyledComponent
branch
from
August 23, 2024 15:17
0afd8a0
to
0ddcfd8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.