Skip to content

Commit

Permalink
Merge branch 'main' into column-change-emit
Browse files Browse the repository at this point in the history
  • Loading branch information
arjunlalb authored Sep 14, 2023
2 parents d318624 + 977f1c8 commit 24f26a3
Show file tree
Hide file tree
Showing 6 changed files with 173 additions and 207 deletions.
64 changes: 32 additions & 32 deletions package-lock.json

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

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@types/d3-hierarchy": "^2.0.2",
"@types/d3-transition": "1.1.5",
"apollo-angular": "^5.0.0",
"core-js": "^3.32.1",
"core-js": "^3.32.2",
"d3-array": "^2.12.0",
"d3-axis": "^2.1.0",
"d3-brush": "^1.1.6",
Expand All @@ -63,7 +63,7 @@
"lodash-es": "^4.17.21",
"mixpanel-browser": "^2.47.0",
"ngx-color": "7.0.0",
"rudder-sdk-js": "^2.40.5",
"rudder-sdk-js": "^2.41.0",
"rxjs": "~6.6.7",
"tslib": "^2.6.2",
"uuid": "^8.3.2",
Expand Down Expand Up @@ -99,17 +99,17 @@
"@types/jest": "^28.0.0",
"@types/lodash-es": "^4.17.9",
"@types/mixpanel-browser": "^2.47.1",
"@types/node": "^18.17.14",
"@types/node": "^18.17.15",
"@types/uuid": "^8.3.4",
"@types/webpack-env": "^1.18.1",
"@typescript-eslint/eslint-plugin": "5.57.1",
"@typescript-eslint/parser": "5.62.0",
"commitizen": "^4.3.0",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^8.48.0",
"eslint": "^8.49.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "2.28.1",
"eslint-plugin-jsdoc": "46.5.0",
"eslint-plugin-jsdoc": "46.6.0",
"eslint-plugin-no-null": "1.0.2",
"eslint-plugin-prefer-arrow": "1.2.3",
"eslint-plugin-unicorn": "48.0.1",
Expand All @@ -123,7 +123,7 @@
"lodash": "^4.17.21",
"ng-mocks": "^14.10.0",
"ng-packagr": "^15.2.2",
"postcss": "^8.4.28",
"postcss": "^8.4.29",
"postcss-import": "^15.1.0",
"postcss-preset-env": "^9.1.3",
"postcss-url": "^10.1.1",
Expand Down
5 changes: 5 additions & 0 deletions projects/assets-library/src/icons/icon-type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export const enum IconType {
CloudUpload = 'svg:cloud-upload',
CollapseAll = 'svg:collapse-all',
Collapsed = 'svg:plus-square',
Column = 'bar_chart',
Compare = 'svg:compare',
CompareArrows = 'compare_arrows',
ContentCopy = 'content_copy',
Expand All @@ -45,6 +46,7 @@ export const enum IconType {
Delete = 'delete',
Device = 'svg:device',
Done = 'done',
Donut = 'donut_large',
Dot = 'svg:dot',
Download = 'download',
DrilldownFilter = 'svg:drilldown-filter',
Expand Down Expand Up @@ -121,7 +123,9 @@ export const enum IconType {
Spinner = 'svg:spinner',
StatusCode = 'svg:status-code',
StringAttribute = 'svg:string-attribute',
Table = 'table_chart',
Time = 'schedule',
TimeSeries = 'timeline',
TimeHistory = 'svg:time-history',
TraceId = 'svg:trace-id',
Trash = 'svg:trash',
Expand All @@ -131,6 +135,7 @@ export const enum IconType {
TriangleUp = 'svg:triangle-up',
User = 'person_outline',
Unavailable = 'remove_circle_outline',
Univariate = 'looks_one',
Unknown = 'device_unknown',
Undo = 'svg:undo',
VerticalGrabHandle = 'svg:vertical-grab-handle',
Expand Down
1 change: 1 addition & 0 deletions projects/components/src/splitter/splitter.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

.splitter-container {
@include m.fill-container();
position: relative;
display: flex;

&.horizontal {
Expand Down
Loading

0 comments on commit 24f26a3

Please sign in to comment.