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.

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

Search by address page #1

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 navynos/.DS_Store
Binary file not shown.
Binary file added navynos/img/tmp/coffeeshop-logo.jpg
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 navynos/img/tmp/delete.png
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 navynos/img/tmp/flame-grilled.jpg
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 navynos/img/tmp/imageOrder1.jpg
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 navynos/img/tmp/imageOrder2.jpg
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 navynos/img/tmp/king-kids.jpg
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 navynos/img/tmp/mac-burger.jpg
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 navynos/img/tmp/mcdonalds-logo.jpg
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 navynos/img/tmp/mcdonalds-special1.jpg
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 navynos/img/tmp/mcdonalds-special2.jpg
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 navynos/img/tmp/rest-star.png
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 navynos/img/tmp/stolle-logo.jpg
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 navynos/img/tmp/stolle.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion navynos/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h1>Доставка еды в Санкт-Петербурге</h1>
<img src="img/tmp/pizza.jpg" class="promo-banner-image" alt="">
</div>
</div>
<div class="row-fluid index-sections">
<div class="row-fluid page-sections page-sections_index">
<div class="span8 column">
<h2>Все рестораны и кафе с доставкой в Санкт-Петербурге</h2>
<div class="catalog">
Expand Down
298 changes: 294 additions & 4 deletions navynos/sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,19 @@ a {
margin-bottom: 20px;
}

.column_border-dotted {
border-top: 2px dotted #B99F87;
}

.column_border-none {
border: 0;
padding-top: 24px;
}

.column_padding-none {
padding-top: 0;
}

.action-link {
border-bottom: 1px dotted;
cursor: pointer;
Expand All @@ -82,10 +95,291 @@ a {
padding-bottom: 30px;
}

.page-sections {
margin-bottom: 30px;
}

.price {
white-space: nowrap;
}

.bullet {
border: 3px solid white;
border-radius: 50px;
font-size: 0;
line-height: 1;
vertical-align: middle;
margin-right: 4px;
}

.button {
overflow: hidden;
position: relative;
cursor: pointer;
vertical-align: middle;
display: block;
border-radius: 5px;
padding: 1px 10px;
color: white;
text-align: center;
text-decoration: none;
display: inline-block;
}

.button_text-stylish {
font-family: 'Georgia', 'Times New Roman', sans-serif;
font-weight: bold;
font-style: italic;
}

.button_red {
background: #E73B23;
}

.button_brown {
background: #7B6350;
}

.button_dark-brown {
background: #4A3E33;
}

.button_light-brown {
background: #c6af99;
}

.column-list {
@include column-width(180px);
@include column-gap(15px);
}

.column-list_section {
position: relative;
padding: 0 0 15px;
}

.column-list_inner {
width: 100%;
display: inline-block;
}

.column-list_list li {
width: 48%;
display: inline-block;
}

.restaurant-stars span {
width: 13px;
height: 12px;
position: relative;
display: inline-block;
vertical-align: middle;
}

.restaurant-stars_zero {
background: url("../img/tmp/rest-star.png") no-repeat 0 0;
}

.restaurant-stars_point {
background: url("../img/tmp/rest-star.png") no-repeat 0 -12px;
}

.restaurant-list__item {
padding-bottom: 15px;
margin-bottom: 15px;
border-bottom: 1px dotted $brownlighter;
}

.restaurant-list__item_promo .restaurant-list__item__content {
position: relative;
border-left: 5px solid #F4521A;
padding: 15px 0 15px 15px;
}

.restaurant-list__item__content {
padding: 0 0 0 5px;
}

.restaurant-list__item__basic {
position: relative;
margin-bottom: 35px;
}

.restaurant-list__item__basic__name {
font-family: 'Georgia', 'Times New Roman', sans-serif;
font-size: 14px;
font-weight: bold;
}

.restaurant-list__item__basic__logo {
position: absolute;
top: -18px;
right: 0;
padding: 22px 0 0 20px;
}

.restaurant-list__item__basic__logo img {
max-width: 140px;
max-height: 60px;
}

.restaurant-stars {
padding-top: 3px;
}

.restaurant-list__item_promo .restaurant-list__item__info {
clear: both;
margin-left: 0;
}

.restaurant-list__item__info li {
margin-top: 5px;
}

.restaurant-list__item__info li:first-child {
margin-top: 0;
}

.restaurant-list__item__info a, .restaurant-list__item__info span {
color: $brownlighter;
}

.restaurant-list__item__image {
overflow: hidden;
padding-left: 2.564102564102564%;
padding-top: 6px;

@include respond-to(medium-screen) {
padding: 15px 0 0 0;
}
}

.restaurant-list__item__image img {
display: block;
margin-top: 10px;
width: 100%;
}

.restaurant-list__item__image img:first-child {
margin-top: 0;
}

.your-order {
border: 0;
width: 100%;
padding: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
}

.your-order, .your-order__restaurant {
background: #FFFFD0;
text-align: left;
}

.your-order__restaurant {
margin: 0;
padding: 15px;
}

.your-order__restaurant h2 {
margin: 0;
}

.your-order tr {
vertical-align: top;
}

.your-order__item__index, .your-order__item__name, .your-order__item__price, .your-order__item__delete, .your-order__item__change, .amount-counter {
padding: 15px 0 15px 10px;
}

.your-order__item__delete {
padding-right: 10px;
}

.your-order__item {
border-bottom: 1px dotted #cccccc;
}

.your-order__item__index span{
border: 1px solid #cccccc;
background: white;
padding: 3px 7px;
line-height: 1.2;
text-align: center;
vertical-align: middle;
}

.amount-counter {
text-align: center;
}

.your-order__item__name p {
margin: 0;
}

.your-order__item__addition {
color: #795337;
font-style: italic;
margin: 0;
}

.your-order__item__delete span {
position: relative;
display: inline-block;
vertical-align: middle;
text-align: center;
cursor: pointer;
color: #5d5043;
border: 1px solid #5d5043;
border-radius: 8px;
padding: 1px 6px 0;
line-height: 1.4;
}

.your-order__item__change .action-link {
color: #5d5043;
}

.total-amount {
margin: 30px 0;
border-bottom: 1px dotted #4A3E33;
font-size: 0;
}

.total-amount__total, .total-amount__price {
display: inline-block;
position: relative;
width: 100%;
margin-right: -100%;
font-size: 24px;
font-family: 'Georgia', 'Times New Roman', sans-serif;
}

.total-amount__price {
text-align: right;
}

.page-sections_receipt div, .connection-page div, .franchising-page div {
margin-bottom: 30px;
}

.important-note {
font-size: 24px;
font-family: 'Times New Roman', sans-serif;
line-height: 1.3;
margin: 0;
}

.footnote {
font-size: 14px;
}

.main-note {
font-size: 18px;
}

/* ------------------------------------------------------ BASE STYLES END ---------------------------------------------------- */

/* ------------------------------------------------------ HEADER START ------------------------------------------------------- */
Expand Down Expand Up @@ -357,10 +651,6 @@ input.index-form-search-input {
}
}

.index-sections {
margin-bottom: 30px;
}

.index-form-search-submit-icon {
position: absolute;
top: 50%;
Expand Down
22 changes: 22 additions & 0 deletions navynos/sass/searchByAddress.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
@import "_base";
@import "main";

/* ------------------------------------------------------ SEARCHBYADDRESS PAGE START --------------------------------------------------- */

.promo-banner {
margin-bottom: 30px;
}

.restaurant-list {
margin-bottom: 50px;
}

.button_light-brown {
margin-bottom: 10px;
}

.column-list_list li a {
color: $brownlighter;
border-bottom: 1px dotted;
text-decoration: none;
}
Loading