Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/wso2/oxygen-ui into main
Browse files Browse the repository at this point in the history
  • Loading branch information
ChanikaRuchini committed Aug 3, 2023
2 parents 53eea39 + 24ada03 commit 4fe2206
Show file tree
Hide file tree
Showing 45 changed files with 1,417 additions and 265 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## [1.1.11](https://github.com/wso2/oxygen-ui/compare/v1.1.10...v1.1.11)
<br> Released on: 2023-07-28

## What's Changed

### `@oxygen-ui/react`
* **react:** add CollapsibleNavbarItem component ([ff5d5de](https://github.com/wso2/oxygen-ui/commit/ff5d5de3850fddce0f674fc7ab2fbee7c8044a26))


### `@oxygen-ui/primitives`
* **primitives:** add x mark icon ([7e7da16](https://github.com/wso2/oxygen-ui/commit/7e7da161ae3d3ef5e322c619cef60e193d70a1c8))
* **primitives:** add icons ([b29cf00](https://github.com/wso2/oxygen-ui/commit/b29cf0003dfa53fb24b890b2a6d9da1f2aaab58f))

## [1.1.10](https://github.com/wso2/oxygen-ui/compare/v1.1.9...v1.1.10)
<br> Released on: 2023-06-25

Expand Down
4 changes: 2 additions & 2 deletions docs/website/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@oxygen-ui/docs",
"version": "1.1.10",
"version": "1.1.11",
"description": "Documentation of WSO2 Oxygen Design System.",
"author": "WSO2",
"license": "Apache-2.0",
Expand Down Expand Up @@ -44,7 +44,7 @@
"typescript": "4.9.3"
},
"devDependencies": {
"@oxygen-ui/logger": "1.1.10",
"@oxygen-ui/logger": "1.1.11",
"@wso2/eslint-plugin": "https://gitpkg.now.sh/brionmario/wso2-ui-configs/packages/eslint-plugin?5bf60cabe9e9a2571e8b1dd16d0c3bdc76db2c4f",
"@wso2/prettier-config": "https://gitpkg.now.sh/brionmario/wso2-ui-configs/packages/prettier-config?5bf60cabe9e9a2571e8b1dd16d0c3bdc76db2c4f",
"@wso2/stylelint-config": "https://gitpkg.now.sh/brionmario/wso2-ui-configs/packages/stylelint-config?5bf60cabe9e9a2571e8b1dd16d0c3bdc76db2c4f",
Expand Down
6 changes: 3 additions & 3 deletions examples/multi-brand-identity/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@oxygen-ui/multi-brand-identity-example",
"version": "1.1.10",
"version": "1.1.11",
"description": "Sample app to showcase Oxygen Design System multi-branding capabilities.",
"author": "WSO2",
"license": "Apache-2.0",
Expand Down Expand Up @@ -32,8 +32,8 @@
"dependencies": {
"@fontsource/inter": "^4.5.14",
"@fontsource/montserrat": "^4.5.13",
"@oxygen-ui/primitives": "1.1.10",
"@oxygen-ui/react": "1.1.10",
"@oxygen-ui/primitives": "1.1.11",
"@oxygen-ui/react": "1.1.11",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@oxygen-ui/workspace",
"version": "1.1.10",
"version": "1.1.11",
"description": "The Design System powering WSO2 products.",
"author": "WSO2",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/logger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oxygen-ui/logger",
"version": "1.1.10",
"version": "1.1.11",
"description": "Logger for Oxygen UI projects",
"author": "WSO2",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/primitives/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oxygen-ui/primitives",
"version": "1.1.10",
"version": "1.1.11",
"description": "Low level building blocks of the Oxygen Design System",
"author": "WSO2",
"license": "Apache-2.0",
Expand Down Expand Up @@ -36,7 +36,7 @@
"devDependencies": {
"@babel/parser": "^7.20.5",
"@divriots/style-dictionary-to-figma": "^0.4.0",
"@oxygen-ui/logger": "1.1.10",
"@oxygen-ui/logger": "1.1.11",
"@types/jest": "^29.2.3",
"@types/node": "^18.11.18",
"@wso2/eslint-plugin": "https://gitpkg.now.sh/brionmario/wso2-ui-configs/packages/eslint-plugin?5bf60cabe9e9a2571e8b1dd16d0c3bdc76db2c4f",
Expand Down
10 changes: 5 additions & 5 deletions packages/primitives/src/icons/building-circle-check-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions packages/primitives/src/icons/building-gear-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions packages/primitives/src/icons/document-pen-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions packages/primitives/src/icons/document-pencil-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions packages/primitives/src/icons/palette-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions packages/primitives/src/icons/square-magnifying-glass-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4fe2206

Please sign in to comment.