Merge remote-tracking branch 'origin/master'

Timur Kastemirov
2 parents 1729300e 8511f367
Showing 2 changed files with 61 additions and 1 deletions Show diff stats
frontend/views/object/view.php
frontend/web/css/main.css
@@ -105,7 +105,7 @@
                                             ]
                                         ) ?>"
                                     >
-                                        Фото в портфолио
+                                        (название объекта)
                                     </a>
                                 </h3>
                             </div>
@@ -474,6 +474,49 @@ section.bar.background-gray.steps-pre:before {
     margin-bottom: 20px;}
 .post-blog .lead{margin-top: 25px;}
 .post-blog .content{margin-bottom: 50px;}
+
+.object-slider{padding-bottom: 40px;}
+.object-slider .carousel{
+    width:100%;
+    height:550px;
+    max-height:550px;
+    border-radius: 5px;
+    overflow: hidden;
+}
+.object-slider .carousel .carousel-inner, .object-slider .carousel .carousel-inner .item{width:100%;height:100%;}
+.object-slider a.carousel-control {
+    width: 30px;
+    height: 30px;
+    background-color: #ffffff;
+    color: black;
+    text-align: center;
+    line-height: 29px;
+    padding-right: 2px;
+    border-radius: 50%;
+    position: absolute;
+    left: initial;
+    opacity: 1;
+    background-image: none;
+}
+.object-slider a.left.carousel-control{
+    top: 20px;
+    right: 75px;
+}
+.object-slider a.right.carousel-control{
+    top: 20px;
+    right: 35px;
+    padding-right: 0;
+    padding-left: 2px;
+}
+.object-slider a.carousel-control:hover {
+    opacity: 0.5;
+}
+.object-slider a.carousel-control:active {
+    opacity: 0.8;
+    line-height: 24px;
+    margin-top: 3px;
+}
+
 @media(min-width:992px) and (max-width:1199px){
     .pr_cover {
         max-width: 320px;
@@ -498,6 +541,7 @@ section.bar.background-gray.steps-pre:before {
         padding: 30% 21% 13px 11px;
         line-height: 16px;
     }
+    .object-slider .carousel{height:500px;}
 }
 @media(max-width:991px){
     #footer .container > div {
@@ -548,12 +592,28 @@ section.bar.background-gray.steps-pre:before {
         position: absolute;
         top: 0;
     }
+    .object-slider .carousel{height:450px;}
 }
 @media(max-width:768px){
     .main_video_fb{
         padding-top: 56.1%;
     }
+    .object-slider{
+        margin-left: -15px;
+        margin-right: -15px;
+    }
     .main-slider{max-height:550px;}
+    .object-slider .carousel {
+        width: 100%;
+        max-height: 400px;
+        border-radius: 0px;
+        overflow: hidden;
+        padding-top: 60%;
+        height:0;
+    }
+    .object-slider .carousel .carousel-inner{
+        position:absolute;top:0;left:0;
+    }
 }
 @media(min-width:768px){
     .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus{