Merge remote-tracking branch 'origin/master'

Yarik
2 parents ead75389 97861a0a
Showing 3 changed files with 36 additions and 31 deletions Show diff stats
frontend/views/project/_list_item.php
frontend/web/css/style.css
frontend/web/css/style.min.css
@@ -36,7 +36,7 @@
             }
         ?>
     </div>
-    <div class="new_article-img">
+<!--    <div class="new_article-img">-->
         <div class="brand-list-desc-txt">
             <?php
                 echo $model->lang->description_preview?:$model->lang->description;
@@ -50,28 +50,28 @@
                 ?>
             </p>
         </div>
-    </div>
+<!--    </div>-->
     <?php
-        if(!empty( $model->images ) && count($model->images) > 1) {
-            $images = array_slice($model->images, 1);
-            ?>
-            <div class="galery-obj-img col-xs-12 col-sm-12">
-                <a href="<?= Url::to([
-                    'project/view',
-                    'id' => $model->project_id,
-                ]); ?>">
-                    <!----размер картинок макс ширина 165, макс высота 100--->
-                    <?php
-                        foreach($images as $img) {
-                            /**
-                             * @var ProjectImage $img
-                             */
-                            echo ArtboxImageHelper::getImage($img->getImageUrl(), 'project_list');
-                        }
-                    ?>
-                </a>
-            </div>
+//        if(!empty( $model->images ) && count($model->images) > 1) {
+//            $images = array_slice($model->images, 1);
+//            ?>
+<!--            <div class="galery-obj-img col-xs-12 col-sm-12">-->
+<!--                <a href="--><?//= Url::to([
+//                    'project/view',
+//                    'id' => $model->project_id,
+//                ]); ?><!--">-->
+<!--                    <!----размер картинок макс ширина 165, макс высота 100--->
+<!--                    --><?php
+//                        foreach($images as $img) {
+//                            /**
+//                             * @var ProjectImage $img
+//                             */
+//                            echo ArtboxImageHelper::getImage($img->getImageUrl(), 'project_list');
+//                        }
+//                    ?>
+<!--                </a>-->
+<!--            </div>-->
             <?php
-        }
+//        }
     ?>
 </div>
 \ No newline at end of file
@@ -703,9 +703,9 @@ ul.main-menu li:first-child ul li a:before {display: none;}
 }
 .xs-sm-menu ul.main-menu li ul li {
     background: #8b8d90;
-    height: 36px;
+    height: auto;
     border-bottom: 1px solid #fff;
-    padding-left: 20px;
+    padding-left: 8px 0 8px 20px;
 }
 .xs-sm-menu ul.main-menu li:hover ul li {border-top: 0}
 .xs-sm-menu ul.main-menu li ul li a, .xs-sm-menu ul.main-menu li ul li:hover a {
@@ -2191,7 +2191,7 @@ ul.breadcrumb li a {
 /***all***/
 .new_article-img {
-    width: 50%;
+    width: 35%;
     float: left;
     margin-right: 15px;
     padding-right: 15px;
@@ -5386,4 +5386,7 @@ body:not(.lg-from-hash) .lg-outer.lg-start-zoom .lg-item.lg-complete .lg-object 
     -moz-transition: left 1s cubic-bezier(0, 0, 0.25, 1) 0s, opacity 0.1s ease 0s;
     -o-transition: left 1s cubic-bezier(0, 0, 0.25, 1) 0s, opacity 0.1s ease 0s;
     transition: left 1s cubic-bezier(0, 0, 0.25, 1) 0s, opacity 0.1s ease 0s;
-}
 \ No newline at end of file
+}
+
+.new_articles_data-title {margin-top:23px;}
+.new_articles-wr .row:first-child .new_articles_data-title {margin-top:51px;}
 \ No newline at end of file
@@ -322,7 +322,6 @@ ul.main-menu {
     float: left;
     padding-left: 40px;
     border-bottom: 2px solid #939598;
-    display: flex;
 }
 ul.main-menu li {
@@ -850,9 +849,9 @@ ul.main-menu li ul li a {
 .xs-sm-menu ul.main-menu li ul li {
     background: #8b8d90;
-    height: 36px;
+    height: auto;
     border-bottom: 1px solid #fff;
-    padding-left: 20px
+    padding:8px 0 8px 20px;
 }
 .xs-sm-menu ul.main-menu li:hover ul li {
@@ -2610,7 +2609,7 @@ ul.breadcrumb li a {
 }
 .new_article-img {
-    width: 50%;
+    width: 35%;
     float: left;
     padding-right: 15px;
     margin-bottom: 10px
@@ -5594,4 +5593,7 @@ body:not(.lg-from-hash) .lg-outer.lg-start-zoom .lg-item.lg-complete .lg-object 
     -moz-transition: left 1s cubic-bezier(0, 0, .25, 1) 0s, opacity .1s ease 0s;
     -o-transition: left 1s cubic-bezier(0, 0, .25, 1) 0s, opacity .1s ease 0s;
     transition: left 1s cubic-bezier(0, 0, .25, 1) 0s, opacity .1s ease 0s
-}
 \ No newline at end of file
+}
+
+.new_articles_data-title {margin-top:23px;}
+.new_articles-wr .row:first-child .new_articles_data-title {margin-top:51px;}
 \ No newline at end of file