Skip to content

Commit

Permalink
fix: use a different icon and font
Browse files Browse the repository at this point in the history
  • Loading branch information
Melichka committed Sep 2, 2024
1 parent af98c37 commit 3c11f12
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 31 deletions.
4 changes: 4 additions & 0 deletions application/frontend/src/assets/settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 6 additions & 20 deletions application/frontend/src/pages/project/Project.styled.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import styled from "styled-components"

import { Button } from "@mui/material"

export const Container = styled.div`
padding: 16px;
padding-left: 48px;
Expand All @@ -25,24 +23,6 @@ export const TitleSection = styled.div`
flex: 1;
`

export const SettingsButton = styled(Button)`
background-color: #007dff;
color: #ffffff;
width: 40px;
height: 40px;
border-radius: 8px;
min-width: 0;
padding: 0;
&:hover {
background-color: #005bb5;
}
svg {
font-size: 24px;
}
`

export const CreateProjectContainer = styled.div`
display: flex;
justify-content: flex-end;
Expand All @@ -54,3 +34,9 @@ export const ProjectList = styled.div`
flex-direction: column;
gap: 16px;
`

export const StyledTitle = styled.div`
font-size: 34px;
font-weight: 600;
color: rgba(29, 27, 32, 1);
`
11 changes: 4 additions & 7 deletions application/frontend/src/pages/project/Project.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
import React from "react"

import { Settings } from "@mui/icons-material"
import HomeIcon from "@mui/icons-material/Home"
import { Typography } from "@mui/material"

import settings from "src/assets/settings.svg"
import { CreateProjectButton } from "src/components/CreateProjectButton"
import { NavButton } from "src/components/NavButton"
import { ProjectCard } from "src/components/ProjectCard"

import { SettingsButton } from "./Project.styled"
import {
Container,
CreateProjectContainer,
HeaderSection,
ProjectList,
StyledTitle,
TitleSection,
} from "./Project.styled"

Expand All @@ -30,10 +29,8 @@ export const ProjectPage: React.FC = () => {
</NavButton>
<HeaderSection>
<TitleSection>
<SettingsButton>
<Settings />
</SettingsButton>
<Typography variant="h5">Список проектов</Typography>
<img src={settings} alt="Settings" style={{ width: 40, height: 40 }} />
<StyledTitle>Список проектов</StyledTitle>
</TitleSection>

<CreateProjectContainer>
Expand Down
5 changes: 1 addition & 4 deletions application/frontend/src/pages/report/Report.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { useState } from "react"

import { Settings } from "@mui/icons-material"
import HomeIcon from "@mui/icons-material/Home"
import { Container, Grid } from "@mui/material"

Expand Down Expand Up @@ -112,9 +111,7 @@ export const ReportPage: React.FC = () => {
/<NavButton to="/projects">Проект название проекта</NavButton>
<Header container>
<Grid item>
<SettingsButton>
<Settings />
</SettingsButton>
<> </>
<Title variant="h5">Reports</Title>
</Grid>
<Grid item xs={12} sm={6} container justifyContent="flex-end">
Expand Down

0 comments on commit 3c11f12

Please sign in to comment.