Skip to content

Егор Галкин, M3335 #33

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

Open
egalkin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Егор Галкин, M3335 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 42 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions src/app/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
text-align: center;
}


.app-header {
display: flex;
min-height: 100vh;
Expand All @@ -25,3 +26,18 @@
transform: rotate(360deg);
}
}

.input {
transition: width .35s linear;
outline: none;
border: none;
border-radius: 4px;
padding: 10px;
font-size: 20px;
width: 150px;
background-color: #dddddd;
}

.input-focused {
width: 240px;
}
20 changes: 6 additions & 14 deletions src/app/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,15 @@ import React, { Component } from 'react';

import './app.css';

import { Header } from '../components/header/Header';
import { PageContent } from '../components/main/PageContent';

export class App extends Component {
render() {
return (
<div className="app">
<header className="app-header">
<p>
Edit <code>src/app/app.jsx</code> and save to reload.
</p>
<a
className="app-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
<div className="content">
<Header />
<PageContent/>
</div>
);
}
Expand Down
40 changes: 40 additions & 0 deletions src/components/header/Header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
.header {
width: 100%;
height: 56px;
float: right;
}

.header__mail-logo {
width: 153px;
height: 31px;
float: left;
margin: 19px 20% 0 22px;
}


.search-bar {
float: left;
width: 30%;
height: 60%;
}

.search-bar_position {
margin: 11px 0 13px;
opacity: 0.5;
}

.search-bar__input {
float: left;
width: 98%;
height: 100%;

}

.search-bar__input_view {
margin: 0;
padding-left: 2%;
opacity: 0.5;
text-overflow: ellipsis;
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
background-color: #fff;
}
18 changes: 18 additions & 0 deletions src/components/header/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React, { Component } from 'react';

import './Header.css';

import YandexLogo from '../../resources/images/yandex-logo.svg'

export class Header extends Component {
render() {
return (
<header className="header">
<img src={YandexLogo} className="header__mail-logo" />
<form className="search-bar search-bar_position">
<input type="text" placeholder="Поиск" className="search-bar__input search-bar__input_view" />
</form>
</header>
);
}
}
4 changes: 4 additions & 0 deletions src/components/main/PageContent.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.page-content {
width: 100%;
float: left;
}
17 changes: 17 additions & 0 deletions src/components/main/PageContent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React, { Component } from 'react';

import {Sidebar} from './sidebar/Sidebar';
import { MailContent } from './mail/MailContent';

import './PageContent.css'

export class PageContent extends Component{
render() {
return (
<main className="page-content">
<Sidebar />
<MailContent />
</main>
);
}
}
Loading