Skip to content

Commit

Permalink
Merge branch 'main' into fix/uni-1299
Browse files Browse the repository at this point in the history
  • Loading branch information
danielsiemens committed Jan 17, 2025
2 parents 357e36b + fd92a56 commit b86b6e5
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { StorybookConfig } from '@storybook/react-vite'
import react from '@vitejs/plugin-react'
import { PluginOption, Plugin } from 'vite'
import type { PluginOption, Plugin } from 'vite'
import { withoutVitePlugins } from '@storybook/builder-vite'
import remarkGfm from 'remark-gfm'

Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [1.37.0](https://github.com/mParticle/aquarium/compare/v1.36.1...v1.37.0) (2025-01-17)

### Features

- add badge indicator ([#526](https://github.com/mParticle/aquarium/issues/526)) ([56a3a47](https://github.com/mParticle/aquarium/commit/56a3a4738a44457f1a8932b33dc3a80b0778d20b))
- replace crosshair icon with precision ([#528](https://github.com/mParticle/aquarium/issues/528)) ([06884ae](https://github.com/mParticle/aquarium/commit/06884ae29d213efd091d6e50cea5c66f3dc95439))

## [1.36.1](https://github.com/mParticle/aquarium/compare/v1.36.0...v1.36.1) (2024-12-06)

### Bug Fixes
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mparticle/aquarium",
"version": "1.36.1",
"version": "1.37.0",
"description": "mParticle Component Library",
"license": "Apache-2.0",
"keywords": [
Expand Down
3 changes: 0 additions & 3 deletions src/assets/svg/crosshair.svg

This file was deleted.

3 changes: 3 additions & 0 deletions src/assets/svg/precision.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/icons/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import ChartLineIcon from 'src/assets/svg/chart-line.svg?react'
import CheckIcon from 'src/assets/svg/check.svg?react'
import CircleNodesIcon from 'src/assets/svg/circle-nodes.svg?react'
import CloudIcon from 'src/assets/svg/cloud.svg?react'
import CrosshairIcon from 'src/assets/svg/crosshair.svg?react'
import ConnectionsIcon from 'src/assets/svg/connections.svg?react'
import DataPlatformIconDt from 'src/assets/svg/mp_pm_dt_data-platform.svg?react'
import DatabaseIcon from 'src/assets/svg/database.svg?react'
Expand All @@ -34,6 +33,7 @@ import MessageQuestionIcon from 'src/assets/svg/message-question.svg?react'
import MpLogoIcon from 'src/assets/svg/mpLogo.svg?react'
import ObservabilityIcon from 'src/assets/svg/mp_pm_lt_observability.svg?react'
import OversightIconDt from 'src/assets/svg/mp_pm_dt_oversight.svg?react'
import PrecisionIcon from 'src/assets/svg/precision.svg?react'
import PredictionsIcon from 'src/assets/svg/mp_pm_lt_predictions.svg?react'
import PredictionsIconDt from 'src/assets/svg/mp_pm_dt_predictions.svg?react'
import RemoveIcon from 'src/assets/svg/remove.svg?react'
Expand Down Expand Up @@ -106,7 +106,6 @@ export {
CheckIcon,
CircleNodesIcon,
CloudIcon,
CrosshairIcon,
Cohort,
ConnectionsIcon,
ConversionIcon,
Expand Down Expand Up @@ -158,6 +157,7 @@ export {
OverviewIconDt,
PaywallIcon,
Placeholder,
PrecisionIcon,
PredictionsIcon,
PredictionsIconDt,
PremiumIcon,
Expand Down
10 changes: 5 additions & 5 deletions src/constants/Icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
CheckIcon,
CircleNodesIcon,
CloudIcon,
CrosshairIcon,
ConnectionsIcon,
DataPlatformIconDt,
DatabaseIcon,
Expand All @@ -38,6 +37,7 @@ import {
MpLogoIcon,
ObservabilityIcon,
OversightIconDt,
PrecisionIcon,
PredictionsIconDt,
PredictionsIcon,
RemoveIcon,
Expand Down Expand Up @@ -186,10 +186,6 @@ export const Icons: Record<IconNames, IconOptions> = {
light: Copy,
default: 'light',
},
crosshair: {
light: CrosshairIcon,
default: 'light',
},
dashboard: {
light: Dashboard,
default: 'light',
Expand Down Expand Up @@ -408,6 +404,10 @@ export const Icons: Record<IconNames, IconOptions> = {
light: Placeholder,
default: 'light',
},
precision: {
light: PrecisionIcon,
default: 'light',
},
predictions: {
light: PredictionsIcon,
'duo-tone': PredictionsIconDt,
Expand Down
2 changes: 1 addition & 1 deletion src/types/icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export type IconNames =
| 'connections'
| 'conversion'
| 'copy'
| 'crosshair'
| 'dashboard'
| 'database'
| 'dataPlatform'
Expand Down Expand Up @@ -90,6 +89,7 @@ export type IconNames =
| 'paywall'
| 'pipelines'
| 'placeholder'
| 'precision'
| 'predictions'
| 'premium'
| 'premiumDt'
Expand Down

0 comments on commit b86b6e5

Please sign in to comment.