-
Notifications
You must be signed in to change notification settings - Fork 68
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
Хмелёв Дима #51
Open
NeSmogPridymatNick
wants to merge
16
commits into
urfu-2016:master
Choose a base branch
from
NeSmogPridymatNick: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
Хмелёв Дима #51
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
cbf26b2
Update index.html
NeSmogPridymatNick b77948a
Update index.css
NeSmogPridymatNick 142077e
Update index.css
NeSmogPridymatNick bd0ccc4
Update index.html
NeSmogPridymatNick 2d0830f
Update index.css
NeSmogPridymatNick 58f5f50
Update index.html
NeSmogPridymatNick 01c4275
Картинки
NeSmogPridymatNick dbfec95
Update index.css
NeSmogPridymatNick 982d4d1
Update index.html
NeSmogPridymatNick 85d9fee
Update index.css
NeSmogPridymatNick 9850ded
Update index.html
NeSmogPridymatNick 6375c25
Update index.html
NeSmogPridymatNick ee6b341
Update index.css
NeSmogPridymatNick 105c7f7
Update index.html
NeSmogPridymatNick 475c61a
Update index.html
NeSmogPridymatNick d94fe88
Update index.css
NeSmogPridymatNick 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 |
---|---|---|
|
@@ -83,7 +83,7 @@ <h3> | |
благодарность работникам порта. Среди главных | ||
Факторов, определивших успех Прибамбасска, мэр | ||
назвал удобное прибрежное расположение города — | ||
рядом с Великим морем, а так же политику всячиски | ||
рядом с Великим морем, а так же политику всячиски | ||
поощряющую свооду торговли | ||
Он пренебрежительно | ||
отзывался о «глупых законах», которые принимают в | ||
|
@@ -141,109 +141,112 @@ <h3> | |
<img src="img/Напиток.png" class="colla" alt="КоллаРеклама" title="Реклама"> | ||
</p> | ||
</div> | ||
</td> | ||
<td> | ||
<div class="picture"> | ||
<table> | ||
</div> | ||
</td> | ||
<td> | ||
<div class="picture"> | ||
<table> | ||
<tr> | ||
<td colspan="2"> | ||
<div class="picture-header"> | ||
<div class="big-text">Всем посетителям</div> | ||
<div class="little-text"> | ||
по карте и<br> | ||
компасу бесплатно! | ||
<div class="big-text">Всем посетителям</div> | ||
<div class="little-text"> | ||
по карте и<br> | ||
компасу бесплатно! | ||
</div> | ||
</div> | ||
</div> | ||
<td> | ||
<tr> | ||
<tr> | ||
<td> | ||
<img src="img/Мегаторг.png" class="mega" alt="Мегаторг" title="Магазин"> | ||
</td> | ||
<td> | ||
<div class="world"> | ||
все товары<br> | ||
<div class="big-world">Мира</div><br> | ||
под одной крышей | ||
</div> | ||
<td> | ||
</tr> | ||
<tr> | ||
<td> | ||
<div class="picture-main-food"> | ||
<figure> | ||
<figcaption class="rotatable"> | ||
Проголодались? | ||
</figcaption> | ||
<img src="img/еда.png" class="food" alt="Еда" title="Еда"> | ||
</figure> | ||
</td> | ||
<td> | ||
<div> | ||
<div class="big-house-text"> | ||
Бесчисленное* множество<br> | ||
Магазинов и лавок!<br> | ||
</div> | ||
<div class="little-house-text"> | ||
*в прямом смысле этого слова!<br> | ||
никто их не пересчитывал! | ||
</div> | ||
</div> | ||
<p class="cake"> | ||
Отведай рулета<br>во всемирно известной<br>харчевне! | ||
</p> | ||
</div> | ||
</td> | ||
</tr> | ||
<tr> | ||
<td> | ||
<div class="stock"> | ||
<table> | ||
<tr> | ||
<td> | ||
-При придъявлении купонa | ||
<div class="stock-picture"> | ||
<img src="img/бутылка.png" class="bottle" alt="Бутылка" title="Напиток"> | ||
<div class="colaText"> | ||
Бутылка освежающей «Каджа-Колы» в подарок при первой покупке.<br> | ||
<div class="coast">у набережной</div> | ||
</div> | ||
</td> | ||
<td> | ||
<img src="img/Ножницы.png" class="scissors" alt="Ножницы" title="Вырежи"> | ||
</td> | ||
</div> | ||
</tr> | ||
</table> | ||
</div> | ||
</td> | ||
<td> | ||
<img src="img/Дом.png" class="house" alt="Харчевня" title="Харчевня"> | ||
</td> | ||
<tr> | ||
<tr> | ||
<td> | ||
<img src="img/Тотем.png" class="totem" alt="ТотемыРеклама" title="Реклама"> | ||
</td> | ||
<td> | ||
<div class="table-of-contents"> | ||
Оглавление<br> | ||
<hr> | ||
Бизнес<div class="page">2</div><br> | ||
Искусство<div class="page">2</div><br> | ||
Спорт<div class="page">2</div><br> | ||
Стиль жизни<div class="page">2</div><br> | ||
Поиск работы<div class="page">2</div><br> | ||
Некролог<div class="page">3-8</div><br> | ||
</div> | ||
<td> | ||
</tr> | ||
</div> | ||
</div> | ||
</tr> | ||
<tr> | ||
<td> | ||
<img src="img/Мегаторг.png" class="mega" alt="Мегаторг" title="Магазин"> | ||
</td> | ||
<td> | ||
<div class="world"> | ||
все товары<br> | ||
<div class="big-world">Мира</div><br> | ||
под одной крышей | ||
</div> | ||
</td> | ||
</tr> | ||
<tr> | ||
<td> | ||
<div class="picture-main-food"> | ||
<figure> | ||
<figcaption class="rotatable"> | ||
Проголодались? | ||
</figcaption> | ||
<img src="img/еда.png" class="food" alt="Еда" title="Еда"> | ||
</figure> | ||
</div> | ||
</td> | ||
<td> | ||
<div> | ||
<div class="big-house-text"> | ||
Бесчисленное* множество<br> | ||
Магазинов и лавок!<br> | ||
</div> | ||
<div class="little-house-text"> | ||
*в прямом смысле этого слова!<br> | ||
никто их не пересчитывал! | ||
</div> | ||
</div> | ||
<p class="cake"> | ||
Отведай рулета<br>во всемирно известной<br>харчевне! | ||
</p> | ||
</td> | ||
</tr> | ||
<tr> | ||
<td> | ||
<div class="stock"> | ||
<table> | ||
<tr> | ||
<td> | ||
-При придъявлении купонa | ||
<div class="stock-picture"> | ||
<img src="img/бутылка.png" class="bottle" alt="Бутылка" | ||
title="Напиток"> | ||
<div class="colaText"> | ||
Бутылка освежающей «Каджа-Колы» в подарок | ||
при первой покупке.<br> | ||
<div class="coast">у набережной</div> | ||
</div> | ||
</div> | ||
</td> | ||
<td> | ||
<img src="img/Ножницы.png" class="scissors" alt="Ножницы" | ||
title="Вырежи"> | ||
</td> | ||
</tr> | ||
</table> | ||
</div> | ||
</td> | ||
<td> | ||
<img src="img/Дом.png" class="house" alt="Харчевня" title="Харчевня"> | ||
</td> | ||
</tr> | ||
<tr> | ||
<td> | ||
<img src="img/Тотем.png" class="totem" alt="ТотемыРеклама" title="Реклама"> | ||
</td> | ||
<td> | ||
<div class="table-of-contents"> | ||
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. Оглавление можно сверстать как-нибудь поизящней, списком например |
||
Оглавление<br> | ||
<hr> | ||
Бизнес<div class="page">2</div><br> | ||
Искусство<div class="page">2</div><br> | ||
Спорт<div class="page">2</div><br> | ||
Стиль жизни<div class="page">2</div><br> | ||
Поиск работы<div class="page">2</div><br> | ||
Некролог<div class="page">3-8</div><br> | ||
</div> | ||
</td> | ||
</tr> | ||
</table> | ||
</div> | ||
</td> | ||
</tr> | ||
</table> | ||
</td> | ||
</tr> | ||
</table> | ||
</main> | ||
</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.
всячески
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.
ахахахаха , я с картинки программой текст получал)