Merge branch 'master' of git.task-on.com:ktask/taskoncom

backend/web/plugins/editormd/documentation.js

@@ -60,7 +60,16 @@ $(function ()
             var id = $(this).attr('id');
 
             $('#doccontentlang-' + data_id + '-markdown').val(testEditor[id].getMarkdown())
-            $('#doccontentlang-' + data_id + '-html').val(testEditor[id].getPreviewedHTML())
+            var html_no_rewrited = testEditor[id].getPreviewedHTML();
+            var html_rewrited = html_no_rewrited;
+            $('body').append('<div class="hidden  hidden_tmp_result"></div>');
+            $('.hidden_tmp_result').html(html_no_rewrited);
+            $('.hidden_tmp_result h1,.hidden_tmp_result h2,.hidden_tmp_result h3,.hidden_tmp_result h4,.hidden_tmp_result h5,.hidden_tmp_result h6').each(function ()
+            {
+                $(this).html($(this).text())
+            });
+            html_rewrited = $('.hidden_tmp_result').html();
+            $('#doccontentlang-' + data_id + '-html').val(html_rewrited)
         })
     });
 //    $("#goto-line-btn").bind("click", function ()

common/modules/documentation/assets/src/css/style.css

@@ -344,7 +344,7 @@ a.show_d_menu {
 
 .icon-arrowDown:before {
   content: "";
-  background: url(/images/arrow_down.png) no-repeat;
+  background: url(../images/arrow_down.png) no-repeat;
   width: 6px;
   height: 3px;
   display: inline-block;
@@ -355,7 +355,7 @@ a.show_d_menu {
 
 .icon-arrowRight:before {
   content: "";
-  background: url(/images/arrow_right.png) no-repeat;
+  background: url(../images/arrow_right.png) no-repeat;
   width: 6px;
   height: 6px;
   display: inline-block;
@@ -370,7 +370,7 @@ a.show_d_menu {
 
 
 .phone_hover_foot {
-  background: url(/images/phone_hover_bg.png) no-repeat center center;
+  background: url(../images/phone_hover_bg.png) no-repeat center center;
   width: 222px;
   height: 88px;
   display: none;
@@ -390,7 +390,7 @@ a.show_d_menu {
 }
 
 .phone_hover_head {
-  background: url(/images/phone_hover2.png) no-repeat center center;
+  background: url(../images/phone_hover2.png) no-repeat center center;
   width: 222px;
   height: 88px;
   display: none;
@@ -474,7 +474,7 @@ a.show_d_menu {
 }
 .phone_menu:before {
   content: "";
-  background: url(/images/phone.png) no-repeat;
+  background: url(../images/phone.png) no-repeat;
   width: 18px;
   height: 18px;
   display: inline-block;
@@ -1033,7 +1033,7 @@ textarea {
   margin-right: 18px;
   width: 20px;
   height: 32px;
-  background:  url(/images/icon_like.png) 0 center no-repeat;
+  background:  url(../images/icon_like.png) 0 center no-repeat;
 }
 .icon_not_like {
   content: '';
@@ -1042,7 +1042,7 @@ textarea {
   margin-right: 18px;
   width: 20px;
   height: 32px;
-  background:  url(/images/icon_not_like.png) 0 center no-repeat;
+  background:  url(../images/icon_not_like.png) 0 center no-repeat;
 }
 .radio_2.radio_like + label {
   background-color: #67ac1d;
@@ -1698,7 +1698,7 @@ input[type='reset']:focus {
    footer {
     padding-top: 45px;
     padding-bottom: 55px;
-    background: #0e3242 url(/images/footer_bg.png) center 100% no-repeat;
+    background: #0e3242 url(../images/footer_bg.png) center 100% no-repeat;
     background-size: cover;
    }
 
@@ -1742,7 +1742,7 @@ footer  .phone_hover_head {
 }
 .footer_info:before{
   content: "";
-    background: url(/images/icon_info.png) no-repeat;
+    background: url(../images/icon_info.png) no-repeat;
     width: 32px;
     height: 32px;
     display: inline-block;

common/modules/documentation/assets/src/css/styles.css

@@ -8395,10 +8395,6 @@ li.L0, li.L1, li.L2, li.L3, li.L5, li.L6, li.L7, li.L8 {
     line-height: 34px;
 }
 
-.offcanvas-wrapper p {
-    font-size: 13px;
-}
-
 .btn_green_sm {
     display: inline-block;
     outline: none;
@@ -8503,3 +8499,11 @@ li.L0, li.L1, li.L2, li.L3, li.L5, li.L6, li.L7, li.L8 {
     margin-bottom: 0 !important;
     padding-left: 0 !important;
 }
+@media only screen and (max-width: 1000px) {
+  .top_line_inf2 li {
+    border-right: none;
+  }
+  .top_line_inf2 li.active:after {
+    display: none;
+  }
+}
\ No newline at end of file

common/modules/faq/assets/src/css/setup_recomends.css

@@ -261,8 +261,7 @@ blockquote.blue:before{
     background-color: #2a8e89;
 }
 
-mark:before {
-    content: 'Документация для разработчика';
+.mark_faq strong.mark_faq_before {   
     font-size: 22px;
     line-height: 47px;
     color: #243340;
@@ -271,16 +270,15 @@ mark:before {
     display: block;
     padding-left: 50px;
     background:  url(../images/mark_icon.png) 0 8px no-repeat;
-
 }
-mark {
+.mark_faq {
     display: block;
     padding: 35px 30px;
     color: #243340;
     background-color: #f3f5f7;
     border-radius: 10px;
 }
-mark * {
+.mark_faq * {
     background-color: transparent;
 }
 
@@ -732,3 +730,11 @@ mark * {
     background: url(../images/ul_list_blue.png) no-repeat left 6px;
     padding-left: 30px;
 }
+@media only screen and (max-width: 1000px) {
+  .top_line_inf2 li {
+    border-right: none;
+  }
+  .top_line_inf2 li.active:after {
+    display: none;
+  }
+}
\ No newline at end of file

common/modules/faq/assets/src/css/style.css

@@ -344,7 +344,7 @@ a.show_d_menu {
 
 .icon-arrowDown:before {
   content: "";
-  background: url(/images/arrow_down.png) no-repeat;
+  background: url(../images/arrow_down.png) no-repeat;
   width: 6px;
   height: 3px;
   display: inline-block;
@@ -355,7 +355,7 @@ a.show_d_menu {
 
 .icon-arrowRight:before {
   content: "";
-  background: url(/images/arrow_right.png) no-repeat;
+  background: url(../images/arrow_right.png) no-repeat;
   width: 6px;
   height: 6px;
   display: inline-block;
@@ -370,7 +370,7 @@ a.show_d_menu {
 
 
 .phone_hover_foot {
-  background: url(/images/phone_hover_bg.png) no-repeat center center;
+  background: url(../images/phone_hover_bg.png) no-repeat center center;
   width: 222px;
   height: 88px;
   display: none;
@@ -390,7 +390,7 @@ a.show_d_menu {
 }
 
 .phone_hover_head {
-  background: url(/images/phone_hover2.png) no-repeat center center;
+  background: url(../images/phone_hover2.png) no-repeat center center;
   width: 222px;
   height: 88px;
   display: none;
@@ -474,7 +474,7 @@ a.show_d_menu {
 }
 .phone_menu:before {
   content: "";
-  background: url(/images/phone.png) no-repeat;
+  background: url(../images/phone.png) no-repeat;
   width: 18px;
   height: 18px;
   display: inline-block;
@@ -1698,7 +1698,7 @@ input[type='reset']:focus {
    footer {
     padding-top: 45px;
     padding-bottom: 55px;
-    background: #0e3242 url(/images/footer_bg.png) center 100% no-repeat;
+    background: #0e3242 url(../images/footer_bg.png) center 100% no-repeat;
     background-size: cover;
    }
 
@@ -1742,7 +1742,7 @@ footer  .phone_hover_head {
 }
 .footer_info:before{
   content: "";
-    background: url(/images/icon_info.png) no-repeat;
+    background: url(../images/icon_info.png) no-repeat;
     width: 32px;
     height: 32px;
     display: inline-block;
@@ -1989,7 +1989,7 @@ footer  .phone_hover_head {
   display: inline-block;
   width: 25px;
   height: 25px;
-  background:  url(/images/icon_info_2.png) 0 -26px no-repeat;
+  background:  url(../images/icon_info_2.png) 0 -26px no-repeat;
 }
 .icon_video {
   margin-right: 12px;
@@ -1997,7 +1997,7 @@ footer  .phone_hover_head {
   display: inline-block;
   width: 23px;
   height: 18px;
-  background:  url(/images/icon_video.png) 0 100% no-repeat;
+  background:  url(../images/icon_video.png) 0 100% no-repeat;
 }
 
 .top_line_inf li {