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 6 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/img/tmp/burger-king-kids-meal.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/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/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/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/mcdonalds.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.
206 changes: 206 additions & 0 deletions navynos/sass/searchByAddress.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
@import "_base";
@import "main";

/* ------------------------------------------------------ INDEX PAGE START --------------------------------------------------- */

.main-order-details-row {
margin-bottom: 30px;

@include respond-to(medium-screen) {
margin-bottom: 30px;
}
}
Copy link
Owner

Choose a reason for hiding this comment

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

ммм... тоже не понятно. зачем одинаковое значение margin-bottom и там и там.


.main-order-details-title {
font-family: 'Georgia', 'Times New Roman', sans-serif;
font-size: 16px;
}

.action-link {
color: $brownlight;
}
Copy link
Owner

Choose a reason for hiding this comment

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

ммм... в тут вообще не понял. есть же уже класс action-link? Зачем переопределять его?

Copy link
Author

Choose a reason for hiding this comment

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

цвет задан был для .header-order-details-content

Copy link
Owner

Choose a reason for hiding this comment

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

ну. а если тебе понадобиться action-link красного цвета и зеленого и синего? ты же понимаешь что отображаться будет тот цвет, который в css-файле задан последним.

Copy link
Owner

Choose a reason for hiding this comment

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

ты есть тебе нужно элементу ставить два класса: .action-link, который добавит точечное подчеркивание и любой другой специфический класс, в котором ты уже определишь нужный цвет.


.promo-banner-image-long {
height: 120px;
width: 100%;
}
Copy link
Owner

Choose a reason for hiding this comment

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

"-long" - это свойство. лучше сделать модификатором "_long". Но по такой логике должно быть где-то и просто ".promo-banner-image" без _long.


.row-fluid.main-choose-restaurant:last-child {
margin-bottom: 100px;
}
Copy link
Owner

Choose a reason for hiding this comment

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

вот таких цепочек нужно избегать. ".row-fluid" - это класс twitter бутстрапа, его нельзя переопределять таким образом. ".main-choose-restaurant:last-child" - этого достаточно.


.main-choose-restaurant {
padding: 15px 0;
border-bottom: 1px dotted $brownlighter;
}

.main-choose-restaurant.promo {
margin-bottom: 0;
}

.main-choose-restaurant.promo .restaurant-details-inner {
border-left: 5px solid #F4521A;
}

.restaurant-details-base-style {
position: relative;
}

.restaurant-details-base-style li {
white-space: nowrap;
}

.restaurant-details-base-style-name {
display: block;
padding: 1em 2em 0 0.5em;
Copy link
Owner

Choose a reason for hiding this comment

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

а с чего тебе вдруг приспичило использовать 'em'? не нужно тут этого. em - это вообще анахронизм. используй пиксели.

}

.main-choose-restaurant.promo .restaurant-details-base-style-name {
Copy link
Owner

Choose a reason for hiding this comment

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

не по БЭМу. тут класс должен быть .main-choose-restaurant_promo. "_promo" - модификатор.

padding: 1em 2em 0 1.5em;
}

.restaurant-details-base-style-name a {
font-family: 'Georgia', 'Times New Roman', sans-serif;
font-size: 14px;
font-weight: bold;
}

.restaurant-details-base-style-logo {
position: absolute;
top: -.8em;
right: 0;
padding: 2em 0 0 0.5em;
@include respond-to(medium-screen) {
display: inline-block;
Copy link
Owner

Choose a reason for hiding this comment

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

вот это совершенно бессмысленное свойство. так как все элементы с position: absolute будут иметь display: block, в независимости от того, что ты им укажешь.

}
}

.restaurant-details-base-style-logo a {
display: block;
position: relative;
}

.restaurant-details-base-style-logo img {
max-width: 140px;
max-height: 60px;
}

.restaurant-details-base-style-stars {
padding: 0.2em 2em 0 0.5em;
}

.main-choose-restaurant.promo .restaurant-details-base-style-stars {
padding: 0.2em 2em 0 1.5em;
}

.restaurant-details-stars-rating {
width: 13px;
height: 12px;
position: relative;
display: inline-block;
}

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

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

.main-choose-restaurant.promo .restaurant-details-conditions {
clear: both;
padding-left: 15px;
margin-left: 0;
}

.restaurant-details-delivery {
padding: 1em 2em 0 0;
}

.restaurant-details-time {
padding: 0.3em 2em 0 0;
}

.restaurant-details-section-list {
padding: 0.3em 2em 1em 0;
}

.restaurant-details-section-list, .restaurant-details-time span, .restaurant-details-delivery-cost {
color: $brownlighter;
line-height: 1.8;
}

.restaurant-details-section-list b {
color: #382e27;
}

.restaurant-details.promo-banner {
margin-top: -3em;
@include respond-to(medium-screen) {
margin-top: 15px;
}
}

.promo-banner-image.company-special-height120 {
height: 120px;
}

.promo-banner-image.company-special-height55 {
height: 55px;
}

.promo-banner-image.company-special-height55:first-child {
margin-bottom: 20px;
}
Copy link
Owner

Choose a reason for hiding this comment

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

height120, height55 - вот так вообще делать нельзя. классы должны отражать семантическое значение элемента.


.button {
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%;
}

.digest-section-kitchen-area {
margin: 0;
float: left;
}

.digest-section-kitchen-area.column-left {
margin-right: 40px;
}
Copy link
Owner

Choose a reason for hiding this comment

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

я же тебе говорил посмотреть, как на главной сделан рубрикатор. там используются css-columns. там можно просто один в один взять готовый css.


.digest-section-kitchen-area li {
display: block;
margin-bottom: 5px;
}

.digest-section-kitchen-area a {
color: $brownlighter;
border-bottom: 1px dotted;
text-decoration: none;
}
Loading