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

9 years ago · 7176aa5a71
parent 956b44e115 2a380118ba
commit 7176aa5a71
4 changed files with 14 additions and 2 deletions
--- a/static/client/css/main.css
+++ b/static/client/css/main.css
@ -3644,7 +3644,7 @@ form.s-message {
 }
 .layout-wrap>aside .sbnr .sbnr-wrap {
    display: inline-block;
-    border: 1px solid #e3e3e3
+    /*border: 1px solid #e3e3e3*/
 }
 .layout-wrap>aside .vk-widget {
    width: 180px;
--- a/static/client/css_min/main.min.css
+++ b/static/client/css_min/main.min.css
--- a/static/participation_landing/css/main.css
+++ b/static/participation_landing/css/main.css
@ -83,6 +83,7 @@ header{
 .logo_block ul{
    list-style: none;
    float: right;
+    margin-top: -5px;
 }

 .logo_block li{
@ -114,6 +115,16 @@ header{
    color: #fff;
 }

+.logo_block li.phone{
+    display: block;
+    float: right;
+    clear: left;
+    color: #fff;
+    font-size: 24px;
+    font-weight: 300;
+    padding: 10px 5px 0 0;
+}
+
 .main_logo{
    float: left;
 }
--- a/templates/client/simple_pages/participation_landing.html
+++ b/templates/client/simple_pages/participation_landing.html
@ -42,6 +42,7 @@
                        <li><a href="https://www.facebook.com/Expomap" target="_blank"><i class="fa fa-facebook"></i></a></li>
                        <li><a href="https://vk.com/expomap" target="_blank"><i class="fa fa-vk"></i></a></li>
                        <li><a href="https://twitter.com/expomap_ru" target="_blank"><i class="fa fa-twitter"></i></a></li>
+                        <li class="phone">+7 499 999 12 07</li>
                    </ul>
                </div>