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
Changes from 1 commit
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
Prev Previous commit
Next Next commit
searchByAddress-column-list
malishok committed Apr 26, 2013
commit a21e9e5f0e0317116f54dcd487aedd8b6569ee27
Binary file modified navynos/.DS_Store
Binary file not shown.
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.
37 changes: 30 additions & 7 deletions navynos/makingOrder.html
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ <h1>Оформление заказа</h1>
</div>
</div>
<div class="span8 column column_border_padding">
<div class="your-order">
<!-- <div class="your-order">
<h2>Ваш заказ в <span class="your-order__restaurant-name">Самба Суши</span></h2>
<div class="your-order__item">
<span class="your-order__item__index">1</span>
@@ -147,7 +147,30 @@ <h2>Ваш заказ в <span class="your-order__restaurant-name">Самба С
</div>
</div>
</div>
</div>
</div> -->
<table class="your-order">
<thead>
<tr>
<h2>Ваш заказ в <span class="your-order__restaurant-name">Самба Суши</span></h2>
</tr>
</thead>
<tbody>
<tr class="your-order__item">
<td class="your-order__item__index"><span>1</span></td>
<td class="your-order__item__menu-item">
<p>Роллы "Филадельфия" в наборе "Федор Конюхов"</p>
<p class="your-order__item__menu-item__addition">
опции:
<span class="your-order__item__menu-item__addition-item">больше васаби</span>,
<span class="your-order__item__menu-item__addition-item">больше имбиря</span>
</p>
</td>
<td class="price"><span>150.0 <span class="rub"></span></span></td>
<td class="action-link"><span>изменить</span></td>
<td class="your-order__item__menu-item__delete"><span></span></td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row-fluid page-sections delivery-details">
@@ -159,20 +182,20 @@ <h2>Адрес доставки</h2>
<div class="span6 delivery-details__contact">
<div class="delivery-details__contact__form">
<h2>Данные для доставки</h2>
<form action="#" method="post" class="commentform">
<form action="#" method="post">
<p>
<label for="name">Имя<span class="must-add">&#42</span></label>
<label for="name">Имя<span class="required">&#42</span></label>
<input type="text" name="name">
</p>
<p>
<label for="phone">Телефон для подтверждения заказа<span class="must-add">&#42</span></label>
<label for="phone">Телефон для подтверждения заказа<span class="required">&#42</span></label>
<input type="text" name="phone">
</p>
<p>
<label for="order-comment">Комментарий к заказу</label>
<textarea name="order-comment" class="textarea" rows="7"></textarea>
</p>
<span class="caption"><span class="must-add">&#42</span> Поля обязательные для заполнения</span>
<span class="caption"><span class="required">&#42</span> Поля обязательные для заполнения</span>
</form>
</div>
</div>
@@ -182,7 +205,7 @@ <h2>Данные для доставки</h2>
<span class="total">Всего:</span>
<span class="price">150.0 <span class="rub"></span></span>
</div>
<div><a class="button button_color button_text button_size" href="#">заказать</a></div>
<div><a class="button button_color_red button_text_stylish button_size" href="#">заказать</a></div>
</div>
</div>
</div>
266 changes: 266 additions & 0 deletions navynos/restaurantPage.html

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions navynos/sass/main.scss
Original file line number Diff line number Diff line change
@@ -99,6 +99,51 @@ a {
margin-right: 4px;
}

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

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

.column_border_padding {
padding-top: 0;
}

.button {
overflow: hidden;
position: relative;
cursor: pointer;
vertical-align: middle;
display: block;
border-radius: 10px;
padding: 4px 14px;
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_dark-brown {
background: #4A3E33;
}

.button_light-brown {
background: #c6af99;
}

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

/* ------------------------------------------------------ HEADER START ------------------------------------------------------- */
59 changes: 11 additions & 48 deletions navynos/sass/makingOrder.scss
Original file line number Diff line number Diff line change
@@ -37,15 +37,6 @@
font-size: 18px;
}

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

.page-sections_makingOrder .column_border_padding {
padding-top: 0;
}

.making-order__image img {
width: 100%;
margin-top: 10px;
@@ -57,6 +48,12 @@

.your-order {
background: #FFFFD0;
border: 0;
width: 100%;
}

thead {
background: #FFFFD0;
}

.your-order h2 {
@@ -143,14 +140,6 @@
margin-left: 10px;
}

.delivery-details .column_border_style {
border-top: 2px dotted #B99F87;
}

.delivery-details .column_border {
border: 0;
}

.delivery-details__address span {
font-family: 'Georgia', 'Times New Roman', sans-serif;
font-size: 18px;
@@ -162,7 +151,7 @@
border-radius: 0;
}

.must-add {
.required2 {
color: #F4521A;
}

@@ -181,36 +170,6 @@ label {
font-size: 18px;
}

.button {
padding: 4px 14px 7px;
overflow: hidden;
position: relative;
cursor: pointer;
border-radius: 10px;
vertical-align: middle;
display: inline-block;
}

.button_text {
font-family: 'Georgia', 'Times New Roman', sans-serif;
font-weight: bold;
font-style: italic;
color: white;
font-size: 20px;
line-height: 20px;
text-align: center;
text-decoration: none;
}

.button_color {
background: #E73B23;
border: 1px solid #E73B23;
}

.button_size {
width: 40%;
}

.delivery-details__sum__total-amount {
margin: 30px 0;
border-bottom: 1px dotted #4A3E33;
@@ -228,4 +187,8 @@ label {

.delivery-details__sum__total-amount .price {
text-align: right;
}

.delivery-details .button_size {
width: 40%;
}
32 changes: 32 additions & 0 deletions navynos/sass/restaurantPage.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@import "_base";
@import "main";

/* ------------------------------------------------------ RESTAURANT PAGE START --------------------------------------------------- */

.restaurant-name, .restaurant-logo {
display: inline-block;
}

.restaurant-logo {
float: right;
position: relative;
right: 26.623932%;

@include respond-to(medium-screen) {
right: 0;
}

@include respond-to(small-screen) {
right: 0;
margin-bottom: 15px;
}
}

.restaurant-page__main-info__image img {
border-radius: 10px;
width: 100%;
}

.restaurant-page__main-info__delivery .button {
border-radius: 5px;
}
43 changes: 3 additions & 40 deletions navynos/sass/searchByAddress.scss
Original file line number Diff line number Diff line change
@@ -110,48 +110,11 @@
margin-bottom: 10px;
}

.button a {
text-decoration: none;
display: block;
position: relative;
border-radius: 7px;
}

.button a:hover {
color: white;
}

.button-brown {
background: #c6af99;
}

.button-text {
font-family: 'Georgia', 'Times New Roman', sans-serif;
font-weight: bold;
font-style: italic;
color: white;
}

.show-all-items {
padding: 1px 10px;
width: 19%;
}

.choose-kitchen-area {
@include column-width(130px);
@include column-gap(10px);
}

.choose-kitchen-area-section {
position: relative;
}

.choose-kitchen-area-section-inner {
display: inline-block;
width: 100%;
.cuisine_section-list {
@include columns(2 150px)
}

.choose-kitchen-area a {
.cuisine_section-list a {
color: $brownlighter;
border-bottom: 1px dotted;
text-decoration: none;
Loading