Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
design-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ASTRON SDC
design-system
Commits
ac38e3ed
Commit
ac38e3ed
authored
1 year ago
by
Klaas Kliffen
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix-icon-size' into 'main'
fix: define icon width and height See merge request
!27
parents
6788eb99
b6d2e730
Branches
Branches containing commit
No related tags found
1 merge request
!27
fix: define icon width and height
Pipeline
#73692
passed
1 year ago
Stage: test
Stage: build
Stage: release
Stage: deploy
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/Button.tsx
+8
-1
8 additions, 1 deletion
src/components/Button.tsx
src/stories/Icon.stories.ts
+1
-0
1 addition, 0 deletions
src/stories/Icon.stories.ts
with
9 additions
and
1 deletion
src/components/Button.tsx
+
8
−
1
View file @
ac38e3ed
...
...
@@ -42,7 +42,14 @@ const Button = ({
return
(
<
NextButton
startContent
=
{
icon
&&
<
Icon
name
=
{
icon
}
customClass
=
{
iconClass
}
/>
}
startContent
=
{
icon
&&
(
<
Icon
name
=
{
icon
}
customClass
=
{
clsx
(
iconClass
,
"
w-[16px] h-[16px]
"
)
}
/>
)
}
className
=
{
clsx
(
bgClass
(
isDisabled
),
cursorPointer
(
isDisabled
),
...
...
This diff is collapsed.
Click to expand it.
src/stories/Icon.stories.ts
+
1
−
0
View file @
ac38e3ed
...
...
@@ -17,5 +17,6 @@ export const SimpleIcon: StoryObj = {
args
:
{
name
:
"
attention-circle
"
,
color
:
"
body
"
,
customClass
:
"
w-[16px] h-[16px]
"
,
},
};
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment