Skip to content

Commit 09c5ee4

Browse files
committed
Merge branch 'newviz' of https://github.com/githru/githru-vscode-ext into feat/new-feature-entry-point
2 parents 85ffa25 + 6df8971 commit 09c5ee4

13 files changed

Lines changed: 366 additions & 442 deletions

packages/view/src/App.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@ body {
1414
padding: 0 0.75rem 0 1.25rem;
1515
}
1616

17+
.header-container > :is(:first-child, :last-child) {
18+
flex: 1;
19+
}
20+
21+
.header-container > :last-child {
22+
display: flex;
23+
justify-content: flex-end;
24+
align-items: center;
25+
gap: 0.5rem;
26+
}
27+
1728
.top-container {
1829
height: 13.75rem;
1930
}

packages/view/src/App.tsx

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ import { useEffect, useRef, useState } from "react";
44
import BounceLoader from "react-spinners/BounceLoader";
55

66
import MonoLogo from "assets/monoLogo.svg";
7-
import { BranchSelector, Statistics, TemporalFilter, ThemeSelector, VerticalClusterList, FolderActivityFlow } from "components";
7+
import {
8+
BranchSelector,
9+
Statistics,
10+
TemporalFilter,
11+
ThemeSelector,
12+
VerticalClusterList,
13+
FolderActivityFlow,
14+
} from "components";
815
import "./App.scss";
916
import type IDEPort from "ide/IDEPort";
1017
import { useAnalayzedData } from "hooks";
@@ -70,16 +77,18 @@ const App = () => {
7077
<div className="header-container">
7178
<ThemeSelector />
7279
<BranchSelector />
73-
<RefreshButton />
74-
<InsightsButton
75-
isNew
76-
sx={{
77-
width: "1.875rem",
78-
height: "1.875rem",
79-
color: "white",
80-
}}
81-
onClick={handleOpenFolderActivityFlowModal}
82-
/>
80+
<div>
81+
<RefreshButton />
82+
<InsightsButton
83+
isNew
84+
sx={{
85+
width: "1.875rem",
86+
height: "1.875rem",
87+
color: "white",
88+
}}
89+
onClick={handleOpenFolderActivityFlowModal}
90+
/>
91+
</div>
8392
</div>
8493
<div className="top-container">
8594
<TemporalFilter />
@@ -106,7 +115,7 @@ const App = () => {
106115
className="folder-activity-flow-modal"
107116
onClick={handleCloseFolderActivityFlowModal}
108117
onKeyDown={(e) => {
109-
if (e.key === 'Escape') {
118+
if (e.key === "Escape") {
110119
handleCloseFolderActivityFlowModal();
111120
}
112121
}}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export const DIMENSIONS = {
22
width: 800,
33
height: 400,
4-
margin: { top: 40, right: 120, bottom: 60, left: 20 }
5-
};
4+
margin: { top: 40, right: 120, bottom: 60, left: 20 },
5+
};

0 commit comments

Comments
 (0)