Merge remote-tracking branch 'origin/master'

Timur Kastemirov
2 parents 06d7e2cd c8825391
Showing 2 changed files with 42 additions and 7 deletions Show diff stats
common/models/Carousel.php
frontend/web/css/main.css
@@ -47,7 +47,7 @@ class Carousel extends \yii\bootstrap\Widget
      * @var boolean
      * If false carousel indicators (<ol> tag with anchors to items) should not be displayed.
      */
-    public $showIndicators = false;
+    public $showIndicators = true;
     /**
      * @var array list of slides in the carousel. Each array element represents a single
      * slide with the following structure:
@@ -105,7 +105,7 @@ class Carousel extends \yii\bootstrap\Widget
             if ($i === 0) {
                 \yii\bootstrap\Html::addCssClass($options, 'active');
             }
-            $indicators[] = Html::tag('li', '', $options);
+            $indicators[] = \yii\bootstrap\Html::tag('li', '', $options);
         }
  
         return \yii\bootstrap\Html::tag('ol', implode("\n", $indicators), ['class' => 'carousel-indicators']);
@@ -479,13 +479,22 @@ section.bar.background-gray.steps-pre:before {
     background-color: #467fbf;
     color: #eeeeee!important;
 }
-.object-slider{padding-bottom: 40px;}
+.object-slider .carousel-inner{
+    border-radius: 5px;
+    overflow: hidden;
+}
+.object-slider{padding-bottom: 50px;}
 .object-slider .carousel{
     width:100%;
     height:550px;
     max-height:550px;
     border-radius: 5px;
-    overflow: hidden;
+}
+.object-slider .carousel-indicators{
+    bottom: -40px;
+    margin: 0;
+    left: 0;
+    width: 100%;
 }
 .object-slider .carousel .carousel-inner, .object-slider .carousel .carousel-inner .item{width:100%;height:100%;}
 .object-slider a.carousel-control {
@@ -531,6 +540,25 @@ section.bar.background-gray.steps-pre:before {
 #calculate-form .text-center img{
     margin: 0 auto;
 }
+.main-slider .carousel-indicators{display:none!important;}
+.object-slider .carousel-indicators li{
+    width: 12px;
+    height: 12px;
+    border-radius:50%;
+    background-color: #869791;
+    border-color: #869791;
+    margin: 5px 7px;
+}
+.object-slider .carousel-indicators .active, .object-slider .carousel-indicators li:hover {
+    width: 12px;
+    height: 12px;
+    background-color: #467fbf;
+    border-color: #467fbf;
+}
+/*отображать только 4 элемента в портфолио*/
+.portfolio > div:nth-child(1n+6) {
+    display: none;
+}
  
 @media(min-width:1200px){
     .main-slider {
@@ -620,10 +648,15 @@ section.bar.background-gray.steps-pre:before {
     .main-slider .carousel-control{font-size:10vw;width:10%;}
 }
 @media(min-width:870px){
-    .modal-dialog {
+    #calculate-modal .modal-dialog {
         width: 830px;
     }
 }
+@media screen and (min-width: 768px){
+    .carousel-indicators {
+        bottom: -40px;
+    }
+}
 @media(max-width:768px){
     .main_video_fb{
         padding-top: 56.1%;
@@ -637,10 +670,12 @@ section.bar.background-gray.steps-pre:before {
         width: 100%;
         max-height: 400px;
         border-radius: 0px;
-        overflow: hidden;
         padding-top: 60%;
         height:0;
     }
+    .object-slider .carousel-inner {
+        border-radius: 0px;
+    }
     .object-slider .carousel .carousel-inner{
         position:absolute;top:0;left:0;
     }
@@ -761,7 +796,7 @@ section.bar.background-gray.steps-pre:before {
         position: absolute;
         left: 112px;
         font-size: 3vw;
-        line-height: 2.5vh;
+        line-height: 125%;
     }
 }
 @media(max-width:280px) {