From e8dc3af586dde742b61bcede67e71e91c88a4eb8 Mon Sep 17 00:00:00 2001
From: fefa4ka <fefa4ka@gmail.com>
Date: Mon, 2 Nov 2015 13:54:50 +0300
Subject: [PATCH] fix layout

---
 zsite/static/less/consultation.less             |  4 ++++
 zsite/static/less/main.less                     |  8 +++++++-
 zsite/static/less/service.less                  | 15 +++++++++------
 zsite/templates/form_template/consultation.html | 17 ++++++++++++++++-
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/zsite/static/less/consultation.less b/zsite/static/less/consultation.less
index be47b24..a8aa409 100644
--- a/zsite/static/less/consultation.less
+++ b/zsite/static/less/consultation.less
@@ -50,6 +50,10 @@
         text-align: right;
     }
 
+    .consultation {
+        text-align: right;
+    }
+
     .btn-consultation {
         margin-bottom: 10px;
         margin-right: -13px;
diff --git a/zsite/static/less/main.less b/zsite/static/less/main.less
index 395b5a6..2559bb0 100644
--- a/zsite/static/less/main.less
+++ b/zsite/static/less/main.less
@@ -33,11 +33,17 @@
 
 a, a:hover, a:active, a:focus {
   text-decoration: none;
-  line-height: 140%;
+  line-height: 150%;
   border-bottom: 1px solid;
   outline: none; 
 }
 
+.dropdown-menu {
+  a {
+    border: 0;
+  }
+}
+
 a {
   border-bottom-color: rgba(51, 122, 183, 0.3);
 }
diff --git a/zsite/static/less/service.less b/zsite/static/less/service.less
index b804197..98a7656 100644
--- a/zsite/static/less/service.less
+++ b/zsite/static/less/service.less
@@ -151,6 +151,10 @@
 
             padding-left: 10px;
             padding-right: 10px;
+
+            .btn {
+                margin-left: -5px;
+            }
         }
          .total td {
             font-size: 14px;
@@ -221,6 +225,11 @@
 .service-row {
     margin-bottom: 30px;
 
+    .btn {
+        margin-left: -5px;
+        margin-top: 5px;
+    }
+
     .main-service {
         h3, h4 {
             margin: 0
@@ -277,12 +286,6 @@
             .desc {
                 font-size: 12px;
             }
-            
-            p {
-                a {
-                    font-size: 16px;
-                }
-            }
 
             p.header {
                 font-size: 16px;
diff --git a/zsite/templates/form_template/consultation.html b/zsite/templates/form_template/consultation.html
index e598fbe..f761ece 100644
--- a/zsite/templates/form_template/consultation.html
+++ b/zsite/templates/form_template/consultation.html
@@ -1,6 +1,6 @@
 {% load cms_tags  djangocms_forms_tags i18n sekizai_tags staticfiles %}
 
-<div ng-controller="ModalFormCtrl" class="modal-form">
+<div class="consultation" ng-controller="ModalFormCtrl" class="modal-form">
 <script type="text/ng-template" id="modalFormTemplate-{{ instance.id }}.html">
     <div class="modal-body modal-consultation">
         <img src="{% with 'imgs/phone.png' as image_static %}{% static image_static %}{% endwith %}">
@@ -67,4 +67,19 @@
 {% addtoblock "js" %}
     <script src="{% static 'js/djangocms_forms/libs/jquery.form.min.js' %}"></script>
     <script src="{% static 'js/djangocms_forms/djangocms_forms.js' %}"></script>
+    <script type="text/javascript">
+    $(function() {
+        if(typeof consultation_link == "undefined") {
+            $( "[href^='#consultation'" ).click(function(e) {
+                event.preventDefault();
+
+                angular.element($('.consultation')[0]).scope().open({{ instance.id }});
+                yaCounter950321.reachGoal('CallbackOpen');
+            });
+
+            consultation_link = true;
+        } 
+    });    
+    </script>
+
 {% endaddtoblock %}