Skip to content

Kryuchkov Maksim, M3339 #12

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
tilacyn wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Kryuchkov Maksim, M3339 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9315b2
task5 almost done
tilacyn Apr 6, 2019
855803c
new letters fixed
tilacyn Apr 7, 2019
63e1746
direct using DOM avoided, application restructured
tilacyn Apr 10, 2019
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
16 changes: 6 additions & 10 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<!DOCTYPE html>
<html lang="ru">
<html>
<head>
<meta name="description" content="Yandex.Mail Sample" />
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="theme-color" content="#000000" />
<title>React App</title>
<title>Yandex.Mail</title>
<!--link rel="stylesheet" type="text/css" href="index.css"-->
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<section id="root">
</section>
</body>
</html>
31 changes: 6 additions & 25 deletions src/app/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,8 @@
.app {
text-align: center;
}

.app-header {
display: flex;
min-height: 100vh;
flex-direction: column;
align-items: center;
justify-content: center;
background-color: #282c34;
color: #fff;
font-size: calc(10px + 2vmin);
}

.app-link {
color: #61dafb;
}
.main {
position: static;

@keyframes app-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
width: 800px;
height: 600px;
/*background-color: #f0f8ff;*/
background-color: rgb(229, 234, 240);
}
27 changes: 13 additions & 14 deletions src/app/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
import React, { Component } from 'react';

import './app.css';
import Name from '../name/name';
import ThreeLines from '../three-lines/three-lines';
import Menu from '../menu/menu';
import Writebox from '../writebox/writebox';
import Search from '../search/search';
import Letters from '../letters/letters';

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="main">
<Name />
<ThreeLines />
<Menu />
<Writebox />
<Search />
<Letters />
</div>
);
}
Expand Down
Binary file added src/fonts/HelveticaNeueCyr-Bold.otf
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/HelveticaNeueCyr-Light.otf
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/HelveticaNeueCyr-Medium.otf
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/YandexSansText-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/YandexSansText-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/YandexSansText-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added src/images/Fill-154.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Oval-9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Oval.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Shape.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/cross.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/nut.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
@font-face {
font-family: 'Yandex Sans Light';
src: url(fonts/YandexSansText-Light.ttf);
}

@font-face {
font-family: 'Yandex Sans Bold';
src: url(fonts/YandexSansText-Bold.ttf);
}

@font-face {
font-family: 'Yandex Sans Regular';
src: url(fonts/YandexSansText-Regular.ttf);
}

@font-face {
font-family: 'Helvetica Neue Bold';
src: url(fonts/HelveticaNeueCyr-Bold.otf);
}

@font-face {
font-family: 'Helvetica Neue Medium';
src: url(fonts/HelveticaNeueCyr-Medium.otf);
}

@font-face {
font-family: 'Helvetica Neue Light';
src: url(fonts/HelveticaNeueCyr-Light.otf);
}

p {
overflow: hidden;
}

body {
padding: 0;
margin: 0;
Expand Down
2 changes: 2 additions & 0 deletions src/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ import { App } from './app';
import './index.css';

ReactDOM.render(<App />, document.getElementById('root'));

// document.getElementById('root').newLetters();
6 changes: 6 additions & 0 deletions src/letters/__article/__cross/letters__cross.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.letters__cross {
position: absolute;

margin-top: -80px;
margin-left: 570px;
}
14 changes: 14 additions & 0 deletions src/letters/__article/__cross/letters__cross.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React, { Component } from 'react';

import './letters__cross.css';
import cross from '../../../images/cross.png';

export default class LettersCross extends Component {
render() {
return (
<figure className="letters__cross" onClick={this.props.close}>
<img src={cross} alt="cross" />
</figure>
);
}
}
16 changes: 16 additions & 0 deletions src/letters/__article/letters__article.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.letters__article {
position: absolute;

overflow: hidden;
width: inherit;
max-width: 589px;
height: 448px;
max-height: 448px;
margin-top: 41px;
margin-left: 0;
background-color: #fff;
}

.letters__article-title {
margin-left: 50px;
}
16 changes: 16 additions & 0 deletions src/letters/__article/letters__article.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React, { Component } from 'react';

import './letters__article.css';
import LettersCross from './__cross/letters__cross';

export default class LettersArticle extends Component {
render() {
return (
<div className="letters__article">
<h3 className="letters__article-title">{this.props.articleHeader}</h3>
<p>{this.props.articleContent}</p>
<LettersCross close={this.props.close} />
</div>
);
}
}
16 changes: 16 additions & 0 deletions src/letters/__footer/letters__footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.letters__footer {
position: absolute;
right: 20px;
bottom: 9px;

color: #9b9b9b;
font-family: 'Helvetica Neue Medium', sans-serif;
font-size: 11px;
}

.letters__footer-text {
overflow: hidden;
max-width: 350px;
max-height: 11px;
margin-bottom: 2px;
}
16 changes: 16 additions & 0 deletions src/letters/__footer/letters__footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React, { Component } from 'react';

import './letters__footer.css';

export default class LettersFooter extends Component {
render() {
return (
<div className="letters__footer">
<p className="letters__footer-text">
Помощь и обратная связь&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Реклама
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;© 2001—2018, Яндекс
</p>
</div>
);
}
}
110 changes: 110 additions & 0 deletions src/letters/__letter/letters__letter.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
.letters__line {
position: absolute;

width: inherit;
height: 0;
margin-top: 41px;

border: 1px solid #e2e2e2;
}

.letters__marker {
position: absolute;

width: 16px;
height: 16px;
margin-top: 14px;
margin-left: 20px;

border: 1px solid rgba(0, 0, 0, 0.15);
background-color: #ffffff;
border-radius: 3px;
color: #fff;
}

.label {
width: inherit;
}

/* Single letter */

.author-image {
position: absolute;

width: 30px;
height: inherit;
margin-top: 6px;
margin-left: 46px;
}

.letters__letter {
width: inherit;
height: 43px;
margin-top: 0;
margin-left: 0;
}

.yandex-oval {
position: absolute;

margin-top: 0;
margin-left: 0;
}

.Ya {
position: absolute;

margin-top: 7px;
margin-left: 9px;
}

.letters__author {
position: absolute;

max-width: 160px;
max-height: 13px;
margin-top: 17px;
margin-left: 86px;
color: #000;
font-family: 'Helvetica Neue Light', sans-serif;
font-size: 13px;
}

.unread-oval {
position: absolute;

margin-top: 12px;
margin-left: 261px;
}

.letters__theme {
position: absolute;

max-width: 210px;
max-height: 13px;
margin-top: 17px;
margin-left: 281px;
color: #000;
font-family: 'Helvetica Neue Light', sans-serif;
font-size: 13px;
}

.letters__theme:hover {
background-color: grey;
}

.letters_unread {
font-family: 'Helvetica Neue Bold', sans-serif;
}

.letters__date {
position: absolute;
right: 20px;

max-width: 50px;
max-height: 13px;
margin-top: 17px;
color: #9b9b9b;
font-family: 'Helvetica Neue Medium', sans-serif;
font-size: 13px;
}
Loading