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

🍱 Icons: circle_filled, adjusted in_progress #3719

Merged
merged 3 commits into from
Jan 8, 2025
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
1 change: 1 addition & 0 deletions assets/icons/system-icons/ui-views/circle_filled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/icons/system-icons/ui-views/in_progress.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,480 changes: 746 additions & 734 deletions packages/eds-core-react/stories/assets/icons/system-icons.json

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions packages/eds-icons/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ 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).

## [0.22.0] - 2025-01-08

### Added

- `circle_filled`

### Changed

- `in_progress` stroke thickness adjusted to conform with the rest of the circle icons

## [0.21.0] - 2024-01-26

### Added
Expand Down
2 changes: 1 addition & 1 deletion packages/eds-icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@equinor/eds-icons",
"version": "0.21.0",
"version": "0.22.0",
"description": "Icons from the Equinor Design System",
"main": "dist/icons.cjs",
"module": "dist/esm/index.js",
Expand Down
11 changes: 10 additions & 1 deletion packages/eds-icons/src/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ export const in_progress: IconData = {
prefix: 'eds',
height: '24',
width: '24',
svgPathData: 'M12 19.5v-15a7.5 7.5 0 1 0 0 15M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2',
svgPathData: 'M12 20V4c-4.142 0-8 3.858-8 8s3.858 8 8 8m0-18c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2',

}

Expand Down Expand Up @@ -611,6 +611,15 @@ export const enlarge: IconData = {

}

export const circle_filled: IconData = {
name: 'circle_filled',
prefix: 'eds',
height: '24',
width: '24',
svgPathData: 'M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10',

}

export const signature: IconData = {
name: 'signature',
prefix: 'eds',
Expand Down
8 changes: 4 additions & 4 deletions scripts/figma-broker/actions/createAssets/fetchAssets.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import {
getFigmaFile,
processFigmaFile,
fetchFigmaImageUrls,
} from '../../functions/figma'
import { fetchFile } from '../../functions/file'
import { getAssets } from '../../files/assets'
import { sleep, mergeStrings } from '../../functions/utils'
} from '../../functions/figma.js'
import { fetchFile } from '../../functions/file.js'
import { getAssets } from '../../files/assets/index.js'
import { sleep, mergeStrings } from '../../functions/utils.js'

const getSvgPathData = R.pipe(
R.match(/d="(.+?)"/g),
Expand Down
6 changes: 3 additions & 3 deletions scripts/figma-broker/actions/createAssets/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import {
writeResults,
writeFile,
writeResultsIndividually,
} from '../../functions/file'
import { PATHS } from '../../constants'
import { fetchAssets } from './fetchAssets'
} from '../../functions/file.js'
import { PATHS } from '../../constants.js'
import { fetchAssets } from './fetchAssets.js'

// const svgContent = (asset) => {
// if (!asset) return { symbol: '', use: '' }
Expand Down
22 changes: 11 additions & 11 deletions scripts/figma-broker/actions/createTokens.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import * as R from 'ramda'
import { getFigmaFile, processFigmaFile } from '../functions/figma'
import { writeFile, writeResults } from '../functions/file'
import { makeTokens } from '../files/design-tokens'
import { makeColorCss } from '../files/design-tokens/color'
import { makeSpacingCss } from '../files/design-tokens/spacing'
import { makeElevationCss } from '../files/design-tokens/elevation'
import { makeClickboundsCss } from '../files/design-tokens/clickbounds'
import { makeTypographyCss } from '../files/design-tokens/typography'
import { makeShapeCss } from '../files/design-tokens/shape'
import { PATHS } from '../constants'
import { mergeStrings } from '../functions/utils'
import { getFigmaFile, processFigmaFile } from '../functions/figma.js'
import { writeFile, writeResults } from '../functions/file.js'
import { makeTokens } from '../files/design-tokens/index.js'
import { makeColorCss } from '../files/design-tokens/color.js'
import { makeSpacingCss } from '../files/design-tokens/spacing.js'
import { makeElevationCss } from '../files/design-tokens/elevation.js'
import { makeClickboundsCss } from '../files/design-tokens/clickbounds.js'
import { makeTypographyCss } from '../files/design-tokens/typography.js'
import { makeShapeCss } from '../files/design-tokens/shape.js'
import { PATHS } from '../constants.js'
import { mergeStrings } from '../functions/utils.js'

const TOKENS_LIB_DIR = PATHS.BASE_TOKENS

Expand Down
4 changes: 2 additions & 2 deletions scripts/figma-broker/actions/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { createAssets } from './createAssets'
export { createTokens } from './createTokens'
export { createAssets } from './createAssets/index.js'
export { createTokens } from './createTokens.js'
2 changes: 1 addition & 1 deletion scripts/figma-broker/files/assets/icon.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { pathName, propName } from '../../functions/utils'
import { pathName, propName } from '../../functions/utils.js'

const parseComponent = (groupName, x) => ({
name: propName(x.name.replace('-', ' ')),
Expand Down
4 changes: 2 additions & 2 deletions scripts/figma-broker/files/assets/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as R from 'ramda'
import { fixPageName } from '../../functions/utils'
import { makeAssetTokens } from './icon'
import { fixPageName } from '../../functions/utils.js'
import { makeAssetTokens } from './icon.js'

const getAssetTokens = R.pipe(
R.filter((x) => x.type === 'FRAME'),
Expand Down
6 changes: 3 additions & 3 deletions scripts/figma-broker/files/design-tokens/clickbounds.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import {
withType,
pickChildren,
toDictDeep,
} from '../../functions/utils'
import { px } from '../../functions/units'
import { toCSSVars } from '../../transformers'
} from '../../functions/utils.js'
import { px } from '../../functions/units.js'
import { toCSSVars } from '../../transformers/index.js'

const toHeightTokens = R.pipe(
R.filter(withType('frame')),
Expand Down
4 changes: 2 additions & 2 deletions scripts/figma-broker/files/design-tokens/color.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import {
withType,
pickChildren,
toDictMode,
} from '../../functions/utils'
} from '../../functions/utils.js'
import {
fillToRgba,
fillToHex,
fillToHsla,
toCSSVars,
} from '../../transformers'
} from '../../transformers/index.js'

const findMode = (name) => {
if (/⚫/.test(name)) {
Expand Down
6 changes: 3 additions & 3 deletions scripts/figma-broker/files/design-tokens/elevation.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import {
withType,
pickChildren,
toDictDeep,
} from '../../functions/utils'
import { px } from '../../functions/units'
import { fillToRgba, toCSSVars } from '../../transformers'
} from '../../functions/utils.js'
import { px } from '../../functions/units.js'
import { fillToRgba, toCSSVars } from '../../transformers/index.js'

const toBoxShadow = (effect) =>
`${px(effect.offset.x)} ${px(effect.offset.y)} ${px(
Expand Down
16 changes: 8 additions & 8 deletions scripts/figma-broker/files/design-tokens/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { makeColorToken } from './color'
import { makeSpacingTokens } from './spacing'
import { makeElevationTokens } from './elevation'
import { makeClickboundsTokens } from './clickbounds'
import { makeTextTokens } from './typography'
import { makeShapeTokens } from './shape'
import { makeInteractionsTokens } from './interactions'
import { fixPageName } from '../../functions/utils'
import { makeColorToken } from './color.js'
import { makeSpacingTokens } from './spacing.js'
import { makeElevationTokens } from './elevation.js'
import { makeClickboundsTokens } from './clickbounds.js'
import { makeTextTokens } from './typography.js'
import { makeShapeTokens } from './shape.js'
import { makeInteractionsTokens } from './interactions.js'
import { fixPageName } from '../../functions/utils.js'

export const makeTokens = (figmaFile) => {
const tokens = []
Expand Down
4 changes: 2 additions & 2 deletions scripts/figma-broker/files/design-tokens/interactions.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
pickChildren,
toDict,
withName,
} from '../../functions/utils'
import { toFocus, toOverlay } from '../../transformers'
} from '../../functions/utils.js'
import { toFocus, toOverlay } from '../../transformers/index.js'

const processGroup = R.pipe(
pickChildren,
Expand Down
4 changes: 2 additions & 2 deletions scripts/figma-broker/files/design-tokens/shape.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
toDict,
mergeStrings,
withName,
} from '../../functions/utils'
import { px } from '../../functions/units'
} from '../../functions/utils.js'
import { px } from '../../functions/units.js'

const processGroup = R.pipe(
pickChildren,
Expand Down
11 changes: 8 additions & 3 deletions scripts/figma-broker/files/design-tokens/spacing.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import * as R from 'ramda'
import { propName, withType, pickChildren, toDict } from '../../functions/utils'
import { px } from '../../functions/units'
import { toCSSVars } from '../../transformers'
import {
propName,
withType,
pickChildren,
toDict,
} from '../../functions/utils.js'
import { px } from '../../functions/units.js'
import { toCSSVars } from '../../transformers/index.js'

const toComfortable = (x) => ({ comfortable: x })

Expand Down
4 changes: 2 additions & 2 deletions scripts/figma-broker/files/design-tokens/typography.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
pickChildren,
mergeStrings,
toDictMode,
} from '../../functions/utils'
import { toTypography } from '../../transformers'
} from '../../functions/utils.js'
import { toTypography } from '../../transformers/index.js'

const findMode = (name) => {
if (name.toLowerCase().includes('compact')) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/figma-broker/functions/figma.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as R from 'ramda'
import fetch from 'node-fetch'
import { readFile, writeFile } from './file'
import { readFile, writeFile } from './file.js'

const options = () => ({
headers: {
Expand Down
2 changes: 1 addition & 1 deletion scripts/figma-broker/functions/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import fs from 'fs'
import { deleteAsync } from 'del'
import fetch from 'node-fetch'
import * as R from 'ramda'
import { createFolder } from './folder'
import { createFolder } from './folder.js'
//import prettier from 'prettier'

//const prettierConfig = fs.readFileSync('./../../.prettierrc.yaml', 'utf8')
Expand Down
2 changes: 1 addition & 1 deletion scripts/figma-broker/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { argv } from 'process'
import dotenv from 'dotenv'

import { createTokens, createAssets } from './actions'
import { createTokens, createAssets } from './actions/index.js'

dotenv.config()

Expand Down
10 changes: 5 additions & 5 deletions scripts/figma-broker/transformers/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as R from 'ramda'
import { withType, removeNilAndEmpty } from '../functions/utils'
import { px } from '../functions/units'
import { fillToRgba } from './colors'
import { withType, removeNilAndEmpty } from '../functions/utils.js'
import { px } from '../functions/units.js'
import { fillToRgba } from './colors.js'

export * from './typography'
export * from './colors'
export * from './typography.js'
export * from './colors.js'

const fallback = {}

Expand Down
6 changes: 3 additions & 3 deletions scripts/figma-broker/transformers/typography.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as R from 'ramda'
import { withType, withName, removeNilAndEmpty } from '../functions/utils'
import { rootFontSize, rem, em } from '../functions/units'
import { fillToRgba } from './colors'
import { withType, withName, removeNilAndEmpty } from '../functions/utils.js'
import { rootFontSize, rem, em } from '../functions/units.js'
import { fillToRgba } from './colors.js'

const fallback = {}
const cssVarName = (name) => `eds_${name}_color`
Expand Down
Loading