Merge branch 'organizations' of Adyn/medgis-ru-assets into master

app/assets/styles/all.scss

@@ -16,6 +16,7 @@
 @import "elements/holidays";
 //
 @import "blocks/logo";
+@import "blocks/entity-badge";
 //
 @import "header/header";
 @import "header/slogan";

app/assets/styles/blocks/entity-badge.scss

@@ -0,0 +1,81 @@
+.entity-badge {
+    &__badge {
+        position: absolute;
+        bottom: 0;
+        left: -10px;
+        height: 36px;
+        line-height: 30px;
+        padding-right: 8px;
+        max-width: calc(100% - 18px);
+        text-overflow: ellipsis;
+        color: #fff;
+        background-image: url(../img/specials/badge-middle.png);
+        font-family: $fontcuprum;
+        font-size: 18px;
+
+        &:before {
+            position: absolute;
+            left: -8px;
+            top: 0;
+            content: '';
+            display: block;
+            height: 100%;
+            width: 8px;
+            background-image: url(../img/specials/badge-start.png);
+        }
+        &:after {
+            position: absolute;
+            right: -10px;
+            top: 0;
+            content: '';
+            display: block;
+            height: 100%;
+            width: 10px;
+            background-image: url(../img/specials/badge-end.png);
+        }
+
+        &--orange {
+            background-position: 0 0;
+
+            &:before,
+            &:after {
+                background-position: 0 0;
+            }
+        }
+
+        &--green {
+            background-position: 0 -36px;
+
+            &:before,
+            &:after {
+                background-position: 0 -36px;
+            }
+        }
+
+        &--gray {
+            background-position: 0 -72px;
+
+            &:before,
+            &:after {
+                background-position: 0 -72px;
+            }
+        }
+
+        &--blue {
+            background-position: 0 -108px;
+
+            &:before,
+            &:after {
+                background-position: 0 -108px;
+            }
+        }
+
+        &-text {
+            overflow: hidden;
+            width: 100%;
+            display: block;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+    }
+}

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

@@ -53,82 +53,20 @@
     }
 
     &__badge {
-        position: absolute;
-        bottom: 0;
-        left: -10px;
-        height: 36px;
-        line-height: 30px;
-        padding-right: 8px;
-        max-width: calc(100% - 18px);
-        text-overflow: ellipsis;
-        color: #fff;
-        background-image: url(../img/specials/badge-middle.png);
-        font-family: $fontcuprum;
-        font-size: 18px;
-
-        &:before {
-            position: absolute;
-            left: -8px;
-            top: 0;
-            content: '';
-            display: block;
-            height: 100%;
-            width: 8px;
-            background-image: url(../img/specials/badge-start.png);
-        }
-        &:after {
-            position: absolute;
-            right: -10px;
-            top: 0;
-            content: '';
-            display: block;
-            height: 100%;
-            width: 10px;
-            background-image: url(../img/specials/badge-end.png);
-        }
-
         &--specials {
-            background-position: 0 0;
-
-            &:before,
-            &:after {
-                background-position: 0 0;
-            }
+            @extend .entity-badge__badge--orange;
         }
 
         &--exhibition {
-            background-position: 0 -36px;
-
-            &:before,
-            &:after {
-                background-position: 0 -36px;
-            }
+            @extend .entity-badge__badge--green;
         }
 
         &--school {
-            background-position: 0 -72px;
-
-            &:before,
-            &:after {
-                background-position: 0 -72px;
-            }
+            @extend .entity-badge__badge--gray;
         }
 
         &--conference {
-            background-position: 0 -108px;
-
-            &:before,
-            &:after {
-                background-position: 0 -108px;
-            }
-        }
-
-        &-text {
-            overflow: hidden;
-            width: 100%;
-            display: block;
-            white-space: nowrap;
-            text-overflow: ellipsis;
+            @extend .entity-badge__badge--blue;
         }
     }
 

app/assets/styles/content/leftbar/entitybanner.scss

@@ -51,6 +51,7 @@
         display: block;
         margin: auto;
         margin-bottom: 5px;
+        position: relative;
     }
     &__img {
         width: 100%;
@@ -75,6 +76,11 @@
         font-family: $fontcuprum;
     }
 
+    &__badge {
+        left: -14px;
+        bottom: 7px;
+    }
+
     &__item:hover {
         border-color: #d2dee9;
     }

app/www/css/all.css

@@ -488,6 +488,83 @@ body {
   display: block;
   margin-right: 20px; }
 
+.entity-badge__badge {
+  position: absolute;
+  bottom: 0;
+  left: -10px;
+  height: 36px;
+  line-height: 30px;
+  padding-right: 8px;
+  max-width: calc(100% - 18px);
+  text-overflow: ellipsis;
+  color: #fff;
+  background-image: url(../img/specials/badge-middle.png);
+  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
+  font-size: 18px;
+}
+
+.entity-badge__badge:before {
+  position: absolute;
+  left: -8px;
+  top: 0;
+  content: '';
+  display: block;
+  height: 100%;
+  width: 8px;
+  background-image: url(../img/specials/badge-start.png);
+}
+
+.entity-badge__badge:after {
+  position: absolute;
+  right: -10px;
+  top: 0;
+  content: '';
+  display: block;
+  height: 100%;
+  width: 10px;
+  background-image: url(../img/specials/badge-end.png);
+}
+
+.entity-badge__badge--orange, .special-items__badge--specials {
+  background-position: 0 0;
+}
+
+.entity-badge__badge--orange:before, .special-items__badge--specials:before, .entity-badge__badge--orange:after, .special-items__badge--specials:after {
+  background-position: 0 0;
+}
+
+.entity-badge__badge--green, .special-items__badge--exhibition {
+  background-position: 0 -36px;
+}
+
+.entity-badge__badge--green:before, .special-items__badge--exhibition:before, .entity-badge__badge--green:after, .special-items__badge--exhibition:after {
+  background-position: 0 -36px;
+}
+
+.entity-badge__badge--gray, .special-items__badge--school {
+  background-position: 0 -72px;
+}
+
+.entity-badge__badge--gray:before, .special-items__badge--school:before, .entity-badge__badge--gray:after, .special-items__badge--school:after {
+  background-position: 0 -72px;
+}
+
+.entity-badge__badge--blue, .special-items__badge--conference {
+  background-position: 0 -108px;
+}
+
+.entity-badge__badge--blue:before, .special-items__badge--conference:before, .entity-badge__badge--blue:after, .special-items__badge--conference:after {
+  background-position: 0 -108px;
+}
+
+.entity-badge__badge-text {
+  overflow: hidden;
+  width: 100%;
+  display: block;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
 .header {
   background: #3b434d;
   display: -webkit-flex;
@@ -1077,7 +1154,9 @@ body {
   .entitybanner__imgcase {
     display: block;
     margin: auto;
-    margin-bottom: 5px; }
+    margin-bottom: 5px;
+    position: relative;
+  }
   .entitybanner__img {
     width: 100%;
     max-width: 200px;
@@ -1098,6 +1177,11 @@ body {
     align-items: center;
     align-content: center;
     font-family: "cuprum", Impact, "Charcoal CY", sans-serif; }
+
+.entitybanner__badge {
+  left: -14px;
+  bottom: 7px;
+}
   .entitybanner__item:hover {
     border-color: #d2dee9; }
   .entitybanner__item:hover .entitybanner__address {
@@ -2275,60 +2359,6 @@ body {
   .special-items__title--conference {
     background-color: #5597d1; }
 
-.special-items__badge {
-  position: absolute;
-  bottom: 0;
-  left: -10px;
-  height: 36px;
-  line-height: 30px;
-  padding-right: 8px;
-  max-width: calc(100% - 18px);
-  text-overflow: ellipsis;
-  color: #fff;
-  background-image: url(../img/specials/badge-middle.png);
-  font-family: "cuprum", Impact, "Charcoal CY", sans-serif;
-  font-size: 18px; }
-  .special-items__badge:before {
-    position: absolute;
-    left: -8px;
-    top: 0;
-    content: '';
-    display: block;
-    height: 100%;
-    width: 8px;
-    background-image: url(../img/specials/badge-start.png); }
-  .special-items__badge:after {
-    position: absolute;
-    right: -10px;
-    top: 0;
-    content: '';
-    display: block;
-    height: 100%;
-    width: 10px;
-    background-image: url(../img/specials/badge-end.png); }
-  .special-items__badge--specials {
-    background-position: 0 0; }
-    .special-items__badge--specials:before, .special-items__badge--specials:after {
-      background-position: 0 0; }
-  .special-items__badge--exhibition {
-    background-position: 0 -36px; }
-    .special-items__badge--exhibition:before, .special-items__badge--exhibition:after {
-      background-position: 0 -36px; }
-  .special-items__badge--school {
-    background-position: 0 -72px; }
-    .special-items__badge--school:before, .special-items__badge--school:after {
-      background-position: 0 -72px; }
-  .special-items__badge--conference {
-    background-position: 0 -108px; }
-    .special-items__badge--conference:before, .special-items__badge--conference:after {
-      background-position: 0 -108px; }
-  .special-items__badge-text {
-    overflow: hidden;
-    width: 100%;
-    display: block;
-    white-space: nowrap;
-    text-overflow: ellipsis; }
-
 .special-items__item-content {
   padding: 10px;
   display: block; }