Преглед изворни кода

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

anatoly пре 6 година
родитељ
комит
6ec873f2eb

+ 22 - 8
src/files/css/main.css

@@ -6867,7 +6867,7 @@ header .menu-mobile ul li a:hover {
   width: 80%; }
 
 /*.main-container .content{
-	padding-right: 0;
+	padding-right: 0; 
 }*/
 .content-left {
   padding-right: 0; }
@@ -8926,6 +8926,9 @@ img {
   flex-direction: column;
   border-radius: 10px 0 0 0 / 10px 0 0 0;
   margin-bottom: 10px; }
+  @media (max-width: 1200px) {
+    .shortnews__item {
+      height: auto; } }
   .shortnews__item--half-size {
     width: calc(50% - 10px);
     margin-left: 10px; }
@@ -8994,6 +8997,9 @@ img {
   overflow: hidden;
   text-overflow: ellipsis;
   margin: 0; }
+  @media (max-width: 1200px) {
+    .shortnews__description {
+      height: auto; } }
 .shortnews__details {
   display: -webkit-flex;
   display: -ms-flex;
@@ -9109,7 +9115,7 @@ img {
   flex-direction: column;
   flex-grow: 0;
   flex-shrink: 0;
-  flex-basis: 0;
+  flex-basis: calc(50% - 10px);
   min-width: 200px;
   justify-content: space-between;
   color: #000000;
@@ -9189,8 +9195,8 @@ img {
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
-  height: 40px;
-  padding: 5px 20px;
+  min-height: 40px;
+  padding: 5px 10px;
   text-align: center;
   box-sizing: border-box; }
 .special-items__organization-address {
@@ -10126,7 +10132,7 @@ img {
     height: 90px;
     width: 49%;
     margin-bottom: 10px;
-    background: #d7d7d7;
+    background: #929292;
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
@@ -10756,7 +10762,7 @@ img {
     background: url(../img/blockslide_sprite.png) no-repeat;
     transform: rotate(180deg); }
     .organization-info__slidedown-handler.active {
-      transform: rotate(0); }
+      transform: rotate(0deg); }
 .organization-info__administration-content {
   padding-left: 10px; }
 .organization-info__sub-organizations-header {
@@ -10926,6 +10932,14 @@ img {
       .grid-dis-col-66:last-child {
         margin-right: 0; } }
 
+.banners {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between; }
+  .banners .banner-anons {
+    width: calc(50% - 15px);
+    margin-bottom: 20px; }
+
 @media (min-width: 992px) {
   .left-side {
     padding-right: 20px; }
@@ -10973,13 +10987,13 @@ img {
     padding-bottom: 420px; }
 
   .left-side {
-    width: 27% !important; }
+    width: 30% !important; }
 
   .content-a-lot {
     padding-right: 0; }
 
   .main-container .col-lg-10 {
-    width: 73% !important; }
+    width: 70% !important; }
 
   header .burger {
     display: block; }

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
src/files/css/main.css.map


+ 10 - 0
src/files/scss/_banners.scss

@@ -0,0 +1,10 @@
+.banners {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .banner-anons {
+        width: calc(50% - 15px);
+        margin-bottom: 20px;
+    }
+}

+ 1 - 1
src/files/scss/_flat-links.scss

@@ -15,7 +15,7 @@ $flatLinksClass: '.flat-links';
         height: 90px;
         width: 49%;
         margin-bottom: 10px;
-        background: #d7d7d7;
+        background: #929292;
         display: flex;
         flex-direction: row;
         justify-content: flex-start;

+ 1 - 1
src/files/scss/main.scss

@@ -26,7 +26,7 @@
 @import "header-search";
 @import "search";
 @import "organization-worktime";
-
+@import "banners";
 
 @import "media-overrides";
 

Неке датотеке нису приказане због велике количине промена