-
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
Сокерин Тимофей #4
Open
kmn75
wants to merge
3
commits into
urfu-2016:master
Choose a base branch
from
kmn75: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
3 commits
Select commit
Hold shift + click to select a range
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
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.
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,104 @@ | ||
body | ||
{ | ||
width: 100%; | ||
height: 100%; | ||
font-family: 'trebuchet ms', sans-serif; | ||
font-size: 15px; | ||
background: #dfe2e3; | ||
line-height: 18px; | ||
} | ||
|
||
header | ||
{ | ||
text-align: center; | ||
} | ||
|
||
footer | ||
{ | ||
text-align: center; | ||
} | ||
|
||
h4 | ||
{ | ||
font-size: 22px; | ||
font-weight: normal; | ||
} | ||
|
||
.vitrina | ||
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. не называй транслитом |
||
{ | ||
clear: both; | ||
overflow: hidden; | ||
text-align: center; | ||
font-size: 0; | ||
padding: 10px 20px; | ||
line-height: 24px; | ||
} | ||
|
||
.blocks | ||
{ | ||
vertical-align: top; | ||
display: inline-block; | ||
text-align: left; | ||
width: 20%; | ||
padding: 2%; | ||
font-size: 13px; | ||
} | ||
|
||
.blocks img | ||
{ | ||
display: block; | ||
margin: auto; | ||
max-width: 100%; | ||
} | ||
|
||
.price | ||
{ | ||
color: blue; | ||
} | ||
|
||
a:hover | ||
{ | ||
background: grey; | ||
color: white; | ||
} | ||
|
||
img:hover | ||
{ | ||
opacity: .7; | ||
} | ||
|
||
.blocks:hover | ||
{ | ||
background: grey; | ||
color: white; | ||
} | ||
|
||
.rating | ||
{ | ||
unicode-bidi: bidi-override; | ||
direction: rtl; | ||
} | ||
|
||
.rating > span | ||
{ | ||
display: inline-block; | ||
position: relative; | ||
width: 1.1em; | ||
} | ||
|
||
.rating > span:hover:before, | ||
.rating > span:hover ~ span:before | ||
{ | ||
content: '\2605'; | ||
position: absolute; | ||
color: blue; | ||
} | ||
|
||
@media only screen and (max-width:720px) | ||
{ | ||
.blocks | ||
{ | ||
display: block; | ||
width: 96%; | ||
} | ||
} |
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 |
---|---|---|
@@ -1,8 +1,89 @@ | ||
<!DOCTYPE html> | ||
<html lang="ru"> | ||
<head> | ||
<meta charset="utf-8"> | ||
</head> | ||
<body> | ||
</body> | ||
<head> | ||
<title>Мяндекс.Муррркет</title> | ||
<meta charset="utf-8"> | ||
<meta name="description" content="Магазин кошек: https://github.com/urfu-2016/markup-task-5"> | ||
<link rel="stylesheet" type="text/css" href="index.css"> | ||
</head> | ||
<body> | ||
<header> | ||
<h1>Мяндекс.Муррркет</h1> | ||
</header> | ||
<div class="vitrina"> | ||
<div class="blocks"> | ||
<img src="img/cat1.jpg" alt="cat1" title="cat1"> | ||
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. alt и title должны отражать что на картинке |
||
<h4><a href="#">Великолепная кошечка</a></h4> | ||
<a href="#">Бабулин магазин</a> - <a href="#">Коты</a> | ||
<div class="rating"> | ||
<span>☆</span><span>☆</span><span>☆</span> | ||
<span>☆</span><span>☆</span> | ||
</div> | ||
<div class="price">Цена: 39 999 руб.</div> | ||
<p>Умильные глазки и удивленный взгляд поразят ваше воображение. | ||
Она увидит любого гостя в вашем доме.</p> | ||
</div> | ||
<div class="blocks"> | ||
<img src="img/cat2.jpg" alt="cat2" title="cat2"> | ||
<h4><a href="#">Царская особа</a></h4> | ||
<a href="#">Бабулин магазин</a> - <a href="#">Коты</a> | ||
<div class="rating"> | ||
<span>☆</span><span>☆</span><span>☆</span> | ||
<span>☆</span><span>☆</span> | ||
</div> | ||
<div class="price">Цена: 555 999 руб.</div> | ||
<p>Несмотря на обычный и непримечательный вид, данная особа обладает | ||
всеми навыками, достойными царской особы.</p> | ||
</div> | ||
<div class="blocks"> | ||
<img src="img/cat3.jpg" alt="cat3" title="cat3"> | ||
<h4><a href="#">Неповторимая барышня</a></h4> | ||
<a href="#">Бабулин магазин</a> - <a href="#">Коты</a> | ||
<div class="rating"> | ||
<span>☆</span><span>☆</span><span>☆</span> | ||
<span>☆</span><span>☆</span> | ||
</div> | ||
<div class="price">Цена: 47 050 руб.</div> | ||
<p>Настоящая барышня славится не только хорошими манерами, но и | ||
умеет быстро выполнять поручения хозяев.</p> | ||
</div> | ||
<div class="blocks"> | ||
<img src="img/cat4.jpg" alt="cat4" title="cat4"> | ||
<h4><a href="#">Насмешка судьбы</a></h4> | ||
<a href="#">Бабулин магазин</a> - <a href="#">Коты</a> | ||
<div class="rating"> | ||
<span>☆</span><span>☆</span><span>☆</span> | ||
<span>☆</span><span>☆</span> | ||
</div> | ||
<div class="price">Цена: 33 000 руб.</div> | ||
<p>Скрасит ваши серые будни яркими красками и незаурядным настроением.</p> | ||
</div> | ||
<div class="blocks"> | ||
<img src="img/cat5.jpg" alt="cat5" title="cat5"> | ||
<h4><a href="#">Садовая особая</a></h4> | ||
<a href="#">Бабулин магазин</a> - <a href="#">Коты</a> | ||
<div class="rating"> | ||
<span>☆</span><span>☆</span><span>☆</span> | ||
<span>☆</span><span>☆</span> | ||
</div> | ||
<div class="price">Цена: 27 000 руб.</div> | ||
<p>Умеет справляться с мышами, оградит ваш огород от незванных гостей.</p> | ||
</div> | ||
<div class="blocks"> | ||
<img src="img/cat6.jpg" alt="cat6" title="cat6"> | ||
<h4><a href="#">Просто рыжая</a></h4> | ||
<a href="#">Бабулин магазин</a> - <a href="#">Коты</a> | ||
<div class="rating"> | ||
<span>☆</span><span>☆</span><span>☆</span> | ||
<span>☆</span><span>☆</span> | ||
</div> | ||
<div class="price">Цена: 50 000 руб.</div> | ||
<p>Поможет в любой жизненной ситуации, будет верным помощником и | ||
оберегом в ваших делах.</p> | ||
</div> | ||
</div> | ||
<footer> | ||
<h4>Магазин котов от бабули © 2016.</h4> | ||
</footer> | ||
</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.
Лучше не использовать в селекторах теги, которые могут встречаться на странице не один раз