-
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
Смирнов Алексей #36
Open
AlexSm13
wants to merge
8
commits into
urfu-2016:master
Choose a base branch
from
AlexSm13:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Смирнов Алексей #36
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6b4dc70
markup4
AlexSm13 0e0bf9d
fix css
AlexSm13 1f22b57
correct remark
AlexSm13 7a158bb
fix linting
AlexSm13 4c45283
fix img
AlexSm13 5c2cdb2
fix
AlexSm13 a2c86d3
img in column
AlexSm13 43473bb
img in column
AlexSm13 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,213 @@ | ||
@import url(https://fonts.googleapis.com/css?family=Coiny); | ||
@import url(https://fonts.googleapis.com/css?family=Gloria+Hallelujah); | ||
@import url(https://fonts.googleapis.com/css?family=Bungee+Shade); | ||
|
||
@font-face | ||
{ | ||
font-family: 'LilliputSteps-Regular'; | ||
src: url('font/lilliput_steps.eot?') | ||
format('eot'), url('font/lilliput_steps.woff') | ||
format('woff'), url('font/lilliput_steps.ttf') | ||
format('truetype'), url('font/lilliput_steps.svg#LilliputSteps-Regular') | ||
format('svg'); | ||
} | ||
|
||
.headline | ||
{ | ||
font-family: Coiny, serif; | ||
text-align: center; | ||
width: 90%; | ||
float: left; | ||
|
||
} | ||
|
||
main | ||
{ | ||
display: block; | ||
border: 4px double black; | ||
color: #000; | ||
background: #fff; | ||
font-family: Arial, sans-serif; | ||
} | ||
|
||
body | ||
{ | ||
font-family: Arial, sans-serif; | ||
text-align: left; | ||
} | ||
|
||
p | ||
{ | ||
line-height: 1.5; | ||
letter-spacing: normal; | ||
word-spacing: normal; | ||
text-indent: 5%; | ||
} | ||
|
||
hr | ||
{ | ||
color: rgba(0,0,0, .5); | ||
} | ||
|
||
.first-title, | ||
.second-title | ||
{ | ||
font-family: Monotype Corsiva, cursive; | ||
text-align: center; | ||
font-size: 18px; | ||
} | ||
|
||
.author | ||
{ | ||
font-family: Gloria Hallelujah, cursive; | ||
text-align: right; | ||
font-size: 10px; | ||
} | ||
|
||
p:first-child::first-letter | ||
{ | ||
font-family: Bungee Shade, cursive; | ||
font-size: 50px; | ||
color: #f00; | ||
} | ||
|
||
.first-post | ||
{ | ||
width: 440px; | ||
float: left; | ||
border-right: 1px solid #000; | ||
padding: 25px; | ||
} | ||
|
||
.second-post | ||
{ | ||
margin-left: 490px; | ||
padding: 25px; | ||
border-left: 1px solid #000; | ||
} | ||
|
||
.post-1 | ||
{ | ||
column-count: 2; | ||
-moz-column-count: 2; | ||
-webkit-column-count: 2; | ||
column-rule: 1px solid rgba(0,0,0, .5); | ||
-moz-column-rule: 1px solid rgba(0,0,0, .5); | ||
-webkit-column-rule: 1px solid rgba(0,0,0, .5); | ||
hyphens: auto; | ||
break-inside: avoid-page; | ||
} | ||
|
||
.post-2 | ||
{ | ||
column-count: 3; | ||
-moz-column-count: 3; | ||
-webkit-column-count: 3; | ||
column-rule: 1px solid rgba(0,0,0, .5); | ||
-moz-column-rule: 1px solid rgba(0,0,0, .5); | ||
-webkit-column-rule: 1px solid rgba(0,0,0, .5); | ||
hyphens: auto; | ||
} | ||
|
||
span.sv-font-1 | ||
{ | ||
font-family: Arial, sans-serif; | ||
} | ||
|
||
span.sv-font-2 | ||
{ | ||
font-family: Monotype Corsiva, cursive; | ||
} | ||
|
||
span.sv-colors-1 | ||
{ | ||
border: 1px solid rgba(0,0,0, .5); | ||
color: #000; | ||
background: #fff; | ||
} | ||
|
||
span.sv-colors-2 | ||
{ | ||
border: 1px solid #000; | ||
color: #fff; | ||
background: #000; | ||
} | ||
|
||
span.sv-size-1 | ||
{ | ||
font-size: x-small; | ||
} | ||
|
||
span.sv-size-2 | ||
{ | ||
font-size: medium; | ||
} | ||
|
||
span.sv-size-3 | ||
{ | ||
font-size: x-large; | ||
} | ||
|
||
.sv-size-1:checked ~ main | ||
{ | ||
font-size: x-small; | ||
} | ||
|
||
.sv-size-3:checked ~ main | ||
{ | ||
font-size: x-large; | ||
} | ||
|
||
.sv-colors-2:checked ~ main | ||
{ | ||
background: #000; | ||
color: #fff; | ||
} | ||
|
||
.sv-font-2:checked ~ main | ||
{ | ||
font-family: Monotype Corsiva, cursive; | ||
} | ||
|
||
.apple-img | ||
{ | ||
width: 210px; | ||
padding: 5px; | ||
} | ||
|
||
.zoom-img | ||
{ | ||
width: 500px; | ||
padding-top: 10px; | ||
padding-bottom: 10px; | ||
} | ||
|
||
.uber-img | ||
{ | ||
width: 240px; | ||
padding: 5px; | ||
} | ||
|
||
.vertical | ||
{ | ||
font-family: LilliputSteps-Regular, cursive; | ||
margin-left: 40%; | ||
width: 1ch; | ||
text-align: center; | ||
word-wrap: break-word; | ||
float: left; | ||
} | ||
|
||
.weather | ||
{ | ||
font-family: LilliputSteps-Regular, cursive; | ||
margin-left: 90%; | ||
text-align: center; | ||
height: 140px; | ||
} | ||
|
||
div | ||
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. привязываться к тегам обычно плохая практика, а к диву особенно нехорошо |
||
{ | ||
column-span: all; | ||
text-align: center; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,179 @@ | ||
<!DOCTYPE html> | ||
<html lang="ru"> | ||
<head> | ||
<meta charset="utf-8"> | ||
</head> | ||
<body> | ||
</body> | ||
<html lang="en"> | ||
<head> | ||
<title>TECH</title> | ||
<meta charset="utf-8"> | ||
<link rel="stylesheet" type="text/css" href="index.css"> | ||
</head> | ||
<body> | ||
<input type="radio" name="font-size" class="sv-size-1"><span class="sv-size-1">A</span> | ||
<input type="radio" name="font-size" class="sv-size-2" checked><span class="sv-size-2">A</span> | ||
<input type="radio" name="font-size" class="sv-size-3"><span class="sv-size-3">A</span><br> | ||
<input type="radio" name="font-color" class="sv-colors-1" checked><span class="sv-colors-1">A</span> | ||
<input type="radio" name="font-color" class="sv-colors-2"><span class="sv-colors-2">A</span><br> | ||
<input type="radio" name="font-family" class="sv-font-1" checked><span class="sv-font-1">A</span> | ||
<input type="radio" name="font-family" class="sv-font-2"><span class="sv-font-2">A</span> | ||
<hr> | ||
<header> | ||
<h1 class="headline">USA TODAY</h1> | ||
<aside class="weather"><span class="vertical">Weather</span> | ||
<img src="image/d.sun.png" alt="sun">+12</aside> | ||
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. не хватает еще title |
||
</header> | ||
<main> | ||
<section class="first-post"> | ||
<header class="first-title"> | ||
<h2> | ||
Britain hit hard by Apple Mac price hikes | ||
</h2> | ||
</header> | ||
<hr> | ||
<p class="author"> | ||
By Jane Onyanga-Omara, USA TODAY | ||
</p> | ||
<hr> | ||
<article class="post-1"> | ||
<p> | ||
LON­DON — Bri­tain’s im­pend­ing exit from the European Uni­on | ||
is lead­ing to high­er prices for Apple Mac com­puters here. | ||
</p> | ||
<p> | ||
The tech gi­ant un­veiled a new line of Mac­Books on Thursday | ||
and used the op­por­tun­ity to an­nounce price hikes for its | ||
oth­er, older Apple Mac com­puters. | ||
</p> | ||
<p> | ||
Apple Mac buy­ers in the U.K. must hand over 20% more — or | ||
up to $610 — start­ing Fri­day. It fol­lows a drop in the | ||
pound's value against the dol­lar fol­low­ing the coun­try’s | ||
vote to exit the European Uni­on. | ||
</p> | ||
<p> | ||
<q>Apple has to re­cal­ib­rate prices after sig­ni­ | ||
fic­ant cur­rency fluc­tu­ations, and since the E.U. | ||
ref­er­en­dum, U.K. prices are' out of sync with the dol­lar,</q> | ||
said Patrick O'Bri­en, an ana­lyst at the Ver­dict Re­tail | ||
con­sultancy, ac­cord­ing to the BBC. | ||
</p> | ||
<p> | ||
He ad­ded: <q>While price in­creases won't look good to the con­sumer, | ||
it's dif­fi­cult to blame Apple.</q> | ||
<img class="apple-img" src="image/apple.jpg" alt="Apple Mac"> | ||
</p> | ||
<p> | ||
The price of one Mac Pro desktop rose from $3,048 (£2,499) to | ||
$3,658 (£2,999). A 13-inch Mac­Book Air jumped from $1,035 (£849) | ||
to $1,157 (£949.) | ||
</p> | ||
<p> | ||
A 12-inch Mac­Book was hiked from $1,279 (£1,049) to $1524 (£1,249.) | ||
</p> | ||
<p> | ||
The pound has fallen 18% against the dol­lar since the vote for | ||
Brexit at a ref­er­en­dum in June. | ||
</p> | ||
<p> | ||
Earli­er this week, Mi­crosoft an­nounced its cloud products would | ||
cost busi­ness cus­tom­ers here up to 22% more. | ||
</p> | ||
</article> | ||
</section> | ||
<section class="second-post"> | ||
<header class="second-title"> | ||
<h2> | ||
Uber looks to flying cars as next big shift | ||
</h2> | ||
</header> | ||
<hr> | ||
<p class="author"> | ||
By Eli Blumenthal, USA TODAY | ||
</p> | ||
<hr> | ||
<article class="post-2"> | ||
<p> | ||
NEW YORK — While most of the auto in­dustry is fo­cused on get­ting | ||
self-driv­ing cars rolling, Uber already has its eyes set to the skies. | ||
Lit­er­ally. | ||
</p> | ||
<p> | ||
In a white pa­per pub­lished this week, the com­pany de­tailed | ||
plans for Uber El­ev­ate, its new di­vi­sion for of­fer­ing | ||
rides through fly­ing cars. | ||
</p> | ||
<p> | ||
The com­pany hopes to have the pro­gram up and run­ning with­in | ||
a dec­ade. | ||
</p> | ||
<div> | ||
<img class="zoom-img" src="image/uber-elevate.jpg" alt="uber-elevate-route"> | ||
</div> | ||
<p> | ||
|
||
In ad­di­tion to be­ing in­cred­ibly cool, Uber stresses the | ||
many be­ne­fits of this meth­od of trans­port­a­tion in | ||
this new mode of trans­port­a­tion, time sav­ing be­ing | ||
the biggest. | ||
</p> | ||
<p> | ||
<q>Ima­gine trav­el­ing from San Fran­cisco’s Mar­ina | ||
(dis­trict) to work in down­town San Jose — a drive that would | ||
nor­mally oc­cupy the bet­ter part of two hours — in only 15 minutes, | ||
</q> writes Jeff Hold­en, Uber's chief product of­ficer, and Nikhil | ||
Goel, the com­pany's product man­ager for Uber El­ev­ate and | ||
ad­vanced pro­grams, in the white pa­per. | ||
</p> | ||
<p> | ||
<q>What if you could save nearly four hours round-trip between São | ||
Paulo’s city cen­ter and the sub­urbs in Camp­i­nas? Or ima­gine | ||
re­du­cing your 90-plus minute stop-and-go com­mute from Gur­gaon to | ||
your of­fice in cent­ral New Del­hi to a mere six minutes,</q> | ||
they wrote. | ||
<img class="uber-img" src="image/uber.jpg" alt="Uber flying cars"> | ||
</p> | ||
<p> | ||
Plus with more people in the air, the com­pany an­ti­cip­ates it | ||
loosen­ing the bur­den on the roads, par­tic­u­larly in | ||
heav­ily-con­ges­ted areas. | ||
</p> | ||
<p> | ||
The com­pany ac­know­ledges that there are chal­lenges for | ||
get­ting this project off the ground. As op­posed to us­ing | ||
heli­copters, which are ex­pens­ive and noisy, the com­pany | ||
will in­stead be re­ly­ing on VTOLs, or "a net­work of small, | ||
elec­tric air­craft that take off and land ver­tic­ally." | ||
</p> | ||
<p> | ||
The VTOLs are cheap­er and quieter, and their elec­tron­ic basis also | ||
mean they will bet­ter for the en­vir­on­ment than the gas-powered | ||
heli­copters. Bat­tery tech­no­logy still needs to im­prove, | ||
and as these are fly­ing vehicles, the com­pany notes there will need to be | ||
some air traffic con­trol mech­an­ism in place. These vehicles also will | ||
need prop­erly trained pi­lots at the con­trol, at least un­til they | ||
too be­come self-driv­ing. | ||
</p> | ||
<p> | ||
Plus there's the eco­nom­ics. This type of fly­ing air­craft, which | ||
is already be­ing de­veloped by a vari­ety of com­pan­ies | ||
in­clud­ing Joby Avi­ation, Zee.Aero and Air­bus, will be pricey | ||
ini­tially, though Uber an­ti­cip­ates that with scale it will | ||
drop. For the con­sumer, it sees prices start­ing out high but drop­ping | ||
over time thanks to its Uber Pool sys­tem. | ||
</p> | ||
<p> | ||
A 45-mile pool VTOL, for ex­ample, would re­place a 60-mile car ride | ||
for po­ten­tially as low as $21. And the trek would only be 15 minutes. | ||
</p> | ||
<p> | ||
The com­pany is plan­ning an El­ev­ate Sum­mit for early next | ||
year to fur­ther set the wheels in mo­tion. | ||
</p> | ||
<p> | ||
As for tim­ing, the com­pany hopes to have vehicles ready with­in the | ||
next five years, with fleets de­ploy­ing over the fol­low­ing five | ||
years after that. In the in­ter­im, well, there's al­ways those more | ||
tra­di­tion­al self-driv­ing Uber cars. | ||
</p> | ||
</article> | ||
</section> | ||
</main> | ||
</body> | ||
</html> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
безвендорное правило должно идти после