-
Notifications
You must be signed in to change notification settings - Fork 12
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
Д\з 6 - Belousov #7
Open
i4got10
wants to merge
7
commits into
yandex-shri-ekb:master
Choose a base branch
from
i4got10:belousov
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
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
54807ca
at work
i4got10 86ccdfa
init
i4got10 32e3ba2
app now can resize images to fill the rows
i4got10 4f00f9a
preview
i4got10 8e31c33
переключалка, постраничка
i4got10 4ebb602
стрелочки
i4got10 72adfba
mayton - глаз-алмаз
i4got10 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 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 @@ | ||
.idea |
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,196 @@ | ||
.clearfix:before, .clearfix:after | ||
{ | ||
content: ""; | ||
display: table; | ||
} | ||
|
||
.clearfix:after | ||
{ | ||
clear: both; | ||
} | ||
|
||
.clearfix | ||
{ | ||
*zoom: 1; | ||
} | ||
|
||
.pseudo-link | ||
{ | ||
border-bottom: 1px dotted; | ||
color: #0d44a0; | ||
cursor: pointer; | ||
} | ||
|
||
.pseudo-link.active | ||
{ | ||
color: #f00; | ||
} | ||
|
||
.pseudo-link:hover | ||
{ | ||
color: #f00; | ||
} | ||
|
||
.switcher | ||
{ | ||
margin: 0 0 20px; | ||
} | ||
|
||
.images | ||
{ | ||
|
||
} | ||
|
||
.image | ||
{ | ||
background: #EBEBEB; | ||
float: left; | ||
position: relative; | ||
margin: 0 0 10px 10px; | ||
} | ||
|
||
.image:hover .image__info, | ||
.image_selected .image__info | ||
{ | ||
display: block; | ||
} | ||
|
||
.image:hover .image__img, | ||
.image_selected .image__img | ||
{ | ||
z-index: 2; | ||
position: relative; | ||
} | ||
|
||
.image_first | ||
{ | ||
margin-left: 0; | ||
} | ||
|
||
.image_selected .image__title, | ||
.image_selected .image__author { | ||
display: none; | ||
} | ||
|
||
.image__img-wrapper | ||
{ | ||
height: 150px; | ||
overflow: hidden; | ||
} | ||
|
||
.image__img | ||
{ | ||
display: block; | ||
} | ||
|
||
.image__info | ||
{ | ||
text-align: left; | ||
position: absolute; | ||
top: 0; | ||
left: 0; | ||
right: 0; | ||
margin: -8px -8px 0; | ||
padding: 158px 8px 8px; | ||
display: none; | ||
background-color: #2B2B2B; | ||
z-index: 1; | ||
} | ||
|
||
.image__title | ||
{ | ||
color: #FFF; | ||
} | ||
|
||
.image__author | ||
{ | ||
color: #FFF; | ||
} | ||
|
||
.preview | ||
{ | ||
background: #252424; | ||
display: none; | ||
margin: 0 0 10px 0; | ||
padding: 20px; | ||
position: relative; | ||
clear: both; | ||
} | ||
|
||
.preview__img | ||
{ | ||
margin: 0 auto; | ||
} | ||
|
||
.preview__arrow | ||
{ | ||
color: #FFF; | ||
cursor: pointer; | ||
font: 40px/45px Arial; | ||
height: 50px; | ||
position: absolute; | ||
bottom: 0; | ||
top: 0; | ||
margin: auto 0; | ||
text-align: center; | ||
width: 50px; | ||
} | ||
|
||
.preview__arrow_disabled | ||
{ | ||
display: none; | ||
} | ||
|
||
.preview__arrow:hover | ||
{ | ||
color: #A3A3A3; | ||
} | ||
|
||
.preview__arrow_prev | ||
{ | ||
left: 15px; | ||
} | ||
|
||
.preview__arrow_next | ||
{ | ||
right: 15px; | ||
} | ||
|
||
.preview__close | ||
{ | ||
color: #FFF; | ||
cursor: pointer; | ||
font: 40px/50px Arial; | ||
height: 50px; | ||
margin: auto 0; | ||
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, наверное, здесь не нужен? 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. Да, здесь не нужен. Неудачный копипаст со стрелочки :) |
||
position: absolute; | ||
right: 5px; | ||
text-align: center; | ||
top: 5px; | ||
width: 50px; | ||
} | ||
|
||
.preview__close:hover | ||
{ | ||
color: #A3A3A3; | ||
} | ||
|
||
.images-more | ||
{ | ||
border: 1px dashed #0D44A0; | ||
padding: 5px; | ||
text-align: center; | ||
cursor: pointer; | ||
} | ||
|
||
.images-more:hover | ||
{ | ||
border: 1px dashed #F00; | ||
} | ||
|
||
.images-more_disabled, | ||
.images-more_disabled:hover | ||
{ | ||
border: 1px dashed #A3A3A3; | ||
cursor: default; | ||
} |
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,44 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<title></title> | ||
<meta charset="utf-8"> | ||
<link rel="stylesheet" href="css/style.css"/> | ||
<script data-main="js/main.js" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.9/require.min.js"></script> | ||
</head> | ||
<body> | ||
|
||
<h1>Работа с API, верстка и анимации</h1> | ||
|
||
<div class="switcher"> | ||
<span id="switch-top" class="pseudo-link active">Популярные</span> / | ||
<span id="switch-day" class="pseudo-link">фото дня</span> / | ||
<span id="switch-interesting" class="pseudo-link">Новые интересные фотографии</span> | ||
</div> | ||
|
||
<div class="images clearfix" id="images"></div> | ||
<div class="images-more" id="images-more">Больше изображений</div> | ||
|
||
<script id="image-template" type="text/x-handlebars-template"> | ||
<div class="image"> | ||
<div class="image__img-wrapper"> | ||
<img class="image__img" src="{{ image.img.M.href }}" alt="{{ image.title }}"/> | ||
</div> | ||
|
||
<div class="image__info"> | ||
<div class="image__title">{{ image.title }}</div> | ||
<div class="image__author">{{ image.authors.0.name }}</div> | ||
</div> | ||
</div> | ||
</script> | ||
|
||
<div id="preview" class="preview"> | ||
<div class="preview__arrow preview__arrow_prev">←</div> | ||
<div class="preview__arrow preview__arrow_next">→</div> | ||
<div class="preview__close">×</div> | ||
<div class="preview__img"> | ||
<img src="" alt=""/> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
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.
;-)
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.
🎯 в яблочко