Merge branch 'main' into fix/powerbi-styling-issues

equinor · May 8, 2024 · 3d1356e · 3d1356e
2 parents d8133d0 + 1f414f8
commit 3d1356e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,10 @@
 {
-	"conventionalCommits.scopes": ["Workspace-react", "all", "garden"],
+	"conventionalCommits.scopes": [
+		"Workspace-react",
+		"all",
+		"garden",
+		"power-bi"
+	],
 	"markdownlint.config": {
 		"MD033": {
 			"allowed_elements": ["a", "p", "img"]

diff --git a/packages/power-bi/src/lib/components/loadedReport/LoadedReport.tsx b/packages/power-bi/src/lib/components/loadedReport/LoadedReport.tsx
@@ -42,6 +42,7 @@ export const LoadedReport = ({ config, onReportReady }: LoadedReportProps) => {
 
 const StyledAspectRatio = styled.div<{ width: number }>`
   height: ${({ width }) => `${defaultAspectRatio * width}px`};
+  max-height: calc(100% - 5px);
 `;
 
 const PowerBiWrapper = styled.div.attrs({