Skip to content

Commit

Permalink
Merge pull request #566 from Ferlab-Ste-Justine/fix/clin-3751
Browse files Browse the repository at this point in the history
fix: CLIN-3751 fix style icon flag
  • Loading branch information
claudia1296 authored Jan 17, 2025
2 parents c131304 + 34bbdc7 commit 0703d0a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
3 changes: 3 additions & 0 deletions packages/ui/Release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 10.15.3 2025-01-17
- fix: CLIN-3751 style flag

### 10.15.2 2025-01-02
- fix: SKFP-1379 fis JS errors in graph

Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ferlab/ui",
"version": "10.15.2",
"version": "10.15.3",
"description": "Core components for scientific research data portals",
"publishConfig": {
"access": "public"
Expand Down
10 changes: 6 additions & 4 deletions packages/ui/src/components/Flag/FlagDropdown/index.module.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
.flagList svg{
font-size: 14px;
}

.flagDropdown{
width: 136px;
}
.flagDropdown svg{
font-size: 14px;
}

.flagDropdown li{
color: var(--blue-1);
Expand Down Expand Up @@ -53,21 +59,17 @@
}

.flagIcon{
font-size: 16px;
color: #D4380D;
}

.pinIcon{
font-size: 16px;
color: #FA8C16;
}

.starIcon{
font-size: 16px;
color: #2F54EB;
}

.noneIcon{
font-size: 16px;
color: #8b9db2;
}
5 changes: 3 additions & 2 deletions packages/ui/src/components/Flag/FlagDropdown/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export const Flag = ({

const dropdown = (
<Dropdown
className={styles.flagList}
menu={{
defaultSelectedKeys: options,
items: dropdownOption,
Expand All @@ -131,11 +132,11 @@ export const Flag = ({
trigger={['click']}
>
{options.length > 0 ? (
<div>
<Space size={2}>
{options.includes(FlagOption.FLAG) && getOptionIcon(FlagOption.FLAG)}
{options.includes(FlagOption.PIN) && getOptionIcon(FlagOption.PIN)}
{options.includes(FlagOption.STAR) && getOptionIcon(FlagOption.STAR)}
</div>
</Space>
) : (
getOptionIcon(FlagOption.NONE)
)}
Expand Down

0 comments on commit 0703d0a

Please sign in to comment.