-
Notifications
You must be signed in to change notification settings - Fork 68
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.
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
Кужелев Евгений #45
base: master
Are you sure you want to change the base?
Кужелев Евгений #45
Changes from 13 commits
4ef5910
a814902
e9f1ed9
8271c18
921bdf5
2977dbe
2aeb80d
ba34064
72b731b
e445b58
8341516
84d427c
d797a30
d1bcbd6
2002307
a58508c
7542873
bc73b19
615a226
2a22b87
5f30c70
f80a727
5b43811
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,233 @@ | ||
@font-face | ||
{ | ||
font-family: Cloister Black; | ||
src: url(cloisterblack-webfont.woff2) | ||
format('woff2'), url(cloisterblack-webfont.woff) | ||
format('woff'), url(cloisterblack-webfont.ttf) format('truetype'); | ||
} | ||
|
||
@font-face | ||
{ | ||
font-family: Roland; | ||
src: url(roland-webfont.woff2) | ||
format('woff2'), url(roland-webfont.woff) | ||
format('woff'), url(roland-webfont.ttf) format('truetype'); | ||
} | ||
|
||
@font-face | ||
{ | ||
font-family: Black Label; | ||
src: url(vtks_black_label_normal-webfont.woff2) | ||
format('woff2'), url(vtks_black_label_normal-webfont.woff) | ||
format('woff'), url(vtks_black_label_normal-webfont.ttf) format('truetype'); | ||
} | ||
|
||
body, | ||
h1, | ||
h3, | ||
header, | ||
div, | ||
p | ||
{ | ||
padding: 0; | ||
margin: 0; | ||
} | ||
|
||
html | ||
{ | ||
font-size: 16px; | ||
margin: 0 1%; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Вот это нужно убрать There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. не понял в чем конкретно проблема здесь. все размеры шрифтов у меня заданы через rem, значит мне нужно задать font-size у html. margin могу перенести в body, без него появляется горизонтальная полоса прокрутки |
||
} | ||
|
||
thead | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. лучше не использовать в селекторах названия тегов, так как на странице может быть несколько таких тегов, которые должны отображаться по-разному. А получаетсся, что будут отображаться одинаково. Лучше использовать классы There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. теги стоит совсем убрать или селекторы типа .class tag можно использовать? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. такие в общем то можно |
||
{ | ||
text-align: center; | ||
} | ||
|
||
header | ||
{ | ||
width: 100%; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Элемент |
||
} | ||
|
||
header div | ||
{ | ||
width: 100%; | ||
} | ||
|
||
header div, | ||
header h1 | ||
{ | ||
display: inline-block; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Зачем делать |
||
margin-bottom: 1%; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Вертикальные процентные |
||
} | ||
|
||
header div:last-child | ||
{ | ||
margin-bottom: 3px; | ||
} | ||
|
||
.weather | ||
{ | ||
width: 20%; | ||
} | ||
|
||
.weather h4 | ||
{ | ||
font: italic .8rem Arial, sans-serif; | ||
} | ||
|
||
.weather p | ||
{ | ||
font: .5rem Arial, sans-serif; | ||
} | ||
|
||
h1 | ||
{ | ||
width: 59%; | ||
font: 5rem Cloister Black, sans-serif; | ||
text-align: center; | ||
} | ||
|
||
.rate | ||
{ | ||
margin-top: 1%; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Вертикальные процентные |
||
width: 20%; | ||
font-size: .8rem; | ||
} | ||
|
||
.rate table | ||
{ | ||
width: 100%; | ||
border: .2rem solid black; | ||
padding: 0; | ||
border-spacing: 0; | ||
} | ||
|
||
.rate th, | ||
.rate td | ||
{ | ||
margin: 0; | ||
border-right: 1px solid black; | ||
} | ||
|
||
.date | ||
{ | ||
width: 100%; | ||
border-top: 2px solid black; | ||
border-bottom: 2px solid black; | ||
padding: 2px; | ||
} | ||
|
||
.date p | ||
{ | ||
text-align: center; | ||
border-top: 2px solid black; | ||
border-bottom: 2px solid black; | ||
text-transform: uppercase; | ||
font-size: 1.3rem; | ||
} | ||
|
||
.main | ||
{ | ||
-webkit-column-count: 3; | ||
-moz-column-count: 3; | ||
column-count: 3; | ||
-webkit-column-rule: 2px solid black; | ||
-moz-column-rule: 2px solid black; | ||
column-rule: 2px solid black; | ||
} | ||
|
||
.article | ||
{ | ||
-webkit-column-count: 2; | ||
-moz-column-count: 2; | ||
column-count: 2; | ||
break-inside: avoid; | ||
break-after: column; | ||
} | ||
|
||
.nobreak | ||
{ | ||
break-inside: avoid; | ||
} | ||
|
||
.col3 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. лучше не сокращать |
||
{ | ||
-webkit-column-count: 3; | ||
-moz-column-count: 3; | ||
column-count: 3; | ||
} | ||
|
||
.article h3 | ||
{ | ||
text-align: center; | ||
font-size: 1.1rem; | ||
} | ||
|
||
.article p | ||
{ | ||
font-size: .8rem; | ||
} | ||
|
||
.imgblock | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
{ | ||
padding: 4px; | ||
border-top: 2px solid black; | ||
break-inside: avoid-column; | ||
border-bottom: 2px solid black; | ||
margin: 2px 0; | ||
font-family: Black Label, sans-serif; | ||
text-align: center; | ||
} | ||
|
||
.imgblock img | ||
{ | ||
width: 100%; | ||
} | ||
|
||
.imgblock p | ||
{ | ||
font-size: 1rem; | ||
} | ||
|
||
.allcols | ||
{ | ||
-webkit-column-span: all; | ||
column-span: all; | ||
} | ||
|
||
.article p:first-of-type:first-letter | ||
{ | ||
font-family: Roland, serif; | ||
font-size: 1.5rem; | ||
} | ||
|
||
.l | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. непонятное название класса There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. это имя персонажа, оно всегда таким шрифтом было. ну не суть There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Я читал мангу, смотрел аниме и экранизацию, но название класса осуждаю. Переименовать. |
||
{ | ||
font-size: 1.5rem; | ||
font-family: Cloister Black, serif; | ||
} | ||
|
||
@media screen and (min-width: 2000px) | ||
{ | ||
html | ||
{ | ||
width: 1400px; | ||
margin: auto; | ||
} | ||
|
||
.weather | ||
{ | ||
width: 25%; | ||
} | ||
|
||
h1 | ||
{ | ||
width: 48%; | ||
} | ||
|
||
.rate | ||
{ | ||
width: 25%; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,151 @@ | ||
<!DOCTYPE html> | ||
<html lang="ru"> | ||
<html lang="en"> | ||
<head> | ||
<meta charset="utf-8"> | ||
<link rel="stylesheet" type="text/css" href="index.css"> | ||
<title>News</title> | ||
</head> | ||
<body> | ||
<header> | ||
<div class="header"> | ||
<div class="weather"> | ||
<h4>NY Weather</h4> | ||
<p> | ||
SUN OCT 30 Partly cloudy in the morning. Increasing clouds | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
with periods of showers later in the day. | ||
Thunder possible. High 71F. Winds WNW at 5 to 10 mph. | ||
Chance of rain 70%. | ||
</p> | ||
</div> | ||
<h1>Cinema News</h1> | ||
<div class="rate"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
<table> | ||
<thead> | ||
<tr> | ||
<td colspan="3">Exchange rate</td> | ||
</tr> | ||
</thead> | ||
<tr> | ||
<th>Value</th> | ||
<th>Buy</th> | ||
<th>Sell</th> | ||
</tr> | ||
<tr> | ||
<td>EUR</td> | ||
<td>69,2275</td> | ||
<td>60,2300</td> | ||
</tr> | ||
<tr> | ||
<td>USD</td> | ||
<td>63,0175</td> | ||
<td>63,0200</td> | ||
</tr> | ||
</table> | ||
</div> | ||
</div> | ||
<div class="subinfo"> | ||
<div class="date"> | ||
<p>Saturday, October 29, 2016</p> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Блок содержит дату, а значит должен быть обернут в соответствующий тег даты. К тому же параграф здесь не обязателен. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Обернул в тег time, но p оставил, т.к. он изначально ставился ради двойного выделения этой части текста бордерами |
||
</div> | ||
</div> | ||
</header> | ||
<hr> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. В |
||
<div class="main"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. тег |
||
<div class="article"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. тег |
||
<article> | ||
<h3>John Wick co-director reportedly wanted for Deadpool 2</h3> | ||
<p>Following the surprise news earlier this week that | ||
Tim Miller has vacated the director’s chair on Deadpool 2, | ||
it seems that 20th Century Fox is wasting little time in securing a replacement.</p> | ||
<div class="imgblock"> | ||
<img src="david_leitch.jpg" alt="david leitch"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
<p>David Leitch</p> | ||
</div> | ||
<p>According to Mashable, the studio is keen on John Wick co-director David Leitch, | ||
although apparently several other directors remain in the mix, and a formal offer | ||
is yet to be made.</p> | ||
<p>Leitch does have previous experience with Fox, star Reynold Reynolds | ||
and Deadpool, having served as stunt coordinator on X-Men Origins: Wolverine. He’s also | ||
performed stunts on previous Marvel movies Blade and Daredevil, as we;; as directing | ||
second unit on The Wolverine and Captain America: Civil War.</p> | ||
<p>and Tim Miller Having co-directed 2014’s John Wick alongside Chad Stahelski, | ||
Leitch returns as executive producer for the upcoming John Wick: Chapter 2, and is currently » | ||
- Gary Collinson | ||
</p> | ||
</article> | ||
<hr> | ||
<article> | ||
<h3>'Inferno' Has a Meltdown, 'Madea' is #1 Again & | ||
'Doctor Strange' Opens with $86M Overseas</h3> | ||
<p>Sony's Inferno experienced an opening weekend meltdown as the third film in the Robert Langdon | ||
series fell บ million shy of expectations. As a result, and thanks to a strong second | ||
weekend | ||
hold, Tyler Perry's Boo! A Madea Halloween scored a second weekend atop the box office, | ||
dropping | ||
just 41% from its opening weekend. Meanwhile, Disney and Marvel's Doctor Strange stormed the | ||
international box office. The latest entry in the Marvel Cinematic Universe opened in | ||
approximately half the overseas markets where it brought in an estimated $86 million | ||
ahead of its domestic release next weekend. With an estimated $16.67 million Boo! A Madea | ||
Halloween took the #1 spot at the weekend box office domestically for a second week in a row. | ||
The film's cume has now grown to $52 million as it fell just 41% in its second weekend, a | ||
spectacular performance following the film's $28.5 million opening last weekend. As noted | ||
in our weekend preview, Tyler Perry's Madea's Witness Protection »</p> | ||
</article> | ||
</div> | ||
<div class="article col3"> | ||
<article> | ||
<h3 class="allcols">Death Note (2017 film) info</h3> | ||
<div class="imgblock allcols height400"> | ||
<img src="l.jpg" alt="l"> | ||
<p>I am <span class="l">L</span>, motherfucker</p> | ||
</div> | ||
<p>Death Note is an upcoming American film directed by Adam | ||
Wingard, based on the manga series of the same name by | ||
Tsugumi Ohba and Takeshi Obata. The film will star Nat | ||
Wolff, Margaret Qualley, Keith Stanfield, Paul Nakauchi, | ||
Shea Whigham, and Willem Dafoe. The film is planned for | ||
a 2017 release.</p> | ||
<p>A student who discovers a supernatural notebook that allows | ||
him to kill anyone begins a crusade against evil in order | ||
to rule the world as a benevolent human god. Then a deadly | ||
game of cat and mouse begins when a reclusive detective begins | ||
to track down the young man, attempting to end his reign of | ||
terror once and for all.</p> | ||
</article> | ||
</div> | ||
<div class="article"> | ||
<article class="nobreak"> | ||
<h3>Britannia Awards Bring Out A Starry List Of Honorees, | ||
Presenters And Oscar Hopefuls – And Ricky Gervais</h3> | ||
<p>It was a very English night in Beverly Hills last night | ||
as BAFTA LA’s Annual British Academy Britannia Awards were | ||
handed out to a half dozen luminaries in the motion picture | ||
business, but only three of whom actually were born in the | ||
United Kingdom. Brits Ricky Gervais and Felicity Jones, | ||
along with Scottish Ewan McGregor represented the home team, | ||
while Jodie Foster, Samuel L.Jackson, and Ang Lee joined them | ||
for the warm presentation on stage at the Beverly Hilton, site… »</p> | ||
</article> | ||
<hr> | ||
<article class="nobreak"> | ||
<h3>J.K. Simmons, Luke Wilson voiced 'Rock Dog' gets UK deal</h3> | ||
<p>Altitude Film Distribution acquires family animation Rock Dog | ||
featuring J.K. Simmons, Luke Wilson and Eddie Izzard.</p> | ||
<p>Altitude Film Distribution has acquired UK rights to family | ||
animation Rock Dog, which had its European premiere at the | ||
recent BFI London Film Festival. The film features a voice | ||
cast including J.K. Simmons, Luke Wilson, Eddie Izzard and Sam Elliot.</p> | ||
<p>Co-founder and CEO of Altitude Film Entertainment Will Clarke commented, | ||
“Following the great response to the film at the BFI London Film Festival, | ||
we’re looking forward to introducing this to a wider UK audience.” The | ||
film marks Altitude’s first theatrical animation acquistion.</p> | ||
<p>Ralph Kamp, chairman and CEO of the film’s sales agent Timeless Films, | ||
commented, “From the very first screening, [Altitude’s] enthusiasm and | ||
passion for the film made it clear to us they would be the perfect | ||
distribution partner. We hope the film will become a big success in | ||
the UK and look forward to the release next year</p> | ||
</article> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Пожалуйста, выровняй
format
на линии сurl
к которому он относится. Если тебя беспокоит линтер по поводу запятых, запятые можешь оставить на той же линии где они находятся сейчас. Так же добавь пожалуйста к шрифтам директивуlocal
.