Merge branch 'fixes-2017-08-2017' of Adyn/medgis-ru-assets into master

app/assets/styles/all.scss

@@ -9,6 +9,7 @@
 @import "_include";
 @import "_mixin";
 @import "_grid";
+@import "tags";
 //
 @import "elements/input";
 @import "elements/btn";

app/assets/styles/content/centerbar/full-news.scss

@@ -135,125 +135,27 @@
         }
 
         h2 {
-            font-family: $fontcuprum;
-            font-size: 25px;
-            margin: 20px 0;
-            font-weight: 600;
+            @extend %h2;
         }
 
         h3 {
-            font-family: $fontcuprum;
-            font-size: 20px;
-            margin: 20px 0;
-            font-weight: 600;
+            @extend %h3;
         }
 
         p {
-            font-family: $fontopensans;
-            font-size: 15px;
-            margin: 20px 0;
-
-            img {
-                float: left;
-                margin-right: 20px;
-                margin-bottom: 23px;
-                margin-top: 6px;
-            }
+            @extend %p;
         }
 
         ul {
-            margin: 0;
-            padding: 0;
-            list-style-type: none;
-
-            li {
-                padding-left: 12px;
-                position: relative;
-                font-size: 16px;
-                font-family: $fontopensans;
-                color: #404040;
-                line-height: 1.5;
-                margin-bottom: 10px;
-
-                &:before {
-                    content: '';
-                    display: block;
-                    position: absolute;
-                    left: 0;
-                    top: 10px;
-                    background: #265e86;
-                    border-radius: 50%;
-                    width: 6px;
-                    height: 6px;
-                }
-            }
+            @extend %ul;
         }
 
         ol {
-            margin: 0;
-            padding: 0;
-            list-style-type: none;
-
-            li {
-                counter-increment: step-counter;
-                font-size: 16px;
-                font-family: $fontopensans;
-                color: #404040;
-                line-height: 1.5;
-
-                &:before {
-                    content: counter(step-counter) ".";
-                    font-size: 11px;
-                    font-family: $fontopensans;
-                    color: #004d7b;
-                    font-weight: bold;
-                }
-            }
+            @extend %ol;
         }
 
         table {
-            width: 100%;
-            border-spacing: 0;
-            border: 1px solid #e6e6e6;
-            margin-top: 20px;
-
-            th {
-                background: #e6e6e6;
-                font-size: 11px;
-                font-family: $fontopensans;
-                color: #004d7b;
-                text-transform: uppercase;
-                line-height: 1.2;
-                padding: 17px 0 17px 12px;
-                border: 1px solid #e6e6e6;
-                text-align: left;
-
-                &:nth-child(1) {
-                    width: 19%;
-                }
-
-                &:nth-child(2) {
-                    width: 23%;
-                }
-            }
-
-            td {
-                font-size: 14px;
-                font-family: $fontopensans;
-                color: #404040;
-                line-height: 1.714;
-                padding: 14px 0 14px 12px;
-                border: 1px solid #e6e6e6;
-                vertical-align: top;
-
-                &:nth-child(1) {
-                    width: 13%;
-                }
-
-                &:nth-child(2) {
-                    width: 23%;
-                }
-            }
+            @extend %table;
 
             .mobileth {
                 display: none;
@@ -261,17 +163,7 @@
         }
 
         blockquote {
-            padding: 5px 25px 5px 60px;
-            background: #ebebeb url('../img/cite.png') 20px 30px no-repeat;
-
-            p {
-                font-size: 25px;
-                font-family: $fontcuprum;
-
-                small {
-                    font-size: 15px;
-                }
-            }
+            @extend %blockquote;
         }
 
         .col3__item {

app/assets/styles/content/centerbar/specials.scss

@@ -163,4 +163,136 @@ $specials-selector: 'special-items';
             background: #d2dee9;
         }
     }
+}
+
+$specials-page-selector: 'special-page';
+
+.#{$specials-page-selector} {
+    &__article {
+        margin-bottom: 40px;
+        padding-bottom: 10px;
+        border-bottom: none;
+
+        &:before,
+        &:after {
+            display: block;
+            clear: both;
+            content: '';
+        }
+
+        h2 {
+            @extend %h2;
+        }
+
+        h3 {
+            @extend %h3;
+        }
+
+        p {
+            @extend %p;
+        }
+
+        ul {
+            @extend %ul;
+        }
+
+        ol {
+            @extend %ol;
+        }
+
+        table {
+            @extend %table;
+
+            .mobileth {
+                display: none;
+            }
+        }
+
+        blockquote {
+            @extend %blockquote;
+        }
+
+        .col3__item {
+            display: inline-block;
+            width: calc(33% - 0.25em - 10px);
+            margin-right: 20px;
+
+            &:last-child {
+                margin-right: 0;
+            }
+        }
+
+        .col2__item {
+            display: inline-block;
+            width: calc(50% - 0.25em - 10px);
+            margin-right: 20px;
+
+            &:last-child {
+                margin-right: 0;
+            }
+        }
+    }
+
+    &__description {
+        display: block;
+        font-family: $fontcuprum;
+        font-size: 13px;
+
+        &-type {
+            display: inline-block;
+            color: #ffffff;
+            font-weight: 600;
+            padding: 8px;
+
+            &--specials {
+                @extend .#{$specials-selector}__title--specials;
+            }
+
+            &--exhibition {
+                @extend .#{$specials-selector}__title--exhibition;
+            }
+
+            &--school {
+                @extend .#{$specials-selector}__title--school;
+            }
+
+            &--conference {
+                @extend .#{$specials-selector}__title--conference;
+            }
+        }
+
+        &-dates {
+            display: inline-block;
+            padding: 8px;
+        }
+
+        &-organization-name {
+            display: block;
+            color: #004d7b;
+            margin: 16px 0;
+        }
+
+        &-organization-address {
+            display: block;
+            color: #929292;
+            margin: 16px 0;
+        }
+
+        &-text {
+            font-size: 15px;
+        }
+    }
+
+    &__similar {
+        display: flex;
+        flex-direction: row;
+        margin: 0 -10px;
+    }
+
+    &__subtitle {
+        font-family: $fontcuprum;
+        font-size: 25px;
+        color: #3b434d;
+        font-weight: 600;
+    }
 }

app/assets/styles/tags.scss

@@ -0,0 +1,135 @@
+%h2 {
+    font-family: $fontcuprum;
+    font-size: 25px;
+    margin: 20px 0;
+    font-weight: 600;
+}
+
+%h3 {
+    font-family: $fontcuprum;
+    font-size: 20px;
+    margin: 20px 0;
+    font-weight: 600;
+}
+
+%p {
+    font-family: $fontopensans;
+    font-size: 15px;
+    margin: 20px 0;
+
+    img {
+        float: left;
+        margin-right: 20px;
+        margin-bottom: 23px;
+        margin-top: 6px;
+    }
+}
+
+%ul {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+
+    li {
+        padding-left: 12px;
+        position: relative;
+        font-size: 16px;
+        font-family: $fontopensans;
+        color: #404040;
+        line-height: 1.5;
+        margin-bottom: 10px;
+
+        &:before {
+            content: '';
+            display: block;
+            position: absolute;
+            left: 0;
+            top: 10px;
+            background: #265e86;
+            border-radius: 50%;
+            width: 6px;
+            height: 6px;
+        }
+    }
+}
+
+%ol {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+
+    li {
+        counter-increment: step-counter;
+        font-size: 16px;
+        font-family: $fontopensans;
+        color: #404040;
+        line-height: 1.5;
+
+        &:before {
+            content: counter(step-counter) ".";
+            font-size: 11px;
+            font-family: $fontopensans;
+            color: #004d7b;
+            font-weight: bold;
+        }
+    }
+}
+
+%table {
+    width: 100%;
+    border-spacing: 0;
+    border: 1px solid #e6e6e6;
+    margin-top: 20px;
+
+    th {
+        background: #e6e6e6;
+        font-size: 11px;
+        font-family: $fontopensans;
+        color: #004d7b;
+        text-transform: uppercase;
+        line-height: 1.2;
+        padding: 17px 0 17px 12px;
+        border: 1px solid #e6e6e6;
+        text-align: left;
+
+        &:nth-child(1) {
+            width: 19%;
+        }
+
+        &:nth-child(2) {
+            width: 23%;
+        }
+    }
+
+    td {
+        font-size: 14px;
+        font-family: $fontopensans;
+        color: #404040;
+        line-height: 1.714;
+        padding: 14px 0 14px 12px;
+        border: 1px solid #e6e6e6;
+        vertical-align: top;
+
+        &:nth-child(1) {
+            width: 13%;
+        }
+
+        &:nth-child(2) {
+            width: 23%;
+        }
+    }
+}
+
+%blockquote {
+    padding: 5px 25px 5px 60px;
+    background: #ebebeb url('../img/cite.png') 20px 30px no-repeat;
+
+    p {
+        font-size: 25px;
+        font-family: $fontcuprum;
+
+        small {
+            font-size: 15px;
+        }
+    }
+}

app/www/css/all.css

@@ -406,6 +406,142 @@ body {
       max-width: 100%;
       margin: 0; } }
 
+.full-news__text h2, .special-page__article h2 {
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
+    font-size: 25px;
+    margin: 20px 0;
+    font-weight: 600;
+}
+
+.full-news__text h3, .special-page__article h3 {
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
+    font-size: 20px;
+    margin: 20px 0;
+    font-weight: 600;
+}
+
+.full-news__text p, .special-page__article p {
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    font-size: 15px;
+    margin: 20px 0;
+}
+
+.full-news__text p img, .special-page__article p img {
+    float: left;
+    margin-right: 20px;
+    margin-bottom: 23px;
+    margin-top: 6px;
+}
+
+.full-news__text ul, .special-page__article ul {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
+.full-news__text ul li, .special-page__article ul li {
+    padding-left: 12px;
+    position: relative;
+    font-size: 16px;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    color: #404040;
+    line-height: 1.5;
+    margin-bottom: 10px;
+}
+
+.full-news__text ul li:before, .special-page__article ul li:before {
+    content: '';
+    display: block;
+    position: absolute;
+    left: 0;
+    top: 10px;
+    background: #265e86;
+    border-radius: 50%;
+    width: 6px;
+    height: 6px;
+}
+
+.full-news__text ol, .special-page__article ol {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
+.full-news__text ol li, .special-page__article ol li {
+    counter-increment: step-counter;
+    font-size: 16px;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    color: #404040;
+    line-height: 1.5;
+}
+
+.full-news__text ol li:before, .special-page__article ol li:before {
+    content: counter(step-counter) ".";
+    font-size: 11px;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    color: #004d7b;
+    font-weight: bold;
+}
+
+.full-news__text table, .special-page__article table {
+    width: 100%;
+    border-spacing: 0;
+    border: 1px solid #e6e6e6;
+    margin-top: 20px;
+}
+
+.full-news__text table th, .special-page__article table th {
+    background: #e6e6e6;
+    font-size: 11px;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    color: #004d7b;
+    text-transform: uppercase;
+    line-height: 1.2;
+    padding: 17px 0 17px 12px;
+    border: 1px solid #e6e6e6;
+    text-align: left;
+}
+
+.full-news__text table th:nth-child(1), .special-page__article table th:nth-child(1) {
+    width: 19%;
+}
+
+.full-news__text table th:nth-child(2), .special-page__article table th:nth-child(2) {
+    width: 23%;
+}
+
+.full-news__text table td, .special-page__article table td {
+    font-size: 14px;
+    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+    color: #404040;
+    line-height: 1.714;
+    padding: 14px 0 14px 12px;
+    border: 1px solid #e6e6e6;
+    vertical-align: top;
+}
+
+.full-news__text table td:nth-child(1), .special-page__article table td:nth-child(1) {
+    width: 13%;
+}
+
+.full-news__text table td:nth-child(2), .special-page__article table td:nth-child(2) {
+    width: 23%;
+}
+
+.full-news__text blockquote, .special-page__article blockquote {
+    padding: 5px 25px 5px 60px;
+    background: #ebebeb url("../img/cite.png") 20px 30px no-repeat;
+}
+
+.full-news__text blockquote p, .special-page__article blockquote p {
+    font-size: 25px;
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
+}
+
+.full-news__text blockquote p small, .special-page__article blockquote p small {
+    font-size: 15px;
+}
+
 .input {
   width: 100%;
   padding: 0 5px;
@@ -1969,104 +2105,10 @@ body {
     display: block;
     clear: both;
     content: ''; }
-  .full-news__text h2 {
-    font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-    font-size: 25px;
-    margin: 20px 0;
-    font-weight: 600; }
-  .full-news__text h3 {
-    font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-    font-size: 20px;
-    margin: 20px 0;
-    font-weight: 600; }
-  .full-news__text p {
-    font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
-    font-size: 15px;
-    margin: 20px 0; }
-    .full-news__text p img {
-      float: left;
-      margin-right: 20px;
-      margin-bottom: 23px;
-      margin-top: 6px; }
-  .full-news__text ul {
-    margin: 0;
-    padding: 0;
-    list-style-type: none; }
-    .full-news__text ul li {
-      padding-left: 12px;
-      position: relative;
-      font-size: 16px;
-      font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
-      color: #404040;
-      line-height: 1.5;
-      margin-bottom: 10px; }
-      .full-news__text ul li:before {
-        content: '';
-        display: block;
-        position: absolute;
-        left: 0;
-        top: 10px;
-        background: #265e86;
-        border-radius: 50%;
-        width: 6px;
-        height: 6px; }
-  .full-news__text ol {
-    margin: 0;
-    padding: 0;
-    list-style-type: none; }
-    .full-news__text ol li {
-      counter-increment: step-counter;
-      font-size: 16px;
-      font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
-      color: #404040;
-      line-height: 1.5; }
-      .full-news__text ol li:before {
-        content: counter(step-counter) ".";
-        font-size: 11px;
-        font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
-        color: #004d7b;
-        font-weight: bold; }
-  .full-news__text table {
-    width: 100%;
-    border-spacing: 0;
-    border: 1px solid #e6e6e6;
-    margin-top: 20px; }
-    .full-news__text table th {
-      background: #e6e6e6;
-      font-size: 11px;
-      font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
-      color: #004d7b;
-      text-transform: uppercase;
-      line-height: 1.2;
-      padding: 17px 0 17px 12px;
-      border: 1px solid #e6e6e6;
-      text-align: left; }
-      .full-news__text table th:nth-child(1) {
-        width: 19%; }
-      .full-news__text table th:nth-child(2) {
-        width: 23%; }
-    .full-news__text table td {
-      font-size: 14px;
-      font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
-      color: #404040;
-      line-height: 1.714;
-      padding: 14px 0 14px 12px;
-      border: 1px solid #e6e6e6;
-      vertical-align: top; }
-      .full-news__text table td:nth-child(1) {
-        width: 13%; }
-      .full-news__text table td:nth-child(2) {
-        width: 23%; }
-    .full-news__text table .mobileth {
-      display: none; }
-  .full-news__text blockquote {
-    padding: 5px 25px 5px 60px;
-    background: #ebebeb url("../img/cite.png") 20px 30px no-repeat; }
-    .full-news__text blockquote p {
-      font-size: 25px;
-      font-family: "cuprum", Impact, "Charcoal CY", sans-serif; }
-      .full-news__text blockquote p small {
-        font-size: 15px; }
+
+.full-news__text table .mobileth {
+    display: none;
+}
   .full-news__text .col3__item {
     display: inline-block;
     width: calc(33% - 0.25em - 10px);
@@ -2684,21 +2726,29 @@ body {
   margin-left: -1px;
   margin-right: -1px;
   margin-top: -1px; }
-  .special-items__title--specials {
+
+.special-items__title--specials, .special-page__description-type--specials {
     background-color: #e65e26; }
-    .special-items__item:hover .special-items__title--specials {
+
+.special-items__item:hover .special-items__title--specials, .special-items__item:hover .special-page__description-type--specials {
       background-color: #eb8054; }
-  .special-items__title--exhibition {
+
+.special-items__title--exhibition, .special-page__description-type--exhibition {
     background-color: #53b02e; }
-    .special-items__item:hover .special-items__title--exhibition {
+
+.special-items__item:hover .special-items__title--exhibition, .special-items__item:hover .special-page__description-type--exhibition {
       background-color: #6bce43; }
-  .special-items__title--school {
+
+.special-items__title--school, .special-page__description-type--school {
     background-color: #929292; }
-    .special-items__item:hover .special-items__title--school {
+
+.special-items__item:hover .special-items__title--school, .special-items__item:hover .special-page__description-type--school {
       background-color: #acacac; }
-  .special-items__title--conference {
+
+.special-items__title--conference, .special-page__description-type--conference {
     background-color: #5597d1; }
-    .special-items__item:hover .special-items__title--conference {
+
+.special-items__item:hover .special-items__title--conference, .special-items__item:hover .special-page__description-type--conference {
       background-color: #7db0dc; }
 
 .special-items__item-content {
@@ -2762,6 +2812,89 @@ body {
   .special-items__item:hover .special-items__organization-address {
     background: #d2dee9; }
 
+.special-page__article {
+    margin-bottom: 40px;
+    padding-bottom: 10px;
+    border-bottom: none;
+}
+
+.special-page__article:before, .special-page__article:after {
+    display: block;
+    clear: both;
+    content: '';
+}
+
+.special-page__article table .mobileth {
+    display: none;
+}
+
+.special-page__article .col3__item {
+    display: inline-block;
+    width: calc(33% - 0.25em - 10px);
+    margin-right: 20px;
+}
+
+.special-page__article .col3__item:last-child {
+    margin-right: 0;
+}
+
+.special-page__article .col2__item {
+    display: inline-block;
+    width: calc(50% - 0.25em - 10px);
+    margin-right: 20px;
+}
+
+.special-page__article .col2__item:last-child {
+    margin-right: 0;
+}
+
+.special-page__description {
+    display: block;
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
+    font-size: 13px;
+}
+
+.special-page__description-type {
+    display: inline-block;
+    color: #ffffff;
+    font-weight: 600;
+    padding: 8px;
+}
+
+.special-page__description-dates {
+    display: inline-block;
+    padding: 8px;
+}
+
+.special-page__description-organization-name {
+    display: block;
+    color: #004d7b;
+    margin: 16px 0;
+}
+
+.special-page__description-organization-address {
+    display: block;
+    color: #929292;
+    margin: 16px 0;
+}
+
+.special-page__description-text {
+    font-size: 15px;
+}
+
+.special-page__similar {
+    display: flex;
+    flex-direction: row;
+    margin: 0 -10px;
+}
+
+.special-page__subtitle {
+    font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
+    font-size: 25px;
+    color: #3b434d;
+    font-weight: 600;
+}
+
 .comments__block {
   margin-top: 40px; }