-
Notifications
You must be signed in to change notification settings - Fork 62
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
Черных Артём #64
Open
artemychernykh
wants to merge
13
commits into
urfu-2016:master
Choose a base branch
from
artemychernykh: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
Черных Артём #64
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
8bef15c
save
artemychernykh 9d5f7c1
save
artemychernykh a19dc25
check travis
artemychernykh 1ed9ff8
check travis 2
artemychernykh df9bc7e
stable version
artemychernykh 3e2c399
add star
artemychernykh f0c93cd
change
artemychernykh 9c5904f
+scale
artemychernykh 4b6df81
update
artemychernykh 2fabeb3
attr
artemychernykh ba07586
again attr
artemychernykh 68a091a
scale, effects, radio
artemychernykh 3d7875b
border effect
artemychernykh 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.
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.
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.
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.
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.
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.
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.
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.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
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,136 @@ | ||
body | ||
{ | ||
padding: 0; | ||
} | ||
|
||
.note | ||
{ | ||
width: 250px; | ||
height: 410px; | ||
display: inline-block; | ||
vertical-align: top; | ||
text-overflow: ellipsis; | ||
padding: 5px; | ||
margin: 1px; | ||
position: relative; | ||
} | ||
|
||
.note:hover | ||
{ | ||
background-color: #fa0; | ||
transform: scale(1.05); | ||
border: 3px black solid; | ||
} | ||
|
||
.cat | ||
{ | ||
min-width: 250px; | ||
height: 200px; | ||
position: relative; | ||
} | ||
|
||
.cat img:hover | ||
{ | ||
opacity: 1; | ||
} | ||
|
||
.cat img | ||
{ | ||
position: absolute; | ||
bottom: 0; | ||
opacity: .8; | ||
} | ||
|
||
.note section | ||
{ | ||
overflow: hidden; | ||
text-overflow: ellipsis; | ||
} | ||
|
||
.note a | ||
{ | ||
font-size: 2.2em; | ||
text-overflow: ellipsis; | ||
} | ||
|
||
.note small span | ||
{ | ||
text-decoration: underline; | ||
cursor: pointer; | ||
} | ||
|
||
.price | ||
{ | ||
color: #b00; | ||
font: bold 1.5em sans-serif; | ||
|
||
} | ||
|
||
.price::after | ||
{ | ||
content: attr(dataoldprice); | ||
font-size: .75em; | ||
color: black; | ||
text-decoration: line-through; | ||
|
||
} | ||
|
||
.price:hover | ||
{ | ||
text-shadow: 1px 1px 1px #000; | ||
cursor: pointer; | ||
} | ||
|
||
.info, | ||
.description | ||
{ | ||
vertical-align: top; | ||
} | ||
|
||
.description | ||
{ | ||
padding: 0; | ||
margin: 0; | ||
} | ||
|
||
.description-head | ||
{ | ||
display: block; | ||
font: bold 1.05em serif; | ||
} | ||
|
||
.list:checked ~ .note | ||
{ | ||
display: block; | ||
min-width: 100%; | ||
height: 100%; | ||
vertical-align: top; | ||
position: relative; | ||
} | ||
|
||
.list:checked ~ .note:hover | ||
{ | ||
transform: scaleX(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. Для чего переопределять значение? Можно же добавлять эффект, если выбран режим плиток |
||
} | ||
|
||
.list:checked ~ .note .cat | ||
{ | ||
display: inline-block; | ||
} | ||
|
||
.list:checked ~ .note .cat img | ||
{ | ||
top: 0; | ||
} | ||
|
||
.list:checked ~ .note .info, | ||
.list:checked ~ .note .description | ||
{ | ||
width: 35%; | ||
} | ||
|
||
.list:checked ~ .note section | ||
{ | ||
display: inline-block; | ||
padding-left: 30px; | ||
} |
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
Oops, something went wrong.
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.
font: 700 1.5em sans-serif;
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.
Это даёт какие-нибудь преимущества?