-
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
Open
askeip
wants to merge
23
commits into
urfu-2016:master
Choose a base branch
from
askeip: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
Кужелев Евгений #45
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
4ef5910
paper created
askeip a814902
lint fixes
askeip e9f1ed9
spaces
askeip 8271c18
spaces
askeip 921bdf5
spaces fight webstorm
askeip 2977dbe
ultrakludge added (wow)
askeip 2aeb80d
spaces fix
askeip ba34064
thead fix
askeip 72b731b
lang en
askeip e445b58
$ fix
askeip 8341516
& fix
askeip 84d427c
spaces before </ fix
askeip d797a30
-float, +inline-block (firefox still bad)
askeip d1bcbd6
refactoring 1
askeip 2002307
some refactoring made
askeip a58508c
paper looks same in google/mozilla
askeip 7542873
lint fixed
askeip bc73b19
hru wakeup
askeip 615a226
column-3 => three-columns-text
askeip 2a22b87
mentor's comments fixed
askeip 5f30c70
verticle-text added
askeip f80a727
lint fixed
askeip 5b43811
refactored
askeip 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.
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.
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,241 @@ | ||
@font-face | ||
{ | ||
font-family: Cloister Black; | ||
src: local('Cloister Black') | ||
, url(cloisterblack-webfont.woff2) format('woff2') | ||
, url(cloisterblack-webfont.woff) format('woff') | ||
, url(cloisterblack-webfont.ttf) format('truetype'); | ||
} | ||
|
||
@font-face | ||
{ | ||
font-family: Roland; | ||
src: local('Roland') | ||
, 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: local('Black Label') | ||
, 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, | ||
section, | ||
p | ||
{ | ||
padding: 0; | ||
margin: 0; | ||
} | ||
|
||
html | ||
{ | ||
font-size: 16px; | ||
} | ||
|
||
body | ||
{ | ||
margin: 0 20px 20px; | ||
} | ||
|
||
.rate thead | ||
{ | ||
text-align: center; | ||
} | ||
|
||
.info div, | ||
.info h1 | ||
{ | ||
display: inline-block; | ||
margin-bottom: 15px; | ||
} | ||
|
||
.dateinfo | ||
{ | ||
margin-bottom: 15px; | ||
} | ||
|
||
.weather | ||
{ | ||
width: 20%; | ||
} | ||
|
||
.weather h4 | ||
{ | ||
font: italic 1em Arial, sans-serif; | ||
} | ||
|
||
.weather p | ||
{ | ||
font: .8em Arial, sans-serif; | ||
} | ||
|
||
.info h1 | ||
{ | ||
width: 59%; | ||
font: 5em Cloister Black, sans-serif; | ||
text-align: center; | ||
} | ||
|
||
.rate | ||
{ | ||
margin-top: 20px; | ||
width: 20%; | ||
font-size: 1em; | ||
} | ||
|
||
.rate table | ||
{ | ||
width: 100%; | ||
border: .2em solid black; | ||
border-spacing: 0; | ||
} | ||
|
||
.rate th | ||
{ | ||
border-top: 1px solid black; | ||
border-bottom: 1px solid black; | ||
} | ||
|
||
.rate th, | ||
.rate td | ||
{ | ||
padding: .2em; | ||
margin: 0; | ||
border-right: 1px solid black; | ||
} | ||
|
||
.date | ||
{ | ||
width: 100%; | ||
border-top: 2px solid black; | ||
border-bottom: 2px solid black; | ||
padding: .2em; | ||
} | ||
|
||
.date p | ||
{ | ||
text-align: center; | ||
border-top: 2px solid black; | ||
border-bottom: 2px solid black; | ||
text-transform: uppercase; | ||
font-size: 1.3em; | ||
} | ||
|
||
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; | ||
} | ||
|
||
.paper | ||
{ | ||
-webkit-column-count: 2; | ||
-moz-column-count: 2; | ||
column-count: 2; | ||
margin: 15px 0; | ||
} | ||
|
||
.three-columns-text | ||
{ | ||
-webkit-column-count: 3; | ||
-moz-column-count: 3; | ||
column-count: 3; | ||
} | ||
|
||
.paper h3 | ||
{ | ||
text-align: center; | ||
font-size: 1.1em; | ||
} | ||
|
||
.paper p | ||
{ | ||
font-size: .9em; | ||
} | ||
|
||
.big-text p | ||
{ | ||
font-size: 1.1em; | ||
font-style: oblique; | ||
} | ||
|
||
.img-block | ||
{ | ||
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; | ||
} | ||
|
||
.img-block img | ||
{ | ||
width: 100%; | ||
height: 100%; | ||
} | ||
|
||
.img-block p | ||
{ | ||
font-size: 1em; | ||
} | ||
|
||
.vertical-img-block | ||
{ | ||
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: left; | ||
} | ||
|
||
.vertical-img-block img | ||
{ | ||
display: inline-block; | ||
width: 85%; | ||
height: 100%; | ||
} | ||
|
||
.vertical-img-block p | ||
{ | ||
display: inline-block; | ||
-ms-word-wrap: break-word; | ||
word-wrap: break-word; | ||
word-break: break-all; | ||
width: 1em; | ||
font-size: 1em; | ||
} | ||
|
||
.allcols | ||
{ | ||
column-span: all; | ||
} | ||
|
||
.paper p:first-of-type:first-letter | ||
{ | ||
font-family: Roland, serif; | ||
font-size: 1.5em; | ||
} | ||
|
||
.excrete-name | ||
{ | ||
font-size: 1.5em; | ||
font-family: Cloister Black, serif; | ||
} |
Oops, something went wrong.
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.
Зачем делать
info
иsubinfo
-display: inline-block
, если визуально они выглядят как блочные и им еще руками приходится задавать ширину?