Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Авинас Мария #44

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Авинас Мария #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9c6171d
разметка
MaryaAvinas Nov 7, 2016
beff64f
Стили
MaryaAvinas Nov 7, 2016
6bcb6be
Доп.материалы
MaryaAvinas Nov 7, 2016
f189222
Update index.html
MaryaAvinas Nov 7, 2016
babfa35
Update index.css
MaryaAvinas Nov 7, 2016
c7824a6
deleted extra spaces
MaryaAvinas Nov 7, 2016
09fb6e3
remove spaces to Tab
MaryaAvinas Nov 7, 2016
9b2ff1d
fix css
MaryaAvinas Nov 9, 2016
3880234
fix html
MaryaAvinas Nov 9, 2016
08ddc5e
remove spaces
MaryaAvinas Nov 9, 2016
9081570
remove spaces and fix classes of image with cat
MaryaAvinas Nov 9, 2016
9379acb
add effect to hover cat's photo
MaryaAvinas Nov 9, 2016
9343758
fix name of class
MaryaAvinas Nov 9, 2016
1b0a7b1
change name of class
MaryaAvinas Nov 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added cats_photos/cat1.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat10.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat11.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat12.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat13.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat2.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat3.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat4.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat5.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat6.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat7.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat8.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cats_photos/cat9.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
98 changes: 98 additions & 0 deletions index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
.list-view-checkbox:checked ~ main .cat-photo
{
width: 25%;
display: inline-block;
}

.list-view-checkbox:checked ~ main .information
{
display: inline-block;
vertical-align: top;
padding-left: 10px;
}

.list-view-checkbox:checked ~ main .information .name
{
width: 100%;
Copy link

@trixartem trixartem Nov 14, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Точно такое же свойство ниже
  2. Для чего ширину менять?

}

.list-view-checkbox:checked ~ main .card
{
width: 100%;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Здесь тоже не понятно зачем устанавливать ширину 100%

}

.name-of-market
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

market-name, потому что of не несет смысловой нагрузки и лучше записать короче

{
font-size: 2em;
text-align: center;
background-color: white;
}

.name-of-market header:first-letter
{
color: red;
}

.card
{
margin: 5px 0;
display: inline-table;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Почему inline-table?

width: 250px;
text-overflow: ellipsed;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не правильное свойство. Оно не будет работать.

}

.name a:hover
{
color: red;
}

.category:hover
{
color: gray;
text-decoration: underline;
}

.cat-photo:hover
{
border: 1px solid red;
}

.card:hover
{
background-color: lightgray;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Лучше не описывать цвет словом, а с помощью hex записи

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Лучше использовать hex запись, что бы запись была короче и этот цвет проще менять(делать светлее темнее и т. д.).

border: 1px solid black;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#000 короче

}

.cat-photo
{
max-width: 100%;
}

body
{
background-color: #ff6;
}

.name
{
width: 250px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

.name a
{
color: black;
}

.price .current-price
{
color: red;
font-size: larger;
}

.list-icon
{
width: 30px;
}
280 changes: 279 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,286 @@
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="index.css">
<meta charset="utf-8">
<title>Мяндекс.Мурркет</title>
</head>
<body>
<header class="name-of-market">
Мяндекс.Муррркет<br>
<span>Магазин добрых котиков</span>
</header>
<input type="checkbox" class="list-view-checkbox">
<img alt="иконка для изображения списка" src="spisok.png" title="Список" class="list-icon">
<main>
<div class="card">
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

article

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Где семантика?

<img class="cat-photo" alt="фото полосатого кота" src="cats_photos/cat1.jpg">
<div class="information">
<div class="name" >
<a href="#">Мурзик</a>
</div>
<div class="category">Полосатый</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">12 мурлей</ins>
<del class="old-price">14 мурлей</del>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото рыжего вислоухого кота" src="cats_photos/cat2.jpg">
<div class="information">
<div class="name">
<a href="#">Рыжик</a>
</div>
<div class="category">Полосатый,Рыжий, Вислоухий</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">11 мурлей</ins>
<del class="old-price">13 мурлей</del>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото серого вислоухого кота" src="cats_photos/cat3.jpg">
<div class="information">
<div class="name">
<a href="#">Пушок</a>
</div>
<div class="category">Полосатый, Вислоухий</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">11 мурлей</ins>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото спящего кота" src="cats_photos/cat4.jpg">
<div class="information">
<div class="name">
<a href="#">Кеша</a>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Лишняя вложенность, кажется что достаточно одной ссылки

</div>
<div class="category">Полосатый</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">10 мурлей</ins>
<del class="old-price">12 мурлей</del>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото рыжего полосатого кота" src="cats_photos/cat5.jpg">
<div class="information">
<div class="name">
<a href="#">Соня</a>
</div>
<div class="category">Рыжий</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">12 мурлей</ins>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото котенка в корзинке" src="cats_photos/cat6.jpg">
<div class="information">
<div class="name">
<a href="#">Великий и ужасный Бонифаций IV, но можно просто Боня</a>
</div>
<div class="category">Котенок</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">13 мурлей</ins>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото рыжего пушистого котёнка" src="cats_photos/cat7.jpg">
<div class="information">
<div class="name">
<a href="#">Кнопа</a>
</div>
<div class="category">Котёнок, Рыжий</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">13 мурлей</ins>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото рыжего пушистого кота" src="cats_photos/cat8.jpg">
<div class="information">
<div class="name">
<a href="#">Стеша</a>
</div>
<div class="category">Рыжий, Пушистый</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">11 мурлей</ins>
<del class="old-price">13 мурлей</del>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото спящего полостаого кота" src="cats_photos/cat9.jpg">
<div class="information">
<div class="name">
<a href="#">Барсик</a>
</div>
<div class="category">Полосатый</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">11 мурлей</ins>
<del class="old-price">13 мурлей</del>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото рыжего пушистого кота на снегу" src="cats_photos/cat10.jpg">
<div class="information">
<div class="name">
<a href="#">Муся</a>
</div>
<div class="category">Рыжий, Пушистый</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">10 мурлей</ins>
<del class="old-price">12 мурлей</del>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото полостаго кота" src="cats_photos/cat11.jpg">
<div class="information">
<div class="name">
<a href="#">Васька</a>
</div>
<div class="category">Полосатый</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">11 мурлей</ins>
<del class="old-price">13 мурлей</del>
</div>
<div class="description">Самый лучший котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото чёрного кота" src="cats_photos/cat12.jpg">
<div class="information">
<div class="name">
<a href="#">Ужас, летящий на крыльях ночи</a>
</div>
<div class="category">Черный</div>
<div class="raiting">
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">11 мурлей</ins>
<del class="old-price">13 мурлей</del>
</div>
<div class="description">Самый добрый котик!</div>
</div>
</div>
<div class="card">
<img class="cat-photo" alt="фото серого кота с пятном на морде в виде усов" src="cats_photos/cat13.jpg">
<div class="information">
<div class="name">
<a href="#">Мистер Усач</a>
</div>
<div class="category">Необычный окрас</div>
<div class="raiting">
<span>&#9733;</span>
<span>&#9733;</span>
<span>&#9733;</span>
<span>&#9733;</span>
<span>&#9734;</span>
</div>
<div class="price">
<ins class="current-price">14 мурлей</ins>
</div>
<div class="description">Самый оригинальный котик!</div>
</div>
</div>
</main>
</body>
</html>
Binary file added spisok.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.