Skip to content

Commit 601d9eb

Browse files
Merge branch 'main' into donut-fixes
2 parents 0fac303 + 68fbce5 commit 601d9eb

File tree

57 files changed

+1854
-684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1854
-684
lines changed

.husky/commit-msg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npx --no-install commitlint --edit $1

.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npx --no-install pretty-quick --staged

.husky/pre-push

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npm run lint && npm run test

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"lint:fix": "ng lint --fix hypertrace-ui",
2121
"prettier:check": "prettier --check '**'",
2222
"test:ci": "ng test hypertrace-ui --maxWorkers=2 --ci --coverage",
23-
"docs": "compodoc -p tsconfig.json"
23+
"docs": "compodoc -p tsconfig.json",
24+
"prepare": "husky install"
2425
},
2526
"private": true,
2627
"dependencies": {
@@ -90,12 +91,12 @@
9091
"@types/jest": "^26.0.23",
9192
"@types/lodash-es": "^4.17.4",
9293
"@types/node": "^15.12.5",
93-
"@types/uuid": "^8.3.0",
94+
"@types/uuid": "^8.3.1",
9495
"@types/webpack-env": "^1.14.0",
9596
"codelyzer": "^6.0.2",
9697
"commitizen": "^4.2.4",
9798
"cz-conventional-changelog": "^3.3.0",
98-
"husky": "^7.0.1",
99+
"husky": "^7.0.0",
99100
"jest": "^26.6.3",
100101
"jest-config": "^27.0.4",
101102
"jest-html-reporter": "^3.4.1",
@@ -121,12 +122,5 @@
121122
"extends": [
122123
"@commitlint/config-conventional"
123124
]
124-
},
125-
"husky": {
126-
"hooks": {
127-
"pre-push": "npm run lint && npm run test",
128-
"pre-commit": "pretty-quick --staged",
129-
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
130-
}
131125
}
132126
}
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

projects/assets-library/assets/styles/_color-palette.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ $color-health-unknown: $gray-7;
100100
// Risk
101101
$color-risk-critical: $purple-6;
102102
$color-risk-high: $red-5;
103-
$color-risk-medium: $brown-1;
104-
$color-risk-low: $gray-6;
103+
$color-risk-medium: $orange-4;
104+
$color-risk-low: $yellow-4;
105105

106106
// Status
107107
$color-status-success: $green-2;

projects/assets-library/assets/styles/_interaction.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
}
1616

1717
@mixin raised-shadow-hover {
18+
transition: all 0.2s ease-in-out;
19+
1820
&:hover {
19-
border: none;
2021
box-shadow: 0 8px 20px rgba(63, 71, 74, 0.16), 0 2px 12px rgba(63, 71, 74, 0.08), 0 1px 8px rgba(63, 71, 74, 0.08);
21-
transform: scale(1.02, 1.02);
22+
transform: scale(1.01, 1.01);
2223
}
2324
}
2425

0 commit comments

Comments
 (0)