Skip to content

Commit 0f2e405

Browse files
authored
Merge pull request #84 from algorithm-ssau/feature/organizer-frontend
Feature/organizer frontend
2 parents b95b695 + b8a2d2e commit 0f2e405

File tree

9 files changed

+18068
-2118
lines changed

9 files changed

+18068
-2118
lines changed

frontend/package-lock.json

Lines changed: 53 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
"eslint-plugin-react-hooks": "^5.1.0",
2929
"eslint-plugin-react-refresh": "^0.4.19",
3030
"globals": "^15.15.0",
31-
"vite": "^6.2.3"
31+
"vite": "^6.3.5"
3232
}
3333
}

frontend/public/logo.png

25 KB
Loading

frontend/src/components/Header/Header.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,11 @@
129129
font-size: 1.1rem;
130130
}
131131

132+
}
133+
.logoimg {
134+
filter: drop-shadow(0px 2px 4px #222);
135+
position: absolute;
136+
width: 50px;
137+
margin: -10px 0px 0px 80px;
138+
pointer-events: none;
132139
}

frontend/src/components/Header/Header.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ const Header = () => {
2424

2525
return (
2626
<Navbar expand="lg" className="header">
27-
<Container fluid>
28-
<Navbar.Brand className="logo" href="/">Оборот событий</Navbar.Brand>
27+
<Container fluid>
28+
<img className="logoimg" src="../logo.png" />
29+
<Navbar.Brand className="logo" href="/" style={{ whiteSpace:'pre'} }>Оборот событий</Navbar.Brand>
2930
<Form className="d-flex mx-auto search-bar">
3031
<Form.Control
3132
type="search"

0 commit comments

Comments
 (0)