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

src/app/assets/scripts/main.js

@@ -326,10 +326,17 @@ $(document).ready(function(){
 });
 
 $(document).ready(function () {
-
-
     $('.maincheck').on('change', function () {
         $(this).parents('li').find('input:checkbox').prop('checked', this.checked);
     });
 
+    var search_input = $(".search--static .search__input");
+    var search_btn = $(".search--static .search__iconzoom");
+    search_input.on('change', function () {
+        if (search_input.val() !== '') {
+            search_btn.show();
+        } else {
+            search_btn.hide();
+        }
+    });
 });

src/app/assets/styles/_fonts.scss

@@ -6,7 +6,7 @@
     url('../fonts/opensans_regular.woff') format('woff'),
     url('../fonts/opensans_regular.ttf') format('truetype'),
     url('../fonts/opensans_regular.svg#opensans') format('svg');
-    font-weight: 700;
+    font-weight: 500;
     font-style: normal;
 }
 

src/app/www/css/all.css

@@ -207,7 +207,7 @@ select[multiple] {
   font-family: 'opensans';
   src: url("../fonts/opensans_regular.eot");
   src: url("../fonts/opensans_regular.eot?#iefix") format("embedded-opentype"), url("../fonts/opensans_regular.woff2") format("woff2"), url("../fonts/opensans_regular.woff") format("woff"), url("../fonts/opensans_regular.ttf") format("truetype"), url("../fonts/opensans_regular.svg#opensans") format("svg");
-  font-weight: 700;
+  font-weight: 500;
   font-style: normal; }
 
 @font-face {
@@ -3189,7 +3189,7 @@ body {
   .organization-info__description--short {
     max-height: 100px; }
     .organization-info__description--short:after {
-      background: transparent linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, white 100%) repeat scroll 0 0;
+      background: rgba(0, 0, 0, 0) linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, white 100%) repeat scroll 0 0;
       bottom: 0;
       content: "";
       display: block;
@@ -3693,115 +3693,84 @@ body {
   margin-bottom: 30px;
   -moz-column-count: 2;
   -webkit-column-count: 2;
-  column-count: 2;
-}
-
-.uslugi .search-result li {
-  line-height: 20px;
-  font-size: 15px;
-  padding: 4px 0;
-}
-
-.uslugi .search-result li a {
-  color: #3b434d;
-}
-
-.uslugi .search-result li a:hover {
-  color: #5597d1;
-}
+  column-count: 2; }
+  .uslugi .search-result li {
+    line-height: 20px;
+    font-size: 15px;
+    padding: 4px 0; }
+    .uslugi .search-result li a {
+      color: #3b434d; }
+      .uslugi .search-result li a:hover {
+        color: #5597d1; }
 
 .uslugi .search-result-2 {
   width: calc(50% - 15px);
   display: inline-block;
   box-sizing: border-box;
-  margin: 10px 5px;
-}
-
-.uslugi .search-result-2__title {
-  font-size: 20px;
-  font-weight: bold;
-  color: #3b434d;
-  margin-bottom: 10px;
-  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-}
-
-.uslugi .search-result-2__price {
-  font-size: 15px;
-  color: #1a1916;
-  margin-bottom: 10px;
-  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-}
-
-.uslugi .search-result-2__price span {
-  color: #929292;
-  font-size: 13px;
-}
-
-.uslugi .search-result-2__text {
-  font-size: 15px;
-  line-height: 24px;
-  color: #404040;
-  font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
-}
-
-.uslugi .search-result-2__more {
-  color: #004d7b;
-  font-size: 15px;
-  line-height: 22px;
-  text-decoration: underline;
-  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-}
-
-.uslugi .search-result-2__more:hover {
-  color: #5597d1;
-}
-
-.uslugi .search-result-2__title-clinik {
-  color: #004d7b;
-  font-size: 17px;
-  line-height: 22px;
-  color: #3b434d;
-  margin: 10px 0;
-  font-weight: bold;
-  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-}
+  margin: 10px 5px; }
+  .uslugi .search-result-2__title {
+    font-size: 20px;
+    font-weight: bold;
+    color: #3b434d;
+    margin-bottom: 10px;
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif; }
+  .uslugi .search-result-2__price {
+    font-size: 15px;
+    color: #1a1916;
+    margin-bottom: 10px;
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif; }
+    .uslugi .search-result-2__price span {
+      color: #929292;
+      font-size: 13px; }
+  .uslugi .search-result-2__text {
+    font-size: 15px;
+    line-height: 24px;
+    color: #404040;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif; }
+  .uslugi .search-result-2__more {
+    color: #004d7b;
+    font-size: 15px;
+    line-height: 22px;
+    text-decoration: underline;
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif; }
+  .uslugi .search-result-2__more:hover {
+    color: #5597d1; }
+  .uslugi .search-result-2__title-clinik {
+    color: #004d7b;
+    font-size: 17px;
+    line-height: 22px;
+    color: #3b434d;
+    margin: 10px 0;
+    font-weight: bold;
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif; }
 
 .uslugi .pagetitle {
-  color: #5597d1;
-}
+  color: #5597d1; }
 
 .uslugi .filterservice {
-  margin-bottom: 35px;
-}
-
-.uslugi .filterservice textarea {
-  width: 100%;
-  padding: 0 5px;
-  box-sizing: border-box;
-  background: #fff;
-  text-align: left;
-  border-radius: 15px;
-  height: 115px;
-  line-height: 30px;
-  border: 1px solid #d7d7d7;
-  font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
-  font-size: 11px;
-}
-
-.uslugi .filterservice__text {
-  font-size: 13px;
-  line-height: 20px;
-  color: #929292;
-  padding: 0 12px 5px;
-}
+  margin-bottom: 35px; }
+  .uslugi .filterservice textarea {
+    width: 100%;
+    padding: 0 5px;
+    box-sizing: border-box;
+    background: #fff;
+    text-align: left;
+    border-radius: 15px;
+    height: 115px;
+    line-height: 30px;
+    border: 1px solid #d7d7d7;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    font-size: 11px; }
+  .uslugi .filterservice__text {
+    font-size: 13px;
+    line-height: 20px;
+    color: #929292;
+    padding: 0 12px 5px; }
 
 .uslugi .blue {
-  background: #5597d1;
-}
-
-.uslugi .blue:hover {
-  background: #004d7b;
-}
+  background: #5597d1; }
+  .uslugi .blue:hover {
+    background: #004d7b; }
 
 .uslugi .selectedline {
   background: #ebebeb;
@@ -3811,42 +3780,36 @@ body {
   font-size: 17px;
   line-height: 28px;
   font-weight: normal;
-  padding-bottom: 20px;
-}
+  padding-bottom: 20px; }
 
 .uslugi .selectedline__item {
   background: url("../img/icon_filter_blue_26x26@2x.png") 4px 7px/13px 13px no-repeat;
-  padding-right: 5px;
-}
+  padding-right: 5px; }
 
 .postbody__imgleft {
   margin-right: 9px;
   max-width: 227px;
   width: calc(50% - 10px);
-  display: inline-block;
-}
+  display: inline-block; }
 
 .postbody__imgright {
   margin-left: 9px;
   max-width: 227px;
   width: calc(50% - 10px);
-  display: inline-block;
-}
+  display: inline-block; }
 
 .postbody__title-uslugi {
   font-size: 20px;
   font-weight: bold;
   color: #3b434d;
   margin-bottom: 10px;
-  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-}
+  font-family: "cuprum", Impact, "Charcoal CY", sans-serif; }
 
 .postbody__najdeno {
   font-size: 17px;
   line-height: 28px;
   color: #3b434d;
-  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-}
+  font-family: "cuprum", Impact, "Charcoal CY", sans-serif; }
 
 .postbody__title-blue {
   font-size: 25px;
@@ -3854,21 +3817,15 @@ body {
   color: #5597d1;
   font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
   font-weight: 700;
-  margin-bottom: 30px;
-}
+  margin-bottom: 30px; }
 
 .stoim-uslug {
   font-size: 13px;
-  width: 100%;
-}
-
-.stoim-uslug td:first-child {
-  padding-left: 0;
-}
-
-.stoim-uslug td:last-child {
-  padding-right: 0;
-}
+  width: 100%; }
+  .stoim-uslug td:first-child {
+    padding-left: 0; }
+  .stoim-uslug td:last-child {
+    padding-right: 0; }
 
 .greybox {
   font-size: 15px;
@@ -3877,40 +3834,29 @@ body {
   background: #ebebeb;
   margin-bottom: 40px;
   padding: 10px;
-  margin-left: 10px;
-}
-
-.greybox__param {
-  display: inline-block;
-  color: #929292;
-  font-size: 13px;
-}
-
-.greybox__item {
-  display: inline-block;
-}
-
-li:nth-child(3) .greybox__param, li:nth-child(3) .greybox__item, li:nth-child(4) .greybox__param, li:nth-child(4) .greybox__item {
-  display: block;
-}
+  margin-left: 10px; }
+  .greybox__param {
+    display: inline-block;
+    color: #929292;
+    font-size: 13px; }
+  .greybox__item {
+    display: inline-block; }
+  li:nth-child(3) .greybox__param, li:nth-child(3) .greybox__item, li:nth-child(4) .greybox__param, li:nth-child(4) .greybox__item {
+    display: block; }
 
 .single-usluga__personal-title {
   color: #3b434d;
   font-size: 20px;
   line-height: 30px;
   margin-bottom: 5px;
-  margin-left: 10px;
-}
+  margin-left: 10px; }
 
 .single-usluga .protivopokazania {
   font-size: 13px;
-  line-height: 20px;
-}
-
-.single-usluga .protivopokazania li {
-  font-size: 13px;
-  line-height: 20px;
-}
+  line-height: 20px; }
+  .single-usluga .protivopokazania li {
+    font-size: 13px;
+    line-height: 20px; }
 
 .uslugi--pokazania {
   font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
@@ -3919,32 +3865,24 @@ li:nth-child(3) .greybox__param, li:nth-child(3) .greybox__item, li:nth-child(4)
   position: relative;
   overflow: hidden;
   max-height: none;
-  padding-top: 13px;
-}
-
-.uslugi--pokazania li {
-  font-size: 13px;
-  line-height: 20px;
-}
-
-.uslugi--pokazania li span {
-  margin-right: 10px;
-}
+  padding-top: 13px; }
+  .uslugi--pokazania li {
+    font-size: 13px;
+    line-height: 20px; }
+  .uslugi--pokazania li span {
+    margin-right: 10px; }
 
 .uslugi--pokazania.closed {
-  max-height: 260px;
-}
-
-.uslugi--pokazania.closed:after {
-  background: transparent linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, white 100%) repeat scroll 0 0;
-  bottom: 0;
-  content: "";
-  display: block;
-  height: 100px;
-  left: 0;
-  position: absolute;
-  right: 0;
-}
+  max-height: 260px; }
+  .uslugi--pokazania.closed:after {
+    background: rgba(0, 0, 0, 0) linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, white 100%) repeat scroll 0 0;
+    bottom: 0;
+    content: "";
+    display: block;
+    height: 100px;
+    left: 0;
+    position: absolute;
+    right: 0; }
 
 .uslugi--pokazania--handler {
   text-align: center;
@@ -3953,99 +3891,71 @@ li:nth-child(3) .greybox__param, li:nth-child(3) .greybox__item, li:nth-child(4)
   color: #004d7b;
   padding-top: 3px;
   margin-bottom: 29px;
-  cursor: pointer;
-}
+  cursor: pointer; }
 
 .uslugifilter {
-  margin-bottom: 30px;
-}
-
-.uslugifilter .active {
-  height: 0;
-  overflow: hidden;
-  padding: 0;
-}
-
-.uslugifilter__wrap {
-  margin-bottom: 10px;
-}
-
-.uslugifilter__title {
-  background: #d7d7d7;
-  border-radius: 10px 0 0 0 / 10px 0 0 0;
-  padding: 10px;
-  line-height: 20px;
-  color: #3b434d;
-  font-size: 17px;
-  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-  font-weight: bold;
-}
-
-.uslugifilter__listcase {
-  background: #ebebeb;
-  padding: 13px 10px;
-  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-  font-size: 15px;
-  line-height: 24px;
-  height: auto;
-  overflow: inherit;
-}
-
-.uslugifilter__listcase label {
-  font-size: 15px;
-  line-height: 24px;
-  width: 100%;
-  color: #3b434d;
-}
-
-.uslugifilter__listcase span {
-  display: inline-block;
-  width: calc(100% - 23px);
-}
-
-.uslugifilter__listcase ul li ul {
-  margin-left: 15px;
-  color: #929292;
-}
-
-.uslugifilter__listcase ul li ul label {
-  color: #929292;
-  font-size: 14px;
-  line-height: 20px;
-}
-
-.uslugifilter__listcase input[type=checkbox] {
-  -moz-appearance: checkbox;
-  -webkit-appearance: checkbox;
-  appearance: checkbox;
-  margin-right: 10px;
-  display: inline-block;
-  vertical-align: top;
-  margin-top: 5px;
-}
-
-.uslugifilter__link {
-  padding-left: 18px;
-  display: block;
-  margin-bottom: 8px;
-  color: #3b434d;
-  text-decoration: none;
-}
-
-.uslugifilter__link:hover {
-  color: #e65e26;
-}
-
-.uslugifilter__reset {
-  padding-left: 18px;
-  display: block;
-  color: #3b434d;
-  text-decoration: underline;
-}
-
-.uslugifilter__reset:hover {
-  text-decoration: none;
-}
+  margin-bottom: 30px; }
+  .uslugifilter .active {
+    height: 0;
+    overflow: hidden;
+    padding: 0; }
+  .uslugifilter__wrap {
+    margin-bottom: 10px; }
+  .uslugifilter__title {
+    background: #d7d7d7;
+    border-radius: 10px 0 0 0 / 10px 0 0 0;
+    padding: 10px;
+    line-height: 20px;
+    color: #3b434d;
+    font-size: 17px;
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
+    font-weight: bold; }
+  .uslugifilter__listcase {
+    background: #ebebeb;
+    padding: 13px 10px;
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
+    font-size: 15px;
+    line-height: 24px;
+    height: auto;
+    overflow: inherit; }
+    .uslugifilter__listcase label {
+      font-size: 15px;
+      line-height: 24px;
+      width: 100%;
+      color: #3b434d; }
+    .uslugifilter__listcase span {
+      display: inline-block;
+      width: calc(100% - 23px); }
+    .uslugifilter__listcase ul li ul {
+      margin-left: 15px;
+      color: #929292; }
+    .uslugifilter__listcase ul li ul label {
+      color: #929292;
+      font-size: 14px;
+      line-height: 20px; }
+    .uslugifilter__listcase input[type=checkbox] {
+      -moz-appearance: checkbox;
+      -webkit-appearance: checkbox;
+      appearance: checkbox;
+      margin-right: 10px;
+      display: inline-block;
+      vertical-align: top;
+      margin-top: 5px; }
+  .uslugifilter__link {
+    padding-left: 18px;
+    display: block;
+    margin-bottom: 8px;
+    color: #3b434d;
+    text-decoration: none; }
+    .uslugifilter__link:hover {
+      color: #e65e26; }
+  .uslugifilter__reset {
+    padding-left: 18px;
+    display: block;
+    color: #3b434d;
+    text-decoration: underline; }
+    .uslugifilter__reset:hover {
+      text-decoration: none; }
 
 .errorblock {
   background: #ebebeb;
@@ -4123,8 +4033,7 @@ li:nth-child(3) .greybox__param, li:nth-child(3) .greybox__item, li:nth-child(4)
       width: 30px;
       height: 30px;
       line-height: 25px;
-      background: url(../img/16.png) center center/cover no-repeat;
-    }
+      background: url(../img/16.png) center center/cover no-repeat; }
 
 .social--fixed {
   position: fixed;
@@ -6533,32 +6442,20 @@ input[type='submit'].styler[disabled] {
 
 @media (max-width: 1300px) {
   .search-result-2 .personals__title .personals__name {
-    font-size: 14px;
-  }
-
+    font-size: 14px; }
   .search-result-2 .personals__description, .search-result-2 .personals__category, .search-result-2 .personals__category {
-    font-size: 12px;
-  }
-}
+    font-size: 12px; } }
 
 @media (max-width: 1220px) {
   .uslugi .specsingle--leftlinks--item {
-    width: 100%;
-  }
-
+    width: 100%; }
   .uslugi .search-result-2 {
     width: 100%;
-    display: block;
-  }
-
+    display: block; }
   .uslugi .grid-dis-row {
-    max-width: 100%;
-  }
-
+    max-width: 100%; }
   .uslugi .grid-col-2 {
-    width: 50%;
-  }
-}
+    width: 50%; } }
 
 @media (min-width: 960px) and (max-width: 1220px) {
   .wrapper--content {
@@ -6668,9 +6565,7 @@ input[type='submit'].styler[disabled] {
   .uslugi .leftbar {
     display: block !important;
     width: 100%;
-    max-width: 100%;
-  }
-}
+    max-width: 100%; } }
 
 @media screen and (max-width: 640px) {
   .specialization-selection__container {
@@ -6810,32 +6705,22 @@ input[type='submit'].styler[disabled] {
 @media screen and (max-width: 510px) {
   .postbody__imgleft {
     margin: 10px auto;
-    display: block;
-  }
-
+    display: block; }
   .postbody__imgright {
     margin: 10px auto;
-    display: block;
-  }
-}
+    display: block; } }
 
 @media screen and (max-width: 420px) {
   .specialization-selection__container {
-    column-count: 1;
-  }
-
+    column-count: 1; }
   .uslugi .search-result {
     margin-bottom: 30px;
     -moz-column-count: 1;
     /* Firefox */
     -webkit-column-count: 1;
     /* Safari and Chrome */
-    column-count: 1;
-  }
-
+    column-count: 1; }
   .uslugi .grid-col-2 {
-    width: 100%;
-  }
-}
+    width: 100%; } }
 
 /*# sourceMappingURL=all.css.map */