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

src/app/assets/styles/_grid.scss

@@ -30,6 +30,11 @@
             & .grid-dis-col-2:nth-child(2n) {
                 margin: 0;
             }
+            @media screen and (max-width: 1000px) {
+                &:last-child {
+                    margin: auto;
+                }
+            }
         }
         &-col {
             $gutterSize: 10px;
@@ -43,11 +48,12 @@
                 }
 
                 @media screen and (max-width: 1000px) {
-                    width: calc(50% - #{$gutterSize});
-                    max-width: 230px;
+                    width: 100%;
+                    max-width: unset;
+                    margin-right: 0;
 
                     &:last-child {
-                        margin-right: 0;
+                        width: 100%;
                     }
                 }
             }
@@ -66,8 +72,8 @@
                     max-width: none;
 
                     &:last-child {
-                    width: 100%;
-                }
+                        width: 100%;
+                    }
                 }
             }
             &-3 {

src/app/assets/styles/content/centerbar/organization.scss

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

src/app/assets/styles/content/centerbar/trailernews.scss

@@ -54,14 +54,16 @@
         justify-content: space-between;
         height: 14px;
         line-height: 14px;
+        flex-wrap: wrap;
     }
     &__left {
         display: -webkit-flex;
         display: -ms-flex;
         display: flex;
         flex-direction: row;
-        height: 14px;
+        min-height: 14px;
         line-height: 14px;
+        margin-bottom: 5px;
     }
     &__date {
         margin-right: 20px;

src/app/assets/styles/elements/banner.scss

@@ -3,6 +3,7 @@
 
     img {
         border-radius: 10px 0 0 0 / 10px 0 0 0;
+        max-width: 100%;
     }
 
     &--950x155 {

src/app/assets/styles/elements/calendinfo.scss

@@ -19,4 +19,9 @@
             display: none;
         }
     }
+    &__calendcase {
+        @media (max-width: 1001px) {
+            text-align: left;
+        }
+    }
 }

src/app/assets/styles/media.scss

@@ -30,88 +30,91 @@
         }
     }
 }
+
 @media (min-width: 960px) and (max-width: 1220px) {
 
     .wrapper--content {
         display: block;
     }
-      .leftbar {
+    .leftbar {
         width: 100%;
-    max-width: 230px;
-    vertical-align: top;
-    display: inline-block;
-    margin-right: 20px;
-}
-.centerbar {
-    width: calc(100% - 260px);
-    display: inline-block;
-    vertical-align: top;
-}
+        max-width: 230px;
+        vertical-align: top;
+        display: inline-block;
+        margin-right: 20px;
+    }
+    .centerbar {
+        width: calc(100% - 260px);
+        display: inline-block;
+        vertical-align: top;
+    }
 }
+
 @media screen and (max-width: 960px) {
-.navigation__mobileButton {
-    display: -webkit-flex;
-    display: -ms-flex;
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    margin-right: 4%;
-}
-.navigation__mobileButton img {
-    height: 32px;
-}
- .header .floatmenu {
-    display: none;
-position: absolute;
-right: 0;
-top: 70px;
-background: #3b434d;
-}
-.header.inner .floatmenu {
+    .navigation__mobileButton {
+        display: -webkit-flex;
+        display: -ms-flex;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: center;
+        margin-right: 4%;
+    }
+    .navigation__mobileButton img {
+        height: 32px;
+    }
+    .header.scrolling .floatmenu {
         display: none;
-position: absolute;
-right: 0;
-top: 50px;
-background: #3b434d;
-}
- .header .floatmenu .floatmenu__list {
-    display: block;
-    padding: 10px;
-}
- .header .floatmenu .floatmenu__list .floatmenu__link {
-    line-height: 30px;
-}
-.region__selection-box {
-    width: auto;
-right: 0;
-top: 50px;
-}
-.region-selection__box:before {
-    left: 78%;
-}
+        position: absolute;
+        right: 0;
+        top: 70px;
+        background: #3b434d;
+    }
+    .header.inner .floatmenu {
+        display: none;
+        position: absolute;
+        right: 0;
+        top: 50px;
+        background: #3b434d;
+    }
+    .header .floatmenu .floatmenu__list {
+        display: block;
+        padding: 10px;
+    }
+    .header .floatmenu .floatmenu__list .floatmenu__link {
+        line-height: 30px;
+    }
+    .region__selection-box {
+        width: auto;
+        right: 0;
+        top: 50px;
+    }
+    .region-selection__box:before {
+        left: 78%;
+    }
 }
+
 @media (min-width: 641px) and (max-width: 960px) {
     .wrapper--content {
         display: block;
     }
     .leftbar {
-    width: 100%;
-    max-width: 230px;
-    display: inline-block;
-    margin-right: 20px;
-}
-.centerbar {
-    width: calc(100% - 260px);
-    display: inline-block;
-    vertical-align: top;
-}
+        width: 100%;
+        max-width: 230px;
+        display: inline-block;
+        margin-right: 20px;
+    }
+    .centerbar {
+        width: calc(100% - 260px);
+        display: inline-block;
+        vertical-align: top;
+    }
     .grid-dis-col-33:last-child, .grid-dis-col-66:last-child, .grid-dis-col-1:last-child {
         width: 100%;
         margin-top: 15px !important;
-            max-width: 100%;
+        max-width: 100%;
     }
-        .doctors__photo {
+    .doctors__photo {
         margin: 0 auto;
     }
     .organization-info__vrach-img {
@@ -127,7 +130,7 @@ top: 50px;
     }
     .copyright {
         display: inline-block;
-        width: calc(100%  - 140px);
+        width: calc(100% - 140px);
         margin-right: 0;
     }
     .copyright span {
@@ -136,12 +139,12 @@ top: 50px;
     .aferta {
         display: block;
         width: calc(100% - 20px);
-        margin:0 10px;
+        margin: 0 10px;
     }
     .footer__right {
         display: block;
         width: calc(100% - 20px);
-        margin:0 10px;
+        margin: 0 10px;
     }
     .footer__right .mainlinks {
         display: block;
@@ -149,13 +152,13 @@ top: 50px;
     .footer__right .mainlinks li {
         display: inline-block;
     }
-        .category__list {
+    .category__list {
         display: block;
     }
     .category li, .category__item {
-            width: 47%;
-    display: inline-block;
-    text-align: center;
+        width: 47%;
+        display: inline-block;
+        text-align: center;
     }
     .slogan__text {
         font-size: 14px;
@@ -172,39 +175,40 @@ top: 50px;
         max-width: 100%;
     }
 }
+
 @media screen and (max-width: 640px) {
     .specialization-selection__container {
         column-count: 2;
     }
-      .category li, .category__item {
-            width: 47%;
-    display: inline-block;
-    text-align: center;
+    .category li, .category__item {
+        width: 47%;
+        display: inline-block;
+        text-align: center;
     }
     .category a, .category__link {
-    line-height: 30px;
-    display: block;
-    margin-right: 0px;
-    font-size: 15px;
-}
+        line-height: 30px;
+        display: block;
+        margin-right: 0px;
+        font-size: 15px;
+    }
     .grid-dis-row {
-    max-width: 100%;
-    margin: 0 auto;
-    width: 100%;
-}
-.grid-dis-col-1 {
+        max-width: 100%;
+        margin: 0 auto;
         width: 100%;
-    max-width: 320px;
-}
-.calendinfo {
-    text-align: center;
-}
-.maintitle {
-    display: block;
-    height: auto;
+    }
+    .grid-dis-col-1 {
+        width: 100%;
+        max-width: 320px;
+    }
+    .calendinfo {
+        text-align: center;
+    }
+    .maintitle {
+        display: block;
+        height: auto;
         padding: 10px 0;
         border-radius: 10px;
-}
+    }
     .trailernews {
         display: block;
     }
@@ -218,47 +222,47 @@ top: 50px;
         width: 100%;
     }
     .trailernews__left, .trailernews__right {
-    display: block;
-    width: 100%;
-    height: auto;
-    line-height: 20px;
-}
-.trailernews__views {
+        display: block;
+        width: 100%;
+        height: auto;
+        line-height: 20px;
+    }
+    .trailernews__views {
         width: 10%;
-    display: inline-block;
-}
-.trailernews__comments {
-            width: 40%;
-    display: inline-block;
-}
+        display: inline-block;
+    }
+    .trailernews__comments {
+        width: 40%;
+        display: inline-block;
+    }
     .trailernews__imgc {
-    width: 100%;
-    margin: 0 auto;
-    text-align: center;
-    max-width: none;
-    height: auto;
-    max-height: none;
-}
-.trailernews__imgcase {
-    margin: 0 auto;
-}
-.videorow {
-    display: block;
-}
-.videorow__item {
-    width: 100%;
-    display: block;
-    margin: 10px auto;
-}
-     .region__name {
+        width: 100%;
+        margin: 0 auto;
+        text-align: center;
+        max-width: none;
+        height: auto;
+        max-height: none;
+    }
+    .trailernews__imgcase {
+        margin: 0 auto;
+    }
+    .videorow {
+        display: block;
+    }
+    .videorow__item {
+        width: 100%;
+        display: block;
+        margin: 10px auto;
+    }
+    .region__name {
         display: none;
     }
     .slogan__text {
         display: none;
     }
-        .category li, .category__item {
-            width: 47%;
-            display: inline-block;
+    .category li, .category__item {
+        width: 47%;
+        display: inline-block;
 
     }
     .category__list {
@@ -268,8 +272,8 @@ top: 50px;
         width: 100%;
     }
     .special-items__item {
-    width: 320px;
-    margin: 15px auto;
+        width: 320px;
+        margin: 15px auto;
     }
     .logo--header {
         width: 185px;
@@ -297,7 +301,7 @@ top: 50px;
         max-width: 270px;
         margin: 0 auto;
     }
-    .organization-info__container .vrach-info{
+    .organization-info__container .vrach-info {
         margin: 15px 0;
         min-height: auto;
     }
@@ -323,7 +327,7 @@ top: 50px;
     }
     .copyright {
         display: inline-block;
-        width: calc(100%  - 140px);
+        width: calc(100% - 140px);
         margin-right: 0;
     }
     .copyright span {
@@ -332,12 +336,12 @@ top: 50px;
     .aferta {
         display: block;
         width: calc(100% - 20px);
-        margin:0 10px;
+        margin: 0 10px;
     }
     .footer__right {
         display: block;
         width: calc(100% - 20px);
-        margin:0 10px;
+        margin: 0 10px;
     }
     .footer__right .mainlinks {
         display: block;
@@ -345,14 +349,14 @@ top: 50px;
     .footer__right .mainlinks li {
         display: inline-block;
     }
-.grid-disrb-col-1, .grid-disrb-col-1:nth-child(3n) {
-    width: 100%;
-max-width: 320px;
-margin: 10px auto;
-}
-.shortnews__description {
-    height: auto;
-}
+    .grid-disrb-col-1, .grid-disrb-col-1:nth-child(3n) {
+        width: 100%;
+        max-width: 320px;
+        margin: 10px auto;
+    }
+    .shortnews__description {
+        height: auto;
+    }
 }
 
 @media screen and (max-width: 510px) {
@@ -368,19 +372,20 @@ margin: 10px auto;
         }
     }
 }
- @media screen and (max-width: 420px) {
+
+@media screen and (max-width: 420px) {
     .specialization-selection__container {
         column-count: 1;
     }
-     .uslugi {
-         .search-result {
-             margin-bottom: 30px;
-             -moz-column-count: 1; /* Firefox */
-             -webkit-column-count: 1; /* Safari and Chrome */
-             column-count: 1;
-         }
-         .grid-col-2 {
-             width: 100%;
-         }
-     }
+    .uslugi {
+        .search-result {
+            margin-bottom: 30px;
+            -moz-column-count: 1; /* Firefox */
+            -webkit-column-count: 1; /* Safari and Chrome */
+            column-count: 1;
+        }
+        .grid-col-2 {
+            width: 100%;
+        }
     }
+}

src/app/www/css/all.css

@@ -287,6 +287,9 @@ body {
   .grid-dis-row .grid-dis-col-1:nth-child(4n),
   .grid-dis-row .grid-dis-col-2:nth-child(2n) {
     margin: 0; }
+  @media screen and (max-width: 1000px) {
+    .grid-dis-row:last-child {
+      margin: auto; } }
 
 .grid-dis-col-1 {
   width: calc(25% - 10px);
@@ -296,10 +299,11 @@ body {
     width: 25%; }
   @media screen and (max-width: 1000px) {
     .grid-dis-col-1 {
-      width: calc(50% - 10px);
-      max-width: 230px; }
+      width: 100%;
+      max-width: unset;
+      margin-right: 0; }
       .grid-dis-col-1:last-child {
-        margin-right: 0; } }
+        width: 100%; } }
 
 .grid-dis-col-2 {
   width: calc(50% - 10px);
@@ -540,7 +544,8 @@ body {
 .banner {
   border-radius: 10px 0 0 0 / 10px 0 0 0; }
   .banner img {
-    border-radius: 10px 0 0 0 / 10px 0 0 0; }
+    border-radius: 10px 0 0 0 / 10px 0 0 0;
+    max-width: 100%; }
   @media screen and (max-width: 1220px) {
     .banner--950x155 {
       display: none; } }
@@ -563,6 +568,9 @@ body {
   @media (max-width: 1100px) and (min-width: 1001px) {
     .calendinfo__calendcase {
       display: none; } }
+  @media (max-width: 1001px) {
+    .calendinfo__calendcase {
+      text-align: left; } }
 
 .timeseparator {
   -webkit-animation: timeseparator 1s ease;
@@ -2448,14 +2456,16 @@ body {
     width: 100%;
     justify-content: space-between;
     height: 14px;
-    line-height: 14px; }
+    line-height: 14px;
+    flex-wrap: wrap; }
   .trailernews__left {
     display: -webkit-flex;
     display: -ms-flex;
     display: flex;
     flex-direction: row;
-    height: 14px;
-    line-height: 14px; }
+    min-height: 14px;
+    line-height: 14px;
+    margin-bottom: 5px; }
   .trailernews__date {
     margin-right: 20px;
     color: #929292; }
@@ -3331,7 +3341,8 @@ body {
   .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; }
@@ -6492,7 +6503,7 @@ input[type='submit'].styler[disabled] {
     margin-right: 4%; }
   .navigation__mobileButton img {
     height: 32px; }
-  .header .floatmenu {
+  .header.scrolling .floatmenu, .header.inner .floatmenu {
     display: none;
     position: absolute;
     right: 0;
@@ -6544,7 +6555,7 @@ input[type='submit'].styler[disabled] {
     margin-left: 10px; }
   .copyright {
     display: inline-block;
-    width: calc(100%  - 140px);
+    width: calc(100% - 140px);
     margin-right: 0; }
   .copyright span {
     display: block; }
@@ -6689,7 +6700,7 @@ input[type='submit'].styler[disabled] {
     margin-left: 10px; }
   .copyright {
     display: inline-block;
-    width: calc(100%  - 140px);
+    width: calc(100% - 140px);
     margin-right: 0; }
   .copyright span {
     display: block; }