Skip to content

Commit

Permalink
Merge pull request #244 from ironSource/release/6.x.x
Browse files Browse the repository at this point in the history
Release - 6.x.x
  • Loading branch information
AndyKIron authored Oct 16, 2023
2 parents 02e87fa + 5ebe9c1 commit 350d127
Show file tree
Hide file tree
Showing 8 changed files with 19,835 additions and 5,233 deletions.
2 changes: 1 addition & 1 deletion .storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<link rel="stylesheet" href="https://fusion.ironsrc.net/Angular_14/v26/styles.5859cbb869f0ab3e.css">
<link rel="stylesheet" href="https://fusion-ui.s3.eu-west-1.amazonaws.com/release/5.7.7/style/v4/fonts.css">
<link rel="stylesheet" href="https://fusion-ui.s3.eu-west-1.amazonaws.com/release/6.0.1/style/v4/fonts.css">

<style>
body {
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const preview = {
}
},
stackblitzAdditionalDependency: {
"@ironsource/fusion-ui": '5.7.15'
"@ironsource/fusion-ui": '6.0.1'
},
viewMode: 'story',
docs: {inlineStories: true},
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.

### [6.1.1](https://github.com/ironSource/fusion-ui/compare/v6.1.0...v6.1.1) (2023-10-08)

## [6.1.0](https://github.com/ironSource/fusion-ui/compare/v6.0.1...v6.1.0) (2023-10-08)


### Features

* **storybook:** up storybook version ([936f9ae](https://github.com/ironSource/fusion-ui/commit/936f9ae864c4a9d0f0471c9687764525baa508b1))
* **storybook:** up storybook version ([8caa520](https://github.com/ironSource/fusion-ui/commit/8caa520a4021fdb11b411771d4b5c2d90897c85d))

### [6.0.1](https://github.com/ironSource/fusion-ui/compare/v6.0.1-rc.0...v6.0.1) (2023-10-01)

### [6.0.1-rc.0](https://github.com/ironSource/fusion-ui/compare/v6.0.0...v6.0.1-rc.0) (2023-09-28)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ Fusion-UI also comes with built-in accessibility features, ensuring that your ap

Whether you're building a simple website or a complex web application, Fusion-UI is the perfect choice for your UI needs. Get started today and experience the power and simplicity of Fusion-UI!

**FusionUI installation:**
**FusionUI installation:**

```npm install --save @ironsource/fusion-ui```
25,028 changes: 19,810 additions & 5,218 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fusion-ui",
"version": "6.0.1",
"version": "6.1.1",
"description": "UI library created by ironSource",
"license": "MIT",
"repository": {
Expand Down Expand Up @@ -76,15 +76,15 @@
"@compodoc/compodoc": "^1.1.19",
"@ironsource/storybook-addon-stackblitz": "^0.1.5",
"@mdx-js/react": "^2.1.5",
"@storybook/addon-actions": "^7.0.7",
"@storybook/addon-essentials": "^7.0.7",
"@storybook/addon-interactions": "^7.0.7",
"@storybook/addon-links": "^7.0.7",
"@storybook/addon-mdx-gfm": "^7.0.7",
"@storybook/angular": "^7.0.7",
"@storybook/blocks": "^7.0.9",
"@storybook/mdx2-csf": "^1.0.0",
"@storybook/testing-library": "^0.1.0",
"@storybook/addon-actions": "^7.4.5",
"@storybook/addon-essentials": "^7.4.5",
"@storybook/addon-interactions": "^7.4.5",
"@storybook/addon-links": "^7.4.5",
"@storybook/addon-mdx-gfm": "^7.4.5",
"@storybook/angular": "^7.4.5",
"@storybook/blocks": "^7.4.5",
"@storybook/mdx2-csf": "^1.1.0",
"@storybook/testing-library": "^0.2.2",
"@types/jasmine": "4.3.0",
"@types/jasminewd2": "2.0.10",
"@types/node": "~12.7.12",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {NavigationPrimaryMenuComponent} from './navigation-primary-menu/navigati
import {NavigationSecondaryMenuComponent} from './navigation-secondary-menu/navigation-secondary-menu.component';
import {StorageService, StorageType} from '@ironsource/fusion-ui/services/stogare';

const MENU_CACHE_KEY = 'fusionMenuCollapsed';
const MENU_CACHE_KEY = 'persistent_fusionMenuCollapsed';

@Component({
selector: 'fusion-navigation-menu',
Expand Down
2 changes: 1 addition & 1 deletion projects/fusion-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ironsource/fusion-ui",
"version": "6.0.1",
"version": "6.1.1",
"dependencies": {
"chart.js": "^3.5.1",
"@floating-ui/dom": "^1.0.9",
Expand Down

0 comments on commit 350d127

Please sign in to comment.