Merge branch 'stage5' of bitbucket.org:Bonus_05/expomap into stage5

static/client/css/main.css

@@ -5345,7 +5345,8 @@ dl.add-info dd ul li {
     white-space: nowrap;
     text-align: center
 }
-.i-steps a.step {
+.i-steps a.step,
+.i-steps span.step {
     position: relative;
     display: block;
     height: 31px;
@@ -5360,7 +5361,12 @@ dl.add-info dd ul li {
     -o-transition: background .3s;
     transition: background .3s
 }
+.i-steps ul>li span.step{
+    text-transform: uppercase;
+    text-align: center;
+}
 .i-steps ul>li.s1 a:after,
+.i-steps ul>li.s1 span:after,
 .i-steps ul>li.s2 a:after,
 .i-steps ul>li.s2 a:before,
 .i-steps ul>li.s3 a:before {
@@ -5372,10 +5378,12 @@ dl.add-info dd ul li {
     position: absolute;
     top: -1px
 }
-.i-steps ul>li a:after {
+.i-steps ul>li a:after,
+.i-steps ul>li span.step:after {
     right: -1px
 }
-.i-steps ul>li a:before {
+.i-steps ul>li a:before,
+.i-steps ul>li span.step:before {
     left: -1px
 }
 .i-steps ul>li.s1 a:after {
@@ -6179,6 +6187,9 @@ dl.add-info dd ul li {
     font-size: 25px;
     line-height: 44px
 }
+.rqob-price small{
+    font-weight: 300;
+}
 .order-button .rqob-button {
     vertical-align: top
 }

templates/client/includes/event_steps.html

@@ -6,7 +6,7 @@
             <li class="s1">
 				<div class="label">{% if event.catalog == '/expo/' %}{% trans 'Создайте уникальную концепцию' %}{% else %}{% trans 'Зарегистрируйтесь на событие' %}{% endif %}</div>
 			    {% if event.catalog == '/conference/' and not event.services.tickets.is_set %}
-            <a class="step" href="#">{% trans 'Регистрация' %}</a>
+            <span class="step">{% trans 'Регистрация' %}</span>
           {% else %}
             <a class="step"
                    href="{% if event.registration_link %}{{ registration_link }}{% else %}{{ event.get_permanent_url }}{% if event.catalog == '/expo/' %}service/participation/{% else %}service/tickets/{% endif %}{% endif %}"

templates/client/service/tickets.html

@@ -164,7 +164,7 @@
                                                 <span class="small">{{ price }}</span>
                                             {% endif %}
                                         {% else %}
-                                            {% trans 'билет организатора' %}
+                                            <small>{% trans 'билет организатора' %}</small>
                                         {% endif %}
                                     {% endwith %}
 
@@ -209,7 +209,7 @@
                                         <span class="small">{{ price }}</span>
                                     {% endif %}
                                 {% else %}
-                                    {% trans 'билет организатора' %}
+                                    <small>{% trans 'билет организатора' %}</small>
                                 {% endif %}
                             {% endwith %}