Merge branch 'anatoly' of medgis/mo-assets into master

src/files/css/main.css

@@ -8836,20 +8836,22 @@ h7 {
   margin: 0;
   padding: 0;
   list-style-type: none; }
-  .text-page__text ol li, .special-page__article ol li, .full-news__text ol li {
+  .text-page__text ol > li, .special-page__article ol > li, .full-news__text ol > li {
     margin: 10px 0;
     counter-increment: step-counter;
     font-size: 15px;
     font-family: "Open Sans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
     color: #404040;
     line-height: 1.5; }
-    .text-page__text ol li:before, .special-page__article ol li:before, .full-news__text ol li:before {
+    .text-page__text ol > li:before, .special-page__article ol > li:before, .full-news__text ol > li:before {
       content: counter(step-counter) ".";
       font-size: 15px;
       font-family: "Open Sans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
       color: #265e86;
       font-weight: bold;
       padding-right: 5px; }
+    .text-page__text ol > li ul, .special-page__article ol > li ul, .full-news__text ol > li ul, .text-page__text ol > li ol, .special-page__article ol > li ol, .full-news__text ol > li ol {
+      margin-left: 40px; }
 
 .text-page__text table, .special-page__article table, .full-news__text table {
   width: 100%;
@@ -8949,9 +8951,9 @@ img {
   position: relative; }
 .shortnews__textpos {
   min-height: 100px;
-  background: -moz-linear-gradient(top, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0) 10%, #3b434d 100%);
-  background: -webkit-linear-gradient(top, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0) 10%, #3b434d 100%);
-  background: linear-gradient(to bottom, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0) 10%, #3b434d 100%);
+  background: -moz-linear-gradient(top, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0.25) 10%, #3b434d 100%);
+  background: -webkit-linear-gradient(top, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0.25) 10%, #3b434d 100%);
+  background: linear-gradient(to bottom, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0.25) 10%, #3b434d 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b434d', endColorstr='#3b434d', GradientType=0);
   position: absolute;
   bottom: 0;
@@ -9994,6 +9996,12 @@ img {
     font-size: 12px;
     color: #929292; }
 
+.success_message_text {
+  padding: 50px;
+  text-align: center; }
+  .success_message_text p {
+    margin: 0; }
+
 .wrapper--blind {
   padding: 20px;
   display: -webkit-flex;
@@ -10179,7 +10187,8 @@ img {
 .person-page__awards {
   display: flex;
   flex-direction: row;
-  margin: 20px -10px; }
+  margin: 20px -10px;
+  flex-wrap: wrap; }
 .person-page__award {
   display: flex;
   flex-direction: row;
@@ -10187,15 +10196,21 @@ img {
   justify-content: flex-start;
   vertical-align: middle;
   align-items: center;
-  width: 200px;
-  margin: 0 10px; }
+  width: 30%;
+  margin: 0 10px;
+  margin-bottom: 20px; }
+  @media (max-width: 768px) {
+    .person-page__award {
+      width: 200px; } }
 .person-page__award-name {
   display: block;
   margin-left: 10px;
   color: #75787b;
   font-size: 14px; }
 .person-page__award-image {
-  display: block; }
+  display: block;
+  min-width: 63px;
+  min-height: 63px; }
 .person-page__category {
   color: #75787b;
   padding-top: 1px;
@@ -10723,7 +10738,8 @@ img {
   .organization-info__slidedown-subtitle {
     color: #004d7b;
     font-size: 13px;
-    display: block; }
+    display: block;
+    max-width: 95%; }
   .organization-info__slidedown-mesto {
     color: #929292;
     font-size: 13px; }

src/files/js/script.js

@@ -39,6 +39,18 @@ $(document).ready(function () {
         e.preventDefault();
         $("#searchForm").toggleClass('header-search--active')
     });
+    let personal_list = $('.personals__tile-list');
+    if(personal_list.length){
+        let personal_title = $('.personals__tile').find('.personals__position');
+        var title_heigh = 0;
+        $.each(personal_title,function(index, value){
+            let temp_height = $(value).height();
+            if(title_heigh < temp_height){
+                title_heigh = temp_height;
+            }
+        });
+        personal_title.css('min-height', title_heigh);
+    }
 });
 $(window).on('load',function(){
     (function($){

src/files/scss/_feedback-form.scss

@@ -75,4 +75,11 @@
         font-size: 12px;
         color: #929292;
     }
+}
+.success_message_text{
+    padding: 50px;
+    text-align: center;
+    p{
+        margin: 0;
+    }
 }

src/files/scss/_organization-worktime.scss

@@ -374,6 +374,7 @@ $organizationMediaSelector: 'organization-media';
             color: #004d7b;
             font-size: 13px;
             display: block;
+            max-width: 95%;
         }
 
         &-mesto {

src/files/scss/_person-page.scss

@@ -28,6 +28,7 @@
         display: flex;
         flex-direction: row;
         margin: 20px -10px;
+        flex-wrap: wrap;
     }
 
     &__award {
@@ -37,8 +38,12 @@
         justify-content: flex-start;
         vertical-align: middle;
         align-items: center;
-        width: 200px;
+        width: 30%;
         margin: 0 10px;
+        margin-bottom: 20px;
+        @media (max-width: 768px){
+            width: 200px;
+        }
     }
 
     &__award-name {
@@ -50,6 +55,8 @@
 
     &__award-image {
         display: block;
+        min-width: 63px;
+        min-height: 63px;
     }
 
     &__category {

src/files/scss/_shortnews.scss

@@ -60,9 +60,9 @@
 
   &__textpos {
     min-height: 100px;
-    background: -moz-linear-gradient(top, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0) 10%, rgba(59, 67, 77, 1) 100%);
-    background: -webkit-linear-gradient(top, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0) 10%, rgba(59, 67, 77, 1) 100%);
-    background: linear-gradient(to bottom, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0) 10%, rgba(59, 67, 77, 1) 100%);
+    background: -moz-linear-gradient(top, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0.25) 10%, rgba(59, 67, 77, 1) 100%);
+    background: -webkit-linear-gradient(top, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0.25) 10%, rgba(59, 67, 77, 1) 100%);
+    background: linear-gradient(to bottom, rgba(59, 67, 77, 0) 0%, rgba(59, 67, 77, 0.25) 10%, rgba(59, 67, 77, 1) 100%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b434d', endColorstr='#3b434d', GradientType=0);
     position: absolute;
     bottom: 0;

src/files/scss/_tags.scss

@@ -85,7 +85,7 @@ h7 {
     padding: 0;
     list-style-type: none;
 
-    li {
+    > li {
         margin: 10px 0;
         counter-increment: step-counter;
         font-size: 15px;
@@ -101,6 +101,9 @@ h7 {
             font-weight: bold;
             padding-right: 5px;
         }
+        ul, ol{
+            margin-left: 40px;
+        }
     }
 }