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.

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

(HDS-2137) Update new icons to icons list in site #1226

Merged
merged 3 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# Build icon library, create zip file for release and create PR
name: icon library
# Build icon library, create zip file for release and commit to current branch
name: update icon library

on:
workflow_dispatch:
push:
branches:
- release-*

jobs:
build-icon-library:
Expand All @@ -17,6 +20,26 @@ jobs:
node-version: '20.3.1'
registry-url: 'https://registry.npmjs.org'

# Don't do anything if we're on development, main or master branches
- name: Check branch
run: |
if [[ $GITHUB_REF == refs/heads/development || $GITHUB_REF == refs/heads/master || $GITHUB_REF == refs/heads/main ]]; then
echo "Development, master pr main branch, skipping icon library build"
mrTuomoK marked this conversation as resolved.
Show resolved Hide resolved
exit 1
fi

# Don't do anything if we're on release-x.x.x AND the icon-kit has the same version number (already built for the release)
# Skip this step if workflow was triggered by workflow_dispatch
- name: Check if icon library has already been built for this release
if: github.event_name != 'workflow_dispatch'
run: |
PKG_VER=`node -pe "require('./packages/react/package.json').version"`
ICON_KIT_VER=`sed -n -E 's/.*version[[:space:]]+([0-9]+([.][0-9]+)*).*/\1/p' ./release/icon-kit-template-CHANGELOG.txt`
if [[ ${PKG_VER} == ${ICON_KIT_VER} ]]; then
echo "Icon library has already been built for this release, skipping"
exit 0
fi

- name: Run Glypfig
run: |
npx glypfig \
Expand Down Expand Up @@ -83,9 +106,4 @@ jobs:
git config --global user.name "Github Actions"
git add .
git commit -m 'Updated icon library'
git push

- name: create pull request
run: gh pr create -B development --title 'Icon library build' --body 'Created by Github action icon library'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
git push
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.X.X] - Month, XX, 202X

### React
Expand Down Expand Up @@ -41,6 +46,7 @@ Changes that are not related to specific components
#### Fixed

- [Component] What bugs/typos are fixed?
- [Icons] Document-group icon wrong colors

### Documentation

Expand All @@ -51,6 +57,7 @@ Changes that are not related to specific components
#### Added

- [Component] What is added?
- [Icons] Added missing icons to site icons list

#### Changed

Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/icons/document-group.css

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

16 changes: 7 additions & 9 deletions packages/core/src/svg/document-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 9 additions & 14 deletions packages/react/src/icons/IconDocumentGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,17 @@ export const IconDocumentGroup = ({
color={color}
style={style}
>
<mask id="path-1-inside-1_7789_308" fill="currentColor">
<path
fillRule="evenodd"
clipRule="evenodd"
d="M18 1L22 4.00001L22 18H8V1H18ZM17 3V6H20L17 3ZM17 3L20 6L20 16H10V3H17Z"
/>
<path fillRule="evenodd" clipRule="evenodd" d="M7 4H5V21H19V19H7V4Z" />
<path fillRule="evenodd" clipRule="evenodd" d="M4 7H2V24H16V22H4V7Z" />
<path d="M16 6H11V8H16V6Z" />
<path d="M11 11V9H19V11H11Z" />
<path d="M11 14V12H19V14H11Z" />
</mask>
<path d="M11 6H16V8H11V6Z" fill="currentColor" />
<path
d="M23.5355 2.46447L20.5355 -0.535534L13.4645 6.53553L16.4645 9.53553L23.5355 2.46447ZM18 1L24 -6.99999L21.3333 -9H18V1ZM22 4.00001L32 4.00002L32 -0.999978L28 -3.99998L22 4.00001ZM22 18V28H32L32 18L22 18ZM8 18H-2V28H8V18ZM8 1V-9H-2V1H8ZM17 3H27V-7H17V3ZM17 6H7V16H17V6ZM20 6L30 5.99999L30 -4H20V6ZM20 16V26H30L30 16L20 16ZM10 16H0V26H10V16ZM10 3V-7H0V3H10ZM19 21V31H29V21H19ZM5 21H-5V31H5V21ZM5 4V-6H-5V4H5ZM7 19H-3V29H7V19ZM7 4H17V-6H7V4ZM19 19H29V9H19V19ZM16 24V34H26V24H16ZM2 24H-8V34H2V24ZM2 7V-3H-8V7H2ZM4 22H-6V32H4V22ZM4 7H14V-3H4V7ZM16 22H26V12H16V22ZM11 6V-4H1V6H11ZM16 6H26V-4H16V6ZM16 8V18H26V8H16ZM11 8H1V18H11V8ZM11 9V-1H1V9H11ZM11 11H1V21H11V11ZM19 11V21H29V11H19ZM19 9H29V-1H19V9ZM11 12V2H1V12H11ZM11 14H1V24H11V14ZM19 14V24H29V14H19ZM19 12H29V2H19V12ZM12 8.99999L16 12L28 -3.99998L24 -6.99999L12 8.99999ZM12 4.00001L12 18L32 18L32 4.00002L12 4.00001ZM22 8H8V28H22V8ZM18 18V1H-2V18H18ZM8 11H18V-9H8V11ZM7 3V6H27V3H7ZM17 16H20V-4H17V16ZM10 6.00001L10 16L30 16L30 5.99999L10 6.00001ZM20 6H10V26H20V6ZM20 16V3H0V16H20ZM10 13H17V-7H10V13ZM19 11H5V31H19V11ZM15 21V4H-5V21H15ZM5 14H7V-6H5V14ZM9 19V21H29V19H9ZM16 14H2V34H16V14ZM12 24V7H-8V24H12ZM2 17H4V-3H2V17ZM6 22V24H26V22H6ZM19 9H7V29H19V9ZM17 19V4H-3V19H17ZM16 12H4V32H16V12ZM14 22V7H-6V22H14ZM11 16H16V-4H11V16ZM6 6V8H26V6H6ZM16 -2H11V18H16V-2ZM21 8V6H1V8H21ZM1 9V11H21V9H1ZM11 21H19V1H11V21ZM29 11V9H9V11H29ZM19 -1H11V19H19V-1ZM1 12V14H21V12H1ZM11 24H19V4H11V24ZM29 14V12H9V14H29ZM19 2H11V22H19V2Z"
fillRule="evenodd"
clipRule="evenodd"
d="M18 1L22 4.00001L22 18H8V1H18ZM17 3L20 6L20 16H10V3H17Z"
fill="currentColor"
mask="url(#path-1-inside-1_7789_308)"
/>
<path d="M17 3V6H20L17 3Z" fill="currentColor" />
<path d="M11 9V11H19V9H11Z" fill="currentColor" />
<path d="M11 12V14H19V12H11Z" fill="currentColor" />
<path d="M19 21H5V4H7V19H19V21Z" fill="currentColor" />
<path d="M16 24H2V7H4V22H16V24Z" fill="currentColor" />
</svg>
);
Binary file modified release/hds-icon-kit.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion release/icon-kit-template-CHANGELOG.txt
laurakarhu marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Helsinki Design System, Icon kit, version 3.4.0
# Helsinki Design System, Icon kit, version 3.5.0

## CHANGELOG

Expand Down
Loading
Loading