-
Notifications
You must be signed in to change notification settings - Fork 67
Фомин Денис #59
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
Open
ilearnf
wants to merge
10
commits into
urfu-2016:master
Choose a base branch
from
ilearnf: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
Фомин Денис #59
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
137fd25
initial
ilearnf a11487c
css linted
ilearnf f275e59
linted
ilearnf 68bfe2d
html linted
ilearnf c45795b
linted
ilearnf 722e91c
html
ilearnf 2d17216
html linted
ilearnf dcff8ee
lint
ilearnf 0d96c2a
html
ilearnf 5ea2271
task1
ilearnf 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
This file contains hidden or 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,129 @@ | ||
| .newspaper | ||
| { | ||
| background: #c5d010; | ||
| } | ||
|
|
||
| .half-width | ||
| { | ||
| width: 49%; | ||
| display: inline-block; | ||
| } | ||
|
|
||
| img | ||
| { | ||
| max-width: 300%; | ||
| height: auto; | ||
| } | ||
|
|
||
| article | ||
| { | ||
| column-span: 1; | ||
| column-rule: 1px solid #000; | ||
| } | ||
|
|
||
| article.two-columns | ||
| { | ||
| -webkit-column-count: 2; | ||
| -moz-column-count: 2; | ||
| column-count: 2; | ||
| } | ||
|
|
||
| article.three-columns | ||
| { | ||
| -webkit-column-count: 3; | ||
| -moz-column-count: 3; | ||
| column-count: 3; | ||
| } | ||
|
|
||
| article > p:first-of-type::first-letter | ||
| { | ||
| color: red; | ||
| } | ||
|
|
||
| article p | ||
| { | ||
| text-align: justify; | ||
| } | ||
|
|
||
| article .spanned | ||
| { | ||
| -webkit-column-span: all; | ||
| column-span: all; | ||
| } | ||
|
|
||
| article p.formatted | ||
| { | ||
| white-space: pre-wrap; | ||
| } | ||
|
|
||
| blockquote | ||
| { | ||
| border-left: 10px solid #ccc; | ||
| quotes: '\201C''\201D''\2018''\2019'; | ||
| line-height: 2em; | ||
| width: auto; | ||
| background: gray; | ||
| } | ||
|
|
||
| blockquote:hover | ||
| { | ||
| margin: 1.5em 10px; | ||
| padding: .5em 10px; | ||
| } | ||
|
|
||
| blockquote:before | ||
| { | ||
| color: #ccc; | ||
| content: open-quote; | ||
| } | ||
|
|
||
| blockquote:after | ||
| { | ||
| content: '\'\''; | ||
| } | ||
|
|
||
| article p.huge-spaced | ||
| { | ||
| letter-spacing: .8em; | ||
| } | ||
|
|
||
| article p.small-caps | ||
| { | ||
| font-variant: small-caps; | ||
| } | ||
|
|
||
| article p.obluque | ||
| { | ||
| font-style: oblique; | ||
| } | ||
|
|
||
| article p.light | ||
| { | ||
| font-weight: light; | ||
| } | ||
|
|
||
| article p.cursive | ||
| { | ||
| font-family: cursive; | ||
| } | ||
|
|
||
| article p.indented | ||
| { | ||
| text-indent: 5%; | ||
| } | ||
|
|
||
| article p.bad-fonted | ||
| { | ||
| font-family: 'Comic Sans MS' 'Comic Sans' fantasy; | ||
| line-height: 16px; | ||
| } | ||
|
|
||
| article p.helvetica | ||
| { | ||
| font-family: Helvetica monospace; | ||
| } | ||
|
|
||
| article p.pink-shadowed | ||
| { | ||
| text-shadow: 4px 4px 10px #ff69b4; | ||
| } |
This file contains hidden or 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,127 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="ru"> | ||
| <html lang="en"> | ||
| <head> | ||
| <title>News</title> | ||
| <meta charset="utf-8"> | ||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> | ||
| <link rel="stylesheet" href="index.css"> | ||
| </head> | ||
| <body> | ||
| <div class="newspaper"> | ||
| <div class="half-width"> | ||
| <article class="three-columns"> | ||
| <p class="formatted"> | ||
| d | ||
| d | ||
| d | ||
| </p> | ||
| <p> | ||
| Desmond believes that you should cough up a little more dough to be a | ||
| little more gungho | ||
|
|
||
| Are you a sensible, grown-up adult that calculates how long one tank of fuel can | ||
| last? Are you a practical, | ||
| </p> | ||
| <blockquote>level-headed parent</blockquote> | ||
| <p>of two that needs a decent-sized sport-utility vehicle (SUV) that will fit | ||
| the kids and the weekend groceries? If so, when deciding which | ||
| Qashqai to buy, the answer is definitively the 1.2-litre variant. | ||
| </p> | ||
| </article> | ||
| <article class="three-columns"> | ||
| <img src="http://i.i-sgcm.com/news/article_events/2016/3295_4_l.jpg" title="car1" alt="car" | ||
| class="spanned"> | ||
| <h2 class="spanned">TitleLet's get one thing straight,</h2> | ||
| <p class="huge-spaced cursive indented"> | ||
| Let's | ||
| </p> | ||
| <p class="helvetica">get one thing straight, I'm not the kind of person who | ||
| would blow hundreds of dollars on a pair of sneakers (you know who you are). | ||
| Neither would I spend an additional $10,000 on a few extra bells and whistles. | ||
| That kind of dough could be put to better use. The 1.2 DIG-T model comes with | ||
| an ECO drive mode that bumps up the car's fuel efficiency and overall practicality | ||
| It's no secret that car ownership in Singapore requires exorbitant amounts of money. | ||
| However, it doesn't mean you can't get a good deal on a great car. Enter the | ||
| Qashqai 1.2 DIG-T, this baby gets the job done just as well as the 2.0 Premium; | ||
| </p> | ||
| <p class="oblique">but at a fraction of the price. It's a downsized, stripped down | ||
| version of its more extravagant brother, of course; but that comes with a | ||
| few perks. For one, it gets better fuel economy (we managed 12km/L out of its | ||
| claimed 17.9km/L). It also has a lower COE premium</p> | ||
| <blockquote>thanks</blockquote> | ||
| <p>to its 1.2-litre DIG-T (Direct Injection Gasoline - Turbocharged) engine, | ||
| which places it in Cat A with a premium of $51,507 (as of 5th October 2016). | ||
| Both variants of the Qashqai are the exact same size, with the same amount | ||
| of boot space - 430 litres (1,585 litres with the rear seats folded). | ||
| </p> | ||
| <p class="bad-fonted">A trip to Ikea would have the 1.2-litre engine working a | ||
| little bit harder but it can hold the same amount of hauls as its 2.0 brethren. | ||
| The 1.2-litre variant sports 17-inch rims, compared to the 2.0's fancy-schmancy | ||
| 19-inch alloys. It doesn't look as good, but heck, it contributes to making the | ||
| car 94kg lighter and offers better fuel economy. Couple that with the ECO drive | ||
| (not present on the 2.0 Premium) and you've got yourself a money saver any | ||
| Asian mother would be proud of. When I buy a car, I look for one that gets | ||
| the job done without breaking the bank. It's not about | ||
| getting a pimped out ride, it's about managing your finances so you don't | ||
| have to cut back on other luxuries for the next couple of years. The novelty | ||
| of having seat warmers and larger rims will eventually wear off, and you'll | ||
| be $10,000 in the hole. | ||
| </p> | ||
| </article> | ||
| </div> | ||
|
|
||
| <div class="half-width"> | ||
| <article class="two-columns"> | ||
| <p> | ||
| ffLet's get one thing straight, I'm not the kind of person who would blow hundreds | ||
| of dollars on a pair of | ||
| sneakers (you know who you are). Neither would I spend an additional $10,000 | ||
| on a few extra bells and whistles. That kind of dough could be put to better use. | ||
| The 1.2 DIG-T model comes with an ECO drive mode that bumps up the car's fuel | ||
| efficiency and overall practicality It's no secret that car ownership in Singapore | ||
| requires exorbitant amounts of money. However, it doesn't mean you can't get a good | ||
| deal on a great car. Enter the Qashqai 1.2 DIG-T, this baby gets the job done | ||
| just as well as the 2 | ||
| </p> | ||
| </article> | ||
| <article class="three-columns"> | ||
| <img src="http://i.i-sgcm.com/news/article_events/2016/3295_1_l.jpg" title="car2" alt="car" | ||
| class="spanned"> | ||
| <h2 class="spanned">TitleLet's get one thing straight,</h2> | ||
| <p> | ||
| Let's get one thing straight, I'm not the kind of person who would blow hundreds | ||
| of dollars on a pair of sneakers (you know who you are). Neither would I spend | ||
| an additional $10,000 on a few extra bells and whistles. That kind of dough | ||
| could be put to better use. The 1.2 DIG-T model comes with an ECO drive mode | ||
| that bumps up the car's fuel efficiency and overall practicality It's no | ||
| secret that car ownership in Singapore requires exorbitant amounts of money. | ||
| However, it doesn't mean you can't get a good deal on a great car. Enter | ||
| the Qashqai 1.2 DIG-T, this baby gets the job done just as well as the 2.0 | ||
| Premium; but at a fraction of the price. It's a downsized, stripped down version | ||
| of its more extravagant brother, of course; but that comes with a few perks. | ||
| For one, it gets better fuel economy (we managed 12km/L out of its claimed | ||
| 17.9km/L). It also has a lower COE premium thanks to its 1.2-litre DIG-T | ||
| (Direct Injection Gasoline - Turbocharged) engine, which places it in | ||
| Cat A with a premium of $51,507 (as of 5th October 2016). Both variants of the | ||
| Qashqai are the exact same size, with the same amount of boot space - | ||
| 430 litres (1,585 litres with the rear seats folded). A trip to Ikea | ||
| would have the 1.2-litre engine working a little bit harder but it can | ||
| hold the same amount of hauls as its 2.0 brethren. The 1.2-litre variant | ||
| sports 17-inch rims, compared to the 2.0's fancy-schmancy 19-inch alloys. | ||
| It doesn't look as good, but heck, it contributes to making the car | ||
| 94kg lighter and offers better fuel economy. Couple that with the ECO drive | ||
| (not present on the 2.0 Premium) and you've got yourself a money | ||
| saver any Asian mother would be proud of. | ||
| </p> | ||
| <p class="pink-shadowed">When I buy a car, I look for one that gets | ||
| the job done without breaking the bank. It's not about | ||
| getting a pimped out ride, it's about managing your finances so you don't have | ||
| to cut back on other luxuries for the next couple of years. The novelty | ||
| of having seat warmers and larger rims will eventually wear off, and you'll | ||
| be $10,000 in the hole. | ||
| </p> | ||
| </article> | ||
| </div> | ||
| </div> | ||
| </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.
Если это заголовок, то почему бы его не обозначить как заголовок?
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.
это не заголовок.