EXPO-90 styles added

remotes/origin/1203
pavel 11 years ago
parent b38770c112
commit b0316bc55a
  1. 10
      templates/client/accounts/feed.html
  2. 1
      templates/client/blank.html
  3. 27
      templates/client/static_client/css/main.css
  4. 2
      templates/client/static_client/css_min/main.min.css
  5. 2
      templates/client/static_client/js/_modules/page.events.feed.js

@ -79,7 +79,15 @@
{% if object_list %}
{% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
{% else %}
{% trans "Увы, событий, соответствующих выбранным фильтрам, нет в каталоге" %}
<p class="message-not-found">
<span>
<i class="fa fa-exclamation-triangle"></i>
</span>
<span class="message">
{% trans "Увы, событий, соответствующих выбранным фильтрам, нет в каталоге" %}
</span>
</p>
{% endif %}
{% include 'includes/catalog_paginator.html' with page_obj=page_obj %}

@ -27,6 +27,7 @@ This template include basic anf main styles and js files,
<!--todo: вернуть минифицированную версию-->
<!--<link rel="stylesheet" href="{% static 'client/css' %}{% if debug %}/{% else %}_min/{% endif %}main{% if debug %}{% else %}.min{% endif %}.css">-->
<link rel="stylesheet" href="{% static 'client/css/main.css' %}">
<link rel="stylesheet" href="{% static 'client/lib/font-awesome-4.3.0/css/font-awesome.min.css' %}">
<script src="{% static 'client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' %}"></script>
<script src="{% static 'client/js/vendor/jquery-1.10.1.min.js' %}"></script>

@ -12267,6 +12267,7 @@ hr + .rq-note {
}
.events-feed-page .filter-hint-block{
border: 1px dashed #87C525;
display: none;
border-radius: 4px
}
.events-feed-page .filter-hint-block p{
@ -12278,6 +12279,25 @@ hr + .rq-note {
font-weight: bold;
color: #d80000;
}
.message-not-found{
margin-top: 60px;
}
.message-not-found .fa{
color: #ff6600;
font-size: 80px;
margin-bottom: 30px;
}
.message-not-found span{
display: block;
text-align: center;
}
.message-not-found .message{
font-family: 'dindisplay_pro', Arial, sans-serif;
font-size: 26px;
/*color: #a2a2a2;*/
}
@ -13005,6 +13025,7 @@ hr + .rq-note {
/************************\
# completion of registration modal
\***********************/
.after-register-modal .pw-form .pwf-line{
margin-bottom: 0;
}
@ -13052,4 +13073,8 @@ hr + .rq-note {
}
.after-register-modal .pwf-line .err-message-box{
margin-top: 4px;
}
}
/************************\
# not found message
\***********************/

File diff suppressed because one or more lines are too long

@ -1845,6 +1845,8 @@ if (EXPO.events.feed) {
}
}
}else{
$(self.DOMhint).fadeIn();
}
//Если выбраны фильтры то появляется кнопка "применить"
if(getObjectLength(self.placesModal.itemsSelected) || getObjectLength(self.subjModal.itemsSelected) ){

Loading…
Cancel
Save