Merge branch 'master' of http://code.brln.tv/diffusion/ARCH/archilance into mukhtar

assets/css/main.css

@@ -2278,14 +2278,14 @@ input[type="checkbox"]:checked + span {
     height: 22px;
     background: url('../img/listExecutor.png') no-repeat left;
     background-size: cover;
-    background-position: 0 -18px;
+    background-position: 0 -19px;
 }
 
 .listExecutor li:last-child a:before {
     height: 19px;
     background: url('../img/listExecutor.png') no-repeat left;
     background-size: cover;
-    background-position: 0 -47px;
+    background-position: 0 -48px;
 }
 
 .doneBlock {
@@ -6049,4 +6049,38 @@ input[type="radio"]{
     display: table;
     margin: 15px 0px 15px -15px !important;
 }
+button[data-id="stagesSelect"], button[data-id="stagesSelect"]:hover{
+    outline: 1px solid #ccc !important;
+    margin-top: 13px;
+}
+.polsF1 .linkS122, .polsF1 .linkS122:hover{
+    font-family: 'pfdintextcomppro-regular', sans-serif;
+    letter-spacing: 2px;
+    text-transform: uppercase;
+    border: none;
+    border-radius: 40px;
+    display: inline-block;
+    color: #fff;
+    padding: 12px 30px;
+    font-size: 15px;
+    margin-bottom: 20px;
+    background-color: #FE0029 !important;
+    width: 300px;
+    margin-bottom: 0;
+}
+#paymentfromSite, #paymentfromSite:hover{
+    font-family: 'pfdintextcomppro-regular', sans-serif;
+    letter-spacing: 2px;
+    text-transform: uppercase;
+    border: 1px solid #BEBEBE;
+    border-radius: 40px;
+    display: inline-block;
+    color: #373737;
+    padding: 12px 30px;
+    font-size: 15px;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    background: transparent;
+    width: 300px;
+}
 /*end_new*/

chat/templates/reverse_stage_modal.html

@@ -37,7 +37,7 @@
                     </div>
 
                     <div class="col-lg-6">
-                        <select  id="stagesSelect">
+                        <select class="selectpicker -project-work-type-select-field" id="stagesSelect">
                         </select>
                     </div>
                 </div>
@@ -45,8 +45,8 @@
                 <div class="searchF1 polsF1 polsFF radio-afe" style="padding-top: 20px;padding-left: 50px;">
                 <p class="titleStepss">Резервирование средств</p>
                     <form id="stages-pay-form" action="{{ YANDEX_MONEY.url }}" method="POST">{% csrf_token %}
-                                <div class="modal-body">
+
-                                    <div style="height: 150px;">
+                                    <div>
                                     <div class="textAreaBlock2 text-nn box-sizing disTab">
                                         <input type="hidden" name="sum" id="stageSumPay">
                                         <input type='hidden' name='shopId' value='{{ YANDEX_MONEY.shop_id }}'>
@@ -57,13 +57,8 @@
                                         <input type='hidden' name='stagesId' id='stagesIds' value=''>
                                         <input type='hidden' name='ordermodalId' id='ordermodalId'>
                                     </div>
-                                      <button type="submit" class="btn btn-primary btn-lg  btn-block">Пополнить</button>
+                                      <button type="submit" class="btn btn-primary btn-lg btn-block linkS122">Пополнить</button>
                                     </div>
-                                </div>
-
-                                <div class="modal-footer">
-
-                                </div>
                     </form>