Bladeren bron

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

anatoly 7 jaren geleden
bovenliggende
commit
e2273f6a9b

+ 74 - 65
src/files/css/main.css

@@ -6568,12 +6568,20 @@ button.close {
   .hidden-print {
     display: none !important; } }
 /*# sourceMappingURL=bootstrap.css.map */
+/*MAIN PAGE*/
 p a {
   text-decoration: underline; }
   p a:hover {
     text-decoration: none; }
 
-/*MAIN PAGE*/
+body {
+  font-family: "Open Sans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
+  min-height: 100vh;
+  position: relative;
+  padding-bottom: 333px; }
+  body footer {
+    bottom: 0; }
+
 header {
   position: fixed;
   /*height: 45px;*/
@@ -8708,6 +8716,48 @@ footer .copyright .logo {
 .pegi {
   max-width: 40px; }
 
+.go-top-link {
+  width: 33px;
+  height: 33px;
+  position: fixed;
+  bottom: 30px;
+  left: 30px;
+  display: none;
+  background: url("../img/go-top-icon.png");
+  cursor: pointer; }
+
+.slide-fancybox-video {
+  position: relative; }
+  .slide-fancybox-video:before {
+    display: block;
+    content: '';
+    position: absolute;
+    background: rgba(50, 4, 4, 0.8);
+    height: 50px;
+    width: 80px;
+    top: 50%;
+    left: 50%;
+    margin-left: -40px;
+    margin-top: -25px;
+    border-radius: 5px;
+    z-index: 2; }
+  .slide-fancybox-video:hover:before {
+    background: #bd0505; }
+  .slide-fancybox-video:after {
+    display: block;
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 0px;
+    height: 0px;
+    border-top: 15px solid transparent;
+    border-bottom: 15px solid transparent;
+    border-left: 30px solid #ffffff;
+    margin-left: -15px;
+    margin-top: -15px;
+    z-index: 3; }
+
 .text-page__text h2, .special-page__article h2, .full-news__text h2, .special-items__h2, .index-about h2 {
   font-family: "Cuprum", Impact, "Charcoal CY", sans-serif;
   font-size: 25px;
@@ -8784,6 +8834,7 @@ h7 {
   padding: 0;
   list-style-type: none; }
   .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;
@@ -8793,7 +8844,8 @@ h7 {
       content: counter(step-counter) ".";
       font-size: 15px;
       font-family: "Open Sans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
-      color: #929292;
+      color: #265e86;
+      font-weight: bold;
       padding-right: 5px; }
 
 .text-page__text table, .special-page__article table, .full-news__text table {
@@ -9353,6 +9405,19 @@ img {
       background: #004d7b;
       color: #fff; }
 
+.organization-info__map-container {
+  width: 700px;
+  max-width: 100%;
+  position: relative;
+  padding-top: 100%; }
+
+.organization-info__map {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0; }
+
 .pagination__container {
   margin: 20px 0;
   border-radius: 4px;
@@ -10429,6 +10494,9 @@ img {
   .contacts-container .important {
     width: 100%; } }
 @media (max-width: 992px) {
+  body {
+    padding-bottom: 420px; }
+
   .left-side {
     width: 27% !important; }
 
@@ -10815,74 +10883,15 @@ img {
     padding-top: 15px !important; }
 
   .container .importants-unit .important:nth-child(2) .description {
-    padding-left: 55px !important; } }
+    padding-left: 55px !important; }
+
+  body {
+    padding-bottom: 510px; } }
 @media (max-width: 991px) {
   .control-org .image {
     text-align: center; }
 
   .control-org .col-lg-4 {
     padding-right: 15px; } }
-body {
-  font-family: "Open Sans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif;
-  min-height: 100vh;
-  position: relative;
-  padding-bottom: 333px; }
-  body footer {
-    bottom: 0; }
-
-.organization-info__map-container {
-  width: 700px;
-  max-width: 100%;
-  position: relative;
-  padding-top: 100%; }
-
-.organization-info__map {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0; }
-
-.slide-fancybox-video {
-  position: relative; }
-  .slide-fancybox-video:before {
-    display: block;
-    content: '';
-    position: absolute;
-    background: rgba(50, 4, 4, 0.8);
-    height: 50px;
-    width: 80px;
-    top: 50%;
-    left: 50%;
-    margin-left: -40px;
-    margin-top: -25px;
-    border-radius: 5px;
-    z-index: 2; }
-  .slide-fancybox-video:hover:before {
-    background: #bd0505; }
-  .slide-fancybox-video:after {
-    display: block;
-    content: '';
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 0px;
-    height: 0px;
-    border-top: 15px solid transparent;
-    border-bottom: 15px solid transparent;
-    border-left: 30px solid #ffffff;
-    margin-left: -15px;
-    margin-top: -15px;
-    z-index: 3; }
-
-.go-top-link {
-  width: 33px;
-  height: 33px;
-  position: fixed;
-  bottom: 30px;
-  left: 30px;
-  display: none;
-  background: url("../img/go-top-icon.png");
-  cursor: pointer; }
 
 /*# sourceMappingURL=main.css.map */

File diff suppressed because it is too large
+ 0 - 0
src/files/css/main.css.map


+ 67 - 0
src/files/scss/_base-style.scss

@@ -1,5 +1,24 @@
 /*MAIN PAGE*/
 
+p {
+    a {
+        text-decoration: underline;
+        &:hover {
+            text-decoration: none;
+        }
+    }
+}
+
+body {
+    font-family: $fontopensans;
+    min-height: 100vh;
+    position: relative;
+    padding-bottom: 333px;
+
+    footer {
+        bottom: 0;
+    }
+}
 header {
     position: fixed;
     /*height: 45px;*/
@@ -2555,4 +2574,52 @@ footer .copyright .logo {
 
 .pegi {
     max-width: 40px;
+}
+
+.go-top-link {
+    width: 33px;
+    height: 33px;
+    position: fixed;
+    bottom: 30px;
+    left: 30px;
+    display: none;
+    background: url('../img/go-top-icon.png');
+    cursor: pointer;
+}
+
+
+.slide-fancybox-video {
+    position: relative;
+    &:before {
+        display: block;
+        content: '';
+        position: absolute;
+        background: rgba(50, 4, 4, 0.8);
+        height: 50px;
+        width: 80px;
+        top: 50%;
+        left: 50%;
+        margin-left: -40px;
+        margin-top: -25px;
+        border-radius: 5px;
+        z-index: 2;
+    }
+    &:hover:before {
+        background: #bd0505;
+    }
+    &:after {
+        display: block;
+        content: '';
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        width: 0px;
+        height: 0px;
+        border-top: 15px solid transparent;
+        border-bottom: 15px solid transparent;
+        border-left: 30px solid #ffffff;
+        margin-left: -15px;
+        margin-top: -15px;
+        z-index: 3;
+    }
 }

+ 6 - 1
src/files/scss/_media-overrides.scss

@@ -54,6 +54,9 @@
 }
 
 @media (max-width: 992px) {
+    body{
+        padding-bottom: 420px;
+    }
     .left-side {
         width: 27% !important;
     }
@@ -591,7 +594,9 @@
     .container .importants-unit .important:nth-child(2) .description {
         padding-left: 55px !important;
     }
-
+    body{
+        padding-bottom: 510px;
+    }
 }
 
 @media(max-width: 991px) {

+ 15 - 0
src/files/scss/_organization-list.scss

@@ -210,4 +210,19 @@
             }
         }
     }
+}
+
+.organization-info__map-container {
+    width: 700px;
+    max-width: 100%;
+    position: relative;
+    padding-top: 100%;
+}
+
+.organization-info__map {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
 }

+ 3 - 2
src/files/scss/_tags.scss

@@ -86,6 +86,7 @@ h7 {
     list-style-type: none;
 
     li {
+        margin: 10px 0;
         counter-increment: step-counter;
         font-size: 15px;
         font-family: $fontopensans;
@@ -96,8 +97,8 @@ h7 {
             content: counter(step-counter) ".";
             font-size: 15px;
             font-family: $fontopensans;
-            color: #929292;
-            //font-weight: bold;
+            color: #265e86;
+            font-weight: bold;
             padding-right: 5px;
         }
     }

+ 0 - 81
src/files/scss/main.scss

@@ -3,15 +3,6 @@
 @import "mixins";
 @import "bootstrap";
 
-p {
-    a {
-        text-decoration: underline;
-        &:hover {
-            text-decoration: none;
-        }
-    }
-}
-
 @import "base-style";
 @import "tags";
 @import "text-page";
@@ -37,75 +28,3 @@ p {
 
 @import "media-overrides";
 
-body {
-    font-family: $fontopensans;
-    min-height: 100vh;
-    position: relative;
-    padding-bottom: 333px;
-
-    footer {
-        bottom: 0;
-    }
-}
-
-.organization-info__map-container {
-    width: 700px;
-    max-width: 100%;
-    position: relative;
-    padding-top: 100%;
-}
-
-.organization-info__map {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-}
-
-.slide-fancybox-video {
-    position: relative;
-    &:before {
-        display: block;
-        content: '';
-        position: absolute;
-        background: rgba(50, 4, 4, 0.8);
-        height: 50px;
-        width: 80px;
-        top: 50%;
-        left: 50%;
-        margin-left: -40px;
-        margin-top: -25px;
-        border-radius: 5px;
-        z-index: 2;
-    }
-    &:hover:before {
-        background: #bd0505;
-    }
-    &:after {
-        display: block;
-        content: '';
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 0px;
-        height: 0px;
-        border-top: 15px solid transparent;
-        border-bottom: 15px solid transparent;
-        border-left: 30px solid #ffffff;
-        margin-left: -15px;
-        margin-top: -15px;
-        z-index: 3;
-    }
-}
-
-.go-top-link {
-    width: 33px;
-    height: 33px;
-    position: fixed;
-    bottom: 30px;
-    left: 30px;
-    display: none;
-    background: url('../img/go-top-icon.png');
-    cursor: pointer;
-}

Some files were not shown because too many files changed in this diff