-
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
Работа с API, верстка и анимации | 6-api-and-markup | Кузвесов Артём #9
Open
ArtKuz
wants to merge
19
commits into
yandex-shri-ekb:master
Choose a base branch
from
ArtKuz: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
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
478c698
Первая версия приложения
ArtKuz 4d763b5
Доработка
ArtKuz 39d0c05
Правка
ArtKuz 6abcfb2
Update
ArtKuz b99a010
Update
ArtKuz b6db750
Update
ArtKuz fe0c69c
Update
ArtKuz efb4891
Update
ArtKuz dd30fd0
Delete .DS_Store
ArtKuz 7f73473
Delete .DS_Store
ArtKuz cf8d75d
Delete .DS_Store
ArtKuz d9fa195
Update
ArtKuz 648bcf0
Prod
ArtKuz 2fcf3da
Prod
ArtKuz 16fdde9
Prod
ArtKuz a5e9050
Правка под комментарии
ArtKuz b7b9b57
Правка под комментарии
ArtKuz 4f465d7
Правка под комментарии
ArtKuz 79fe6e1
Update app.js
ArtKuz 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
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,259 @@ | ||
html, | ||
body, | ||
h1, | ||
h2, | ||
p | ||
{ | ||
margin: 0; | ||
} | ||
|
||
ol, ul | ||
{ | ||
list-style: none; | ||
padding: 0; | ||
} | ||
|
||
a | ||
{ | ||
color: #6da3bd; | ||
} | ||
|
||
a:hover | ||
{ | ||
color: #4d7285; | ||
} | ||
|
||
body | ||
{ | ||
padding: 10px; | ||
min-width: 950px; | ||
background: #fff; | ||
color: #000; | ||
text-align: left; | ||
font: 400 16px Arial, Helvetica, sans-serif; | ||
} | ||
|
||
header | ||
{ | ||
height: 110px; | ||
display: block; | ||
border-bottom: 4px solid #fc3; | ||
} | ||
|
||
h1 | ||
{ | ||
padding: 0 0 10px; | ||
text-align: center; | ||
font: 400 36px Verdana, Helvetica, sans-serif; | ||
} | ||
|
||
h1 span | ||
{ | ||
color: #f00; | ||
} | ||
|
||
h2 | ||
{ | ||
padding: 0 0 10px; | ||
font: 700 16px Verdana, Helvetica, sans-serif; | ||
} | ||
|
||
ul.nav li | ||
{ | ||
display: inline; | ||
margin: 0 10px 0 0; | ||
} | ||
|
||
ul.nav li a.active | ||
{ | ||
color: #f00; | ||
text-decoration: none; | ||
} | ||
|
||
#loading | ||
{ | ||
position: absolute; | ||
z-index: 1; | ||
display: none; | ||
width: 100%; | ||
height: 100%; | ||
background: #fff; | ||
opacity: 0.9; | ||
} | ||
|
||
#loading img | ||
{ | ||
margin: 70px 50%; | ||
} | ||
|
||
#loading .textload | ||
{ | ||
left: 30px; | ||
position: relative; | ||
text-align: center; | ||
top: -60px; | ||
} | ||
|
||
section | ||
{ | ||
margin: 30px auto; | ||
display: block; | ||
} | ||
|
||
header section | ||
{ | ||
margin: 0 auto; | ||
} | ||
|
||
.miniatures .miniature | ||
{ | ||
display: inline-block; | ||
margin: 10px; | ||
position: relative; | ||
vertical-align: top; | ||
} | ||
|
||
.miniatures .miniature .image | ||
{ | ||
cursor: pointer; | ||
display: block; | ||
overflow: hidden; | ||
height: 150px; | ||
z-index: 1; | ||
position: relative; | ||
} | ||
|
||
.miniatures .miniature .image img | ||
{ | ||
height: 150px; | ||
} | ||
|
||
.miniatures .miniature .shortDescription | ||
{ | ||
background: none repeat scroll 0 0 #2B2B2B; | ||
display: none; | ||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.8); | ||
left: 0; | ||
margin: -10px -10px 0; | ||
padding: 170px 10px 10px; | ||
position: absolute; | ||
right: 0; | ||
text-align: left; | ||
top: 0; | ||
z-index: 2; | ||
color: #fff; | ||
overflow: hidden; | ||
} | ||
|
||
.miniatures .miniature .shortDescription .title | ||
{ | ||
font-weight: 700; | ||
} | ||
|
||
.miniatures .miniature:hover .shortDescription, | ||
.miniatures .miniature.selected .shortDescription | ||
{ | ||
display: block; | ||
} | ||
|
||
.miniatures .miniature:hover .image, | ||
.miniatures .miniature.selected .image | ||
{ | ||
z-index: 3; | ||
} | ||
|
||
.miniatures .miniature.selected .title, | ||
.miniatures .miniature.selected .author | ||
{ | ||
display: none; | ||
} | ||
|
||
.preview | ||
{ | ||
background: none repeat scroll 0 0 #2b2b2b; | ||
width: 100%; | ||
position: relative; | ||
display: none; | ||
|
||
} | ||
|
||
.preview .close | ||
{ | ||
color: #a7a7a7; | ||
cursor: pointer; | ||
font-size: 40px; | ||
font-weight: 800; | ||
position: absolute; | ||
right: 20px; | ||
top: 5px; | ||
} | ||
|
||
.preview .close:hover | ||
{ | ||
color: #fff; | ||
} | ||
|
||
.preview .slider | ||
{ | ||
position: relative; | ||
margin: 0 430px 0 10px; | ||
padding: 20px 0 10px; | ||
text-align: center; | ||
} | ||
|
||
.preview .slider .prev, | ||
.preview .slider .next | ||
{ | ||
color: #a7a7a7; | ||
cursor: pointer; | ||
font-size: 50px; | ||
margin: -40px 0 0; | ||
position: absolute; | ||
top: 50%; | ||
display: none; | ||
} | ||
|
||
.preview .slider .prev | ||
{ | ||
left: 0; | ||
} | ||
|
||
.preview .slider .next | ||
{ | ||
right: 0; | ||
} | ||
|
||
.preview .slider .prev:hover, | ||
.preview .slider .next:hover | ||
{ | ||
color: #fff; | ||
} | ||
|
||
.preview .description | ||
{ | ||
color: #eee; | ||
position: absolute; | ||
right: 10px; | ||
text-align: left; | ||
top: 50px; | ||
width: 380px; | ||
} | ||
|
||
.preview .description ul | ||
{ | ||
margin: 20px 0 0 0; | ||
} | ||
|
||
.more | ||
{ | ||
border: 4px solid #fc3; | ||
margin: 0 auto; | ||
text-align: center; | ||
width: 200px; | ||
cursor: pointer; | ||
} | ||
|
||
.more:hover | ||
{ | ||
background: #fc3; | ||
} |
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,56 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<meta charset="utf-8"> | ||
<meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1"> | ||
<title>Работа с API, верстка и анимации | 6-api-and-markup | Кузвесов Артём</title> | ||
<link rel="stylesheet" href="css/style.css"> | ||
<!--[if lt IE 9]> | ||
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> | ||
<![endif]--> | ||
<script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.9/require.min.js" data-main="js/main.js"></script> | ||
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> | ||
</head> | ||
<body> | ||
<div id="loading"> | ||
<img src="images/loading.gif" width="64px" height="64px" alt="Загрузка"> | ||
<div class="textload">Идёт загрузка...</div> | ||
</div> | ||
<header> | ||
<section> | ||
<h1><span>Р</span>абота с API, верстка и анимации</h1> | ||
<ul class="nav"> | ||
<li> | ||
<a id="top" class="active" href="#">Популярные фотографии</a> | ||
</li> | ||
<li> | ||
<a id="recent" href="#">Новые интересные фотографии</a> | ||
</li> | ||
<li> | ||
<a id="podhistory" href="#">Фото дня</a> | ||
</li> | ||
</ul> | ||
</section> | ||
</header> | ||
<section class="content"> | ||
<ul class="miniatures"> | ||
<li class="preview"> | ||
<div class="close">×</div> | ||
<div class="slider"> | ||
<div class="prev">←</div> | ||
<div class="next">→</div> | ||
<img src="" alt=""> | ||
</div> | ||
<div class="description"> | ||
<h2></h2> | ||
<div class="author">Автор: <a href=""></a></div> | ||
<ul> | ||
</ul> | ||
</div> | ||
</li> | ||
</ul> | ||
<div class="more">Больше фотографий...</div> | ||
</section> | ||
</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.
Если мне не изменяет память, новые элементы в IE8 и ниже принимают значение
display: inline;
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.
Разве вот это не решает проблемы с IE8 и ниже?
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.
Точно, этот момент я не взял во внимание.