Merge remote-tracking branch 'origin/master'

Yarik
2 parents 37c8e264 5b8a12c3
Showing 3 changed files with 49 additions and 2 deletions Show diff stats
common/modules/fileloader/resources/handler.js
frontend/views/ajax/feedback_form.php
frontend/web/css/style.css
@@ -23,6 +23,7 @@ $(function() {
                                        data.result.result.input + '<p class="fileloader-item-name">'+
                                        '<a href="'+data.result.result.file_href+'" target="_blank">'+data.result.result.file_name+'</a></p>'+'<span class="fileloader-item-remove glyphicon glyphicon-remove"></span>'+
                                        '</div>';
+                            $('#modal_form_contacts .contacts-form-help span').css({display:'none'});
                             if(!multiple) {
                                 var inputs = $(wrapper).find('.fileloader-item-remove');
                                 $.each(inputs, function(i, v) {
@@ -47,6 +48,7 @@ $(function() {
             },
             function(data) {}
         );
+        $('#modal_form_contacts .contacts-form-help span').css({display:'block'});
         $(wrapper).remove();
     });
 });
@@ -34,7 +34,7 @@
                           ->label(false)
                           ->widget(FileloaderWidget::className(), [
                               'labelOptions' => [
-                                  'label' => '<div class="contacts-form-wrapper style"><div class="contacts-form style"><span>Прикрепить файл</span></div><div class="contacts-form-help style"><span>Максимальный размер файла 5 МБ</span></div></div>',
+                                  'label' => '<div class="contacts-form-wrapper style"><div class="contacts-form style"><span style="font-weight: normal">Прикрепить файл</span></div><div class="contacts-form-help style"><span>Максимальный размер файла 5 МБ</span></div></div>',
                               ],
                               'inputOptions' => [
                                   'multiple' => false,
@@ -2393,6 +2393,9 @@ input[type=file]::-webkit-file-upload-button {
     font-size: 24px;
     color: #fff;
     margin-bottom: 1px;
+    width: 415px;
+    overflow: hidden;
+    height: 28px;
 }
 .performance-vacancy-sidebar-company-job ul li {
@@ -2629,7 +2632,7 @@ input[type=file]::-webkit-file-upload-button {
 .section-box-16 {
     height: 380px;
 }
-.section-box-16:before {
+.section-box-16:before, .section-box-14:before {
     position: absolute;
     top:0;
     left: 0;
@@ -12378,3 +12381,45 @@ li.active-menu-admin:hover a .ico_num {
     font-size: 13px;
 }
 .left-proektant-cabinet .summary {color: inherit;margin-top: 0}
+#modal_form_contacts .fileloader-list {
+    position: absolute;
+    top: 34px;
+    left: 0;
+    width: 100%;
+    height: 19px;
+    text-align: right;
+}
+#modal_form_contacts .fileloader-item-name {
+    width: 100%;
+    height: 19px;
+    overflow: hidden;
+    position: relative;
+    box-sizing: border-box;
+    padding-left: 20px;
+}
+#modal_form_contacts .fileloader-item-name a {
+    position: relative;
+    font-size: 13px;
+    color: #333 !important;
+    border-bottom: 0 !important;
+}
+#modal_form_contacts .fileloader-item-name a:before {
+    position: absolute;
+    content: '';
+    width: 10px;
+    height: 8px;
+    background: url("/images/tender/ico-3.png") no-repeat;
+    top: 4px;
+    left: -17px;
+}
+#modal_form_contacts .fileloader-item-remove {
+    position: absolute;
+    top: 50%;
+    margin-top: -6px;
+    right: -20px;
+    width: 12px;
+    height: 12px;
+    background: url("/images/delet-file.png") no-repeat;
+    padding-left: 0 !important;
+}
+#modal_form_contacts .fileloader-item-remove:before {display:none;}
 \ No newline at end of file