diff --git a/site/src/App.tsx b/site/src/App.tsx index e4509de..66fcea5 100644 --- a/site/src/App.tsx +++ b/site/src/App.tsx @@ -1,6 +1,6 @@ import NavBar from './components/Navbar' import Gallery from "./components/Gallery"; -import Content from "./components/Content"; +// import Content from "./components/Content"; import CustomFooter from "./components/CustomFooter"; @@ -9,9 +9,8 @@ import './styles/App.css' function App() { return ( <> - - - + + ) diff --git a/site/src/components/Gallery.tsx b/site/src/components/Gallery.tsx index 23c44ac..f9db414 100644 --- a/site/src/components/Gallery.tsx +++ b/site/src/components/Gallery.tsx @@ -1,32 +1,32 @@ import ImageList from '@mui/material/ImageList'; import ImageListItem from '@mui/material/ImageListItem'; -import structures from "../data"; +import {realPhotos} from "../data"; import Box from '@mui/material/Box'; import Container from '@mui/material/Container'; import ImageListItemBar from '@mui/material/ImageListItemBar'; -const imgData = structures.slice(0, -1); +const imgData = realPhotos.slice(0,3) function Gallery() { return ( - + - {imgData.map((item) => ( - + gap={5}> + {imgData.map((item,index) => ( + {item.title} diff --git a/site/src/components/Navbar.tsx b/site/src/components/Navbar.tsx index 8498b22..8c1fc61 100644 --- a/site/src/components/Navbar.tsx +++ b/site/src/components/Navbar.tsx @@ -20,10 +20,9 @@ const StyledToolbar = styled(Toolbar)(({ theme }) => ({ alignItems: 'center', justifyContent: 'space-between', flexShrink: 0, - borderRadius: `calc(${theme.shape.borderRadius}px + 8px)`, + borderRadius: `calc(${theme.shape.borderRadius}/2px)`, border: '1px solid', borderColor: theme.palette.divider, - padding: '8px 12px', })); @@ -39,7 +38,6 @@ const StyledMenuItem =styled(MenuItem)(({}) => ({ '&:hover': { backgroundColor: 'rgba(69, 146, 223, 0.45)', }, - })); interface ComponentProps { active: string; @@ -57,20 +55,20 @@ function NavBar({ active }: ComponentProps) { sx={{ boxShadow: 0, bgcolor: 'transparent', - mt: '28px', + mt: '10px', }} > - + - Самые высокие здания и сооружения + Сайт - портфолио - +