浏览代码

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

Alexander Larkin 8 年之前
父节点
当前提交
abf3d2765f
共有 4 个文件被更改,包括 14 次插入9 次删除
  1. 9 6
      app/assets/styles/_grid.scss
  2. 5 3
      app/www/css/all.css
  3. 0 0
      app/www/css/all.css.map
  4. 0 0
      app/www/css/all.min.css

+ 9 - 6
app/assets/styles/_grid.scss

@@ -157,25 +157,28 @@
                 display: block;
             }
             &:last-child,
-            & div:last-child {
+            & div:last-child,
+            & .grid-disrb-col-1:nth-child(3n),
+            & .grid-disrb-col-2:nth-child(2n) {
                 margin: 0;
             }
         }
         &-col {
+            $gutterSize: 10px;
             &-1 {
-                width: 33.333333%;
+                width: calc(33.333333% - #{$gutterSize});
                 max-width: 230px;
-                margin: 0 10px 0 0;
+                margin: 0 #{$gutterSize} 0 0;
             }
             &-2 {
-                width: 66.66666%;
+                width: calc(66.66666% - #{$gutterSize});
                 max-width: 470px;
-                margin: 0 10px 0 0;
+                margin: 0 #{$gutterSize} 0 0;
             }
             &-3 {
                 width: 100%;
                 max-width: 710px;
-                margin: 0 10px 0 0;
+                margin: 0 #{$gutterSize} 0 0;
 
                 @media screen and (max-width: 1220px) {
                     width: 100%;

+ 5 - 3
app/www/css/all.css

@@ -381,16 +381,18 @@ body {
   .grid-disrb-row img {
     display: block; }
   .grid-disrb-row:last-child,
-  .grid-disrb-row div:last-child {
+  .grid-disrb-row div:last-child,
+  .grid-disrb-row .grid-disrb-col-1:nth-child(3n),
+  .grid-disrb-row .grid-disrb-col-2:nth-child(2n) {
     margin: 0; }
 
 .grid-disrb-col-1 {
-  width: 33.333333%;
+    width: calc(33.333333% - 10px);
   max-width: 230px;
   margin: 0 10px 0 0; }
 
 .grid-disrb-col-2 {
-  width: 66.66666%;
+    width: calc(66.66666% - 10px);
   max-width: 470px;
   margin: 0 10px 0 0; }
 

文件差异内容过多而无法显示
+ 0 - 0
app/www/css/all.css.map


文件差异内容过多而无法显示
+ 0 - 0
app/www/css/all.min.css


部分文件因为文件数量过多而无法显示