Yarik / vitex

Commit 579fb4040eeef96c190b6ec5c1b26e4ea3142aa8

Authored by Yarik
2 parents ead75389 97861a0a

Merge remote-tracking branch 'origin/master'

Showing 3 changed files with 36 additions and 31 deletions   Show diff stats
Inline Side-by-side
frontend/views/project/_list_item.php
  Show/Hide comments   View file @579fb40
... ... @@ -36,7 +36,7 @@
36 36 }
37 37 ?>
38 38 </div>
39   - <div class="new_article-img">
  39 +<!-- <div class="new_article-img">-->
40 40 <div class="brand-list-desc-txt">
41 41 <?php
42 42 echo $model->lang->description_preview?:$model->lang->description;
... ... @@ -50,28 +50,28 @@
50 50 ?>
51 51 </p>
52 52 </div>
53   - </div>
  53 +<!-- </div>-->
54 54 <?php
55   - if(!empty( $model->images ) && count($model->images) > 1) {
56   - $images = array_slice($model->images, 1);
57   - ?>
58   - <div class="galery-obj-img col-xs-12 col-sm-12">
59   - <a href="<?= Url::to([
60   - 'project/view',
61   - 'id' => $model->project_id,
62   - ]); ?>">
63   - <!----размер картинок макс ширина 165, макс высота 100--->
64   - <?php
65   - foreach($images as $img) {
66   - /**
67   - * @var ProjectImage $img
68   - */
69   - echo ArtboxImageHelper::getImage($img->getImageUrl(), 'project_list');
70   - }
71   - ?>
72   - </a>
73   - </div>
  55 +// if(!empty( $model->images ) && count($model->images) > 1) {
  56 +// $images = array_slice($model->images, 1);
  57 +// ?>
  58 +<!-- <div class="galery-obj-img col-xs-12 col-sm-12">-->
  59 +<!-- <a href="--><?//= Url::to([
  60 +// 'project/view',
  61 +// 'id' => $model->project_id,
  62 +// ]); ?><!--">-->
  63 +<!-- <!----размер картинок макс ширина 165, макс высота 100--->
  64 +<!-- --><?php
  65 +// foreach($images as $img) {
  66 +// /**
  67 +// * @var ProjectImage $img
  68 +// */
  69 +// echo ArtboxImageHelper::getImage($img->getImageUrl(), 'project_list');
  70 +// }
  71 +// ?>
  72 +<!-- </a>-->
  73 +<!-- </div>-->
74 74 <?php
75   - }
  75 +// }
76 76 ?>
77 77 </div>
78 78 \ No newline at end of file
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @579fb40
... ... @@ -703,9 +703,9 @@ ul.main-menu li:first-child ul li a:before {display: none;}
703 703 }
704 704 .xs-sm-menu ul.main-menu li ul li {
705 705 background: #8b8d90;
706   - height: 36px;
  706 + height: auto;
707 707 border-bottom: 1px solid #fff;
708   - padding-left: 20px;
  708 + padding-left: 8px 0 8px 20px;
709 709 }
710 710 .xs-sm-menu ul.main-menu li:hover ul li {border-top: 0}
711 711 .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 {
2191 2191  
2192 2192 /***all***/
2193 2193 .new_article-img {
2194   - width: 50%;
  2194 + width: 35%;
2195 2195 float: left;
2196 2196 margin-right: 15px;
2197 2197 padding-right: 15px;
... ... @@ -5386,4 +5386,7 @@ body:not(.lg-from-hash) .lg-outer.lg-start-zoom .lg-item.lg-complete .lg-object
5386 5386 -moz-transition: left 1s cubic-bezier(0, 0, 0.25, 1) 0s, opacity 0.1s ease 0s;
5387 5387 -o-transition: left 1s cubic-bezier(0, 0, 0.25, 1) 0s, opacity 0.1s ease 0s;
5388 5388 transition: left 1s cubic-bezier(0, 0, 0.25, 1) 0s, opacity 0.1s ease 0s;
5389   -}
5390 5389 \ No newline at end of file
  5390 +}
  5391 +
  5392 +.new_articles_data-title {margin-top:23px;}
  5393 +.new_articles-wr .row:first-child .new_articles_data-title {margin-top:51px;}
5391 5394 \ No newline at end of file
... ...
frontend/web/css/style.min.css
  Show/Hide comments   View file @579fb40
... ... @@ -322,7 +322,6 @@ ul.main-menu {
322 322 float: left;
323 323 padding-left: 40px;
324 324 border-bottom: 2px solid #939598;
325   - display: flex;
326 325 }
327 326  
328 327 ul.main-menu li {
... ... @@ -850,9 +849,9 @@ ul.main-menu li ul li a {
850 849  
851 850 .xs-sm-menu ul.main-menu li ul li {
852 851 background: #8b8d90;
853   - height: 36px;
  852 + height: auto;
854 853 border-bottom: 1px solid #fff;
855   - padding-left: 20px
  854 + padding:8px 0 8px 20px;
856 855 }
857 856  
858 857 .xs-sm-menu ul.main-menu li:hover ul li {
... ... @@ -2610,7 +2609,7 @@ ul.breadcrumb li a {
2610 2609 }
2611 2610  
2612 2611 .new_article-img {
2613   - width: 50%;
  2612 + width: 35%;
2614 2613 float: left;
2615 2614 padding-right: 15px;
2616 2615 margin-bottom: 10px
... ... @@ -5594,4 +5593,7 @@ body:not(.lg-from-hash) .lg-outer.lg-start-zoom .lg-item.lg-complete .lg-object
5594 5593 -moz-transition: left 1s cubic-bezier(0, 0, .25, 1) 0s, opacity .1s ease 0s;
5595 5594 -o-transition: left 1s cubic-bezier(0, 0, .25, 1) 0s, opacity .1s ease 0s;
5596 5595 transition: left 1s cubic-bezier(0, 0, .25, 1) 0s, opacity .1s ease 0s
5597   -}
5598 5596 \ No newline at end of file
  5597 +}
  5598 +
  5599 +.new_articles_data-title {margin-top:23px;}
  5600 +.new_articles-wr .row:first-child .new_articles_data-title {margin-top:51px;}
5599 5601 \ No newline at end of file
... ...