Skip to content
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

[view] px단위 rem으로 수정 #751

Merged
merged 5 commits into from
Oct 6, 2024
+93 −88
Merged

[view] px단위 rem으로 수정 #751

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2659cfc
refactor: px to rem
joonwonBaek Sep 23, 2024
38b6a4c
Merge branch 'main' of https://github.com/githru/githru-vscode-ext in…
joonwonBaek Oct 4, 2024
f00484b
fix: px -> rem
joonwonBaek Oct 4, 2024
14dc5dd
feat: pxToRem 함수 구현 후 적용
joonwonBaek Oct 4, 2024
93c5aa0
fix: px to rem
joonwonBaek Oct 6, 2024
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
12 changes: 6 additions & 6 deletions packages/view/src/App.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@ body {
.header-container {
position: relative;
display: flex;
height: 60px;
height: 3.75rem;
justify-content: space-between;
align-items: center;
padding: 0 12px 0 20px;
padding: 0 0.75rem 0 1.25rem;
}

.top-container {
height: 220px;
height: 13.75rem;
}

.middle-container {
display: flex;
height: calc(100vh - 200px);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

엇 여기는 혹시 발견 못하신건가요?!?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

네 발견못한 것 같아요..!! 이 부분 추가로 수정하겠습니다 ㅠㅠ

padding: 20px;
padding: 1.25rem;
}

.no-commits-container {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
height: calc(100vh - 350px);
height: calc(100vh - 21.875rem);

h1 {
margin: 40px 0 0 0;
margin: 2.5rem 0 0 0;
}
}
4 changes: 2 additions & 2 deletions packages/view/src/components/BranchSelector/BranchSelector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
font-weight: $font-weight-semibold;

& &__select-box {
border: 1px solid $color-white;
border: 0.0625rem solid $color-white;
color: $color-white;
height: 30px;
height: 1.875rem;

& .MuiSvgIcon-root {
color: $color-white;
Expand Down
2 changes: 1 addition & 1 deletion packages/view/src/components/BranchSelector/BranchSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const BranchSelector = () => {
sx: {
backgroundColor: "#212121",
color: "white",
marginTop: "1px",
marginTop: "0.0625rem",
"& .MuiMenuItem-root": {
backgroundColor: "#212121 !important ",
"&:hover": {
Expand Down
21 changes: 10 additions & 11 deletions packages/view/src/components/Detail/Detail.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
margin-right: 1rem;
flex-grow: 10;
height: 0;
border: 1px solid $color-white;
border: 0.0625rem solid $color-white;
}

.detail__summary-list {
Expand All @@ -19,10 +19,10 @@

.detail__summary-item {
position: relative;
margin-right: 10px;
margin-right: 0.625rem;
display: inline-flex;
align-items: center;
gap: 4px;
gap: 0.25rem;

&:last-child {
margin-right: 0;
Expand All @@ -48,8 +48,8 @@
.detail__commit-list {
display: flex;
flex-direction: column;
row-gap: 7px;
padding: 20px;
row-gap: 0.4375rem;
padding: 1.25rem;
font-size: $font-size-body;

.detail__commit-item {
Expand All @@ -64,7 +64,7 @@
justify-content: space-between;
align-items: center;
width: 100%;
padding-left: 5px;
padding-left: 0.3125rem;

.commit-item__avatar-message {
display: flex;
Expand All @@ -75,7 +75,7 @@
position: relative;
overflow: visible;
flex-grow: 1;
padding-right: 50px;
padding-right: 3.125rem;
width: auto;

.commit-item__message {
Expand All @@ -84,7 +84,7 @@
-webkit-line-clamp: 1;
overflow: hidden;
color: $color-white;
margin: 0 4px 0 15px;
margin: 0 0.25rem 0 0.9375rem;

&:hover {
display: block;
Expand All @@ -93,8 +93,8 @@
position: absolute;
z-index: 10;
background-color: $color-dark-gray;
padding-bottom: 5px;
top: -7px;
padding-bottom: 0.3125rem;
top: -0.4375rem;
}
}
}
Expand Down Expand Up @@ -142,4 +142,3 @@
color: $color-light-gray;
}
}

4 changes: 2 additions & 2 deletions packages/view/src/components/FilteredAuthors/FilteredAuthors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.filtered-authors {
display: flex;
align-items: center;
column-gap: 10px;
column-gap: 0.625rem;

.filtered-authors__label {
font-size: $font-size-title;
Expand All @@ -14,6 +14,6 @@
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 5px;
gap: 0.3125rem;
}
}
4 changes: 2 additions & 2 deletions packages/view/src/components/RefreshButton/RefreshButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.refresh-button {
width: 30px;
height: 30px;
width: 1.875rem;
height: 1.875rem;
}

.refresh-button__icon {
Expand Down
16 changes: 8 additions & 8 deletions packages/view/src/components/SelectedClusterGroup/SelectedClusterGroup.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
position: relative;
display: flex;
align-items: center;
column-gap: 10px;
column-gap: 0.625rem;

&__label {
display: flex;
Expand All @@ -16,28 +16,28 @@
font-weight: $font-weight-semibold;
cursor: pointer;
}

&__list {
position: absolute;
top: 2rem;
right: -10px;
max-height: 240px;
right: -0.625rem;
max-height: 15rem;
overflow-y: auto;
padding: 5px;
padding: 0.3125rem;
background-color: $color-dark-gray;
border-radius: 0.5rem;
box-shadow: 0px 0px 10px $color-background;
box-shadow: 0rem 0rem 0.625rem $color-background;
z-index: 10;

&::-webkit-scrollbar {
width: 0;
}

.selected-clusters__item {
width: 200px;
width: 12.5rem;
text-overflow: ellipsis;
justify-content: space-between;
margin: 5px;
margin: 0.3125rem;
color: $color-white;
background-color: #4f5662;
}
Expand Down
14 changes: 7 additions & 7 deletions packages/view/src/components/Statistics/AuthorBarChart/AuthorBarChart.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
}

& &__select-box {
border: 1px solid $color-white;
border: 0.0625rem solid $color-white;
color: $color-white;
height: 25px;
width: 100px;
height: 1.5625rem;
width: 6.25rem;
font-size: $font-size-caption;

& .MuiSvgIcon-root {
Expand All @@ -34,7 +34,7 @@

&__chart {
overflow: visible;
margin: 20px 40px 40px;
margin: 1.25rem 2.5rem 2.5rem;
}

&__axis {
Expand All @@ -44,7 +44,7 @@
.tick {
display: none;
}

.x-axis__label {
fill: $color-white;
}
Expand Down Expand Up @@ -78,8 +78,8 @@
&__tooltip {
display: none;
position: absolute;
padding: 8px 16px;
border-radius: 5px;
padding: 0.5rem 1rem;
border-radius: 0.3125rem;
font-size: $font-size-caption;
text-align: center;
line-height: 1.5;
Expand Down
15 changes: 8 additions & 7 deletions packages/view/src/components/Statistics/AuthorBarChart/AuthorBarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { FormControl, MenuItem, Select } from "@mui/material";
import type { ClusterNode, AuthorInfo } from "types";
import { useGlobalData } from "hooks";
import { getAuthorProfileImgSrc } from "utils/author";
import { pxToRem } from "utils/pxToRem";

import { useGetSelectedData } from "../Statistics.hook";

Expand Down Expand Up @@ -60,7 +61,7 @@ const AuthorBarChart = () => {
const xAxisGroup = svg
.append("g")
.attr("class", "author-bar-chart__axis x-axis")
.style("transform", `translateY(${DIMENSIONS.height}px)`);
.style("transform", `translateY(${pxToRem(DIMENSIONS.height)})`);
const yAxisGroup = svg.append("g").attr("class", "author-bar-chart__axis y-axis");
const barGroup = svg.append("g").attr("class", "author-bar-chart__container");

Expand Down Expand Up @@ -88,15 +89,15 @@ const AuthorBarChart = () => {
xAxisGroup
.append("text")
.attr("class", "x-axis__label")
.style("transform", `translate(${DIMENSIONS.width / 2}px, ${DIMENSIONS.margins - 10}px)`)
.style("transform", `translate(${pxToRem(DIMENSIONS.width / 2)}, ${pxToRem(DIMENSIONS.margins - 10)})`)
.text(`${metric} # / Total ${metric} # (%)`);

// Event handler
const handleMouseOver = (e: MouseEvent<SVGRectElement | SVGTextElement>, d: AuthorDataType) => {
tooltip
.style("display", "inline-block")
.style("left", `${e.pageX - 70}px`)
.style("top", `${e.pageY - 120}px`)
.style("left", pxToRem(e.pageX - 70))
.style("top", pxToRem(e.pageY - 120))
.html(
`
<p class="author-bar-chart__name">${d.name}</p>
Expand All @@ -112,7 +113,7 @@ const AuthorBarChart = () => {
};

const handleMouseMove = (e: MouseEvent<SVGRectElement | SVGTextElement>) => {
tooltip.style("left", `${e.pageX - 70}px`).style("top", `${e.pageY - 120}px`);
tooltip.style("left", pxToRem(e.pageX - 70)).style("top", pxToRem(e.pageY - 120));
};
const handleMouseOut = () => {
tooltip.style("display", "none");
Expand Down Expand Up @@ -231,11 +232,11 @@ const AuthorBarChart = () => {
MenuProps={{
PaperProps: {
sx: {
marginTop: "1px",
marginTop: "0.0625rem",
backgroundColor: "#212121",
color: "white",
"& .MuiMenuItem-root": {
fontSize: "12px",
fontSize: "0.75rem",
backgroundColor: "#212121 !important ",
"&:hover": {
backgroundColor: "#333333 !important",
Expand Down
4 changes: 3 additions & 1 deletion packages/view/src/components/Statistics/FileIcicleSummary/FileIcicleSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import type { HierarchyRectangularNode } from "d3";
import type { RefObject } from "react";
import { useEffect, useRef } from "react";

import { pxToRem } from "utils";

import { PRIMARY_COLOR_VARIABLE_NAME } from "../../../constants/constants";
import { useGetSelectedData } from "../Statistics.hook";

Expand Down Expand Up @@ -44,7 +46,7 @@ const drawIcicleTree = async ($target: RefObject<SVGSVGElement>, data: FileChang
const svg = d3
.select($target.current)
.attr("viewBox", [0, 0, WIDTH, HEIGHT])
.style("font", `${FONT_SIZE}px sans-serif`);
.style("font", `${pxToRem(FONT_SIZE)} sans-serif`);

// Position each partitions
const cell = svg
Expand Down
2 changes: 1 addition & 1 deletion packages/view/src/components/Statistics/Statistics.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
flex-direction: column;
align-items: center;
gap: 5vh;
padding: 0 20px 20px;
padding: 0 1.25rem 1.25rem;
overflow-y: scroll;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/view/src/components/TemporalFilter/LineChart.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
display: flex;
flex-direction: column;
align-items: center;
font-size: 20px;
font-size: 1.25rem;
margin: auto 0;

&__chart {
Expand Down
8 changes: 4 additions & 4 deletions packages/view/src/components/TemporalFilter/TemporalFilter.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@

.date-from,
.date-to {
margin: 0 12px 0 8px;
padding: 2px;
border: solid 1px rgba(255, 255, 255, 0.22);
border-radius: 3px;
margin: 0 0.75rem 0 0.5rem;
padding: 0.125rem;
border: solid 0.0625rem rgba(255, 255, 255, 0.22);
border-radius: 0.1875rem;
color: $color-white;
background: rgba(255, 255, 255, 0.09);
font-weight: $font-weight-light;
Expand Down
Loading
Loading