Skip to content

Branch graph update #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Branch graph update #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87f4b91
Use `sys::database.last_migration` to automatically refresh branch gr…
jaclarke Dec 10, 2024
6ccbf57
Add sdl diff view to branch graph migrations panel (#396)
jaclarke Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
171 changes: 158 additions & 13 deletions shared/common/branchGraph/branchGraph.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,18 +586,77 @@
box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.12), 0px 0px 2px rgba(0, 0, 0, 0.06);
z-index: 2;

@include isMobile {
width: 100%;
}
}

.panelHeader {
display: grid;
grid-template-columns: 1fr auto 1fr;
padding: 8px;
padding-bottom: 0;

.closeButton {
display: none;
grid-column: 3;
padding: 5px;
border: 0;
color: var(--tertiary_text_color);
justify-self: end;

span {
display: none;
}
}
}

@include isMobile {
width: 100%;
.sdlToggle {
grid-column: 2;
display: flex;
background: var(--Grey97);
border: 1px solid var(--Grey93);
border-radius: 8px;
font-family: "Roboto Flex Variable", sans-serif;
line-height: 16px;
align-self: flex-start;
margin: 0 auto;

.closeButton {
display: flex;
align-self: flex-end;
margin: 12px;
margin-bottom: 6px;
@include darkTheme {
background: var(--Grey16);
border-color: var(--Grey14);
}

.option {
position: relative;
height: 32px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
font-size: 13px;
font-weight: 500;
padding: 0 10px;
color: var(--secondary_text_color);
z-index: 0;

&.selected:before {
content: "";
position: absolute;
inset: 2px;
border-radius: 6px;
background: #fff;
box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.16);
z-index: -1;

@include darkTheme {
background: var(--Grey30);
box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.4);
}
}

&.disabled {
opacity: 0.3;
pointer-events: none;
}
}
}
Expand Down Expand Up @@ -728,20 +787,66 @@
.codeWrapper {
overflow: auto;
width: 100%;

&.diffCode {
display: grid;

> * {
grid-area: 1 / 1;
}
}
}

pre {
padding: 14px 18px;
padding-right: 44px;
margin: 0;
color: var(--main_text_color, #4d4d4d);
pre,
.diffMarkers {
font-family: "Roboto Mono Variable";
font-size: 13px;
font-style: normal;
font-weight: 450;
line-height: 22px;
}

.diffMarkers {
white-space: pre;
padding: 14px 0;
font-weight: 500;

> div {
padding-left: 8px;
}

.removed {
background: #fed9d9;
color: #af4b4b;

@include darkTheme {
background: #502f2f;
color: #f38b8b;
}
}
.added {
background: #d5edd7;
color: #46724a;

@include darkTheme {
background: #273a29;
color: #5d9662;
}
}
}

pre {
padding: 14px 18px;
padding-right: 44px;
margin: 0;
color: var(--main_text_color, #4d4d4d);
width: max-content;
user-select: text;

.collapsed {
user-select: none;
color: var(--syntax-comment);
}
}
}

Expand Down Expand Up @@ -789,6 +894,46 @@
}
}

.noSdlDiff {
display: flex;
flex-direction: column;
align-items: center;
flex-grow: 1;
padding: 12px;
gap: 12px;
color: var(--secondary_text_color);

.message {
font-style: italic;
margin-top: 4px;
}
.note {
font-size: 13px;
display: flex;
align-items: center;
gap: 2px;
color: var(--tertiary_text_color);

svg {
width: 20px;
height: 20px;
}

code {
font-family: "Roboto Mono Variable", monospace;
font-size: 12px;
font-weight: 450;
background: var(--Grey93);
border-radius: 4px;
padding: 2px 4px;

@include darkTheme {
background: var(--Grey20);
}
}
}
}

.childItem {
position: relative;
margin: 0 12px 6px 38px;
Expand Down
Loading
Loading