add style for 4 hotels row plus gulp main.min.css

stage8
Alexey 9 years ago
parent c86f7f7eb9
commit 10517ac6a1
  1. 1
      .dockerignore
  2. 2
      Dockerfile
  3. 19
      static/client/css/main.css
  4. 2
      static/client/css_min/main.min.css
  5. 2
      templates/client/includes/booking_block.html

@ -1,3 +1,4 @@
data data
media media
collected_static collected_static
node_modules

@ -30,6 +30,8 @@ RUN apt-get update \
\ \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
\ \
&& npm install -g gulp \
\
&& npm install && npm install
RUN sed -i -e 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/' /etc/locale.gen && \ RUN sed -i -e 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/' /etc/locale.gen && \
echo 'LANG="ru_RU.UTF-8"'>/etc/default/locale && \ echo 'LANG="ru_RU.UTF-8"'>/etc/default/locale && \

@ -5934,6 +5934,18 @@ dl.add-info dd ul li {
.h-booking a.more { .h-booking a.more {
font-size: 11px font-size: 11px
} }
.h-booking ul.flexing_for_one_row {
display: -webkit-box;
display: -webkit-flex;
display: -moz-box;
display: -ms-flexbox;
display: flex;
-webkit-justify-content: space-around;
-ms-flex-pack: distribute;
justify-content: space-around;
}
.h-booking ul { .h-booking ul {
margin: 0; margin: 0;
padding: 0 0 0 4px; padding: 0 0 0 4px;
@ -14798,9 +14810,10 @@ h1 .preview_toggle:hover{
float: none; float: none;
} }
.exposition_booking_block .h-booking ul li:last-child { /*Hotels: 4 items for row*/
margin-right: 0; /*.exposition_booking_block .h-booking ul li:last-child {*/
} /*margin-right: 0;*/
/*}*/
.exposition_booking_block .h-booking .sect-title a { .exposition_booking_block .h-booking .sect-title a {
color: #40bbea; color: #40bbea;

File diff suppressed because one or more lines are too long

@ -8,7 +8,7 @@
</div> </div>
<a class="more blue2" target="_blank" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ city.id }}{% if event %}&checkin_monthday={{ event.data_begin|date:'j' }}&checkin_year_month={{ event.data_begin|date:'Y' }}-{{ event.data_begin|date:'n' }}&checkout_monthday={{ event.data_end|date:'j' }}&checkout_year_month={{ event.data_end|date:'Y' }}-{{ event.data_end|date:'n' }}{% endif %}">{% trans 'Все отели поблизости' %}</a> <a class="more blue2" target="_blank" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ city.id }}{% if event %}&checkin_monthday={{ event.data_begin|date:'j' }}&checkin_year_month={{ event.data_begin|date:'Y' }}-{{ event.data_begin|date:'n' }}&checkout_monthday={{ event.data_end|date:'j' }}&checkout_year_month={{ event.data_end|date:'Y' }}-{{ event.data_end|date:'n' }}{% endif %}">{% trans 'Все отели поблизости' %}</a>
</header> </header>
<ul> <ul class="flexing_for_one_row">
{% if place %} {% if place %}
{% for hotel in place.get_nearest_hotels %} {% for hotel in place.get_nearest_hotels %}
<li> <li>

Loading…
Cancel
Save