removed some slides

C0DDER · Sep 17, 2019 · cd19c6f · cd19c6f
1 parent a7add2e
commit cd19c6f
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 25 deletions.
diff --git a/Boncreabel.fig b/Boncreabel.fig
diff --git a/css/style.css b/css/style.css
@@ -123,17 +123,23 @@ header h1 {
 
 .slides_counter li {
   transition: font-size 0.6s ease;
+  user-select: none;
 }
 
 .active_slide {
   font-size: 36px;
   color: white;
 }
 
+.active_description {
+  flex-direction: column;
+}
+
 .mainSlide {
   font-family: 'Exo2', sans-serif;
   position: relative;
   height: 100%;
+  width: 100%;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -259,14 +265,15 @@ canvas {
 
 .service {
   border: 2px solid #fff;
-  border-left: none;
   width: 400px;
   height: 196px;
   display: flex;
   align-items: center;
 }
 
 .service p {
+  background-color: #2b2b2b;
+  padding: 10px 0;
   margin-left: -25px;
   font-size: 36px;
   color: #E2F27D;
@@ -341,6 +348,10 @@ canvas {
   align-items: center;
 }
 
+.contactLinksWrapper {
+  padding-right: 20px;
+}
+
 .contactLinksWrapper svg {
   margin-right: 20px;
 }

diff --git a/index.html b/index.html
@@ -49,9 +49,9 @@ <h1>Boncreabel</h1>
                                         <li class="slide_0 active_slide">01</li>
                                         <li class="slide_1">02</li>
                                         <li class="slide_2">03</li>
-                                        <li class="slide_3">04</li>
+                                        <!-- <li class="slide_3">04</li>
                                         <li class="slide_4">05</li>
-                                        <li class="slide_5">06</li>
+                                        <li class="slide_5">06</li> -->
                                 </ul>
                         </nav>
                         <div class="slide_content">

diff --git a/js/app.js b/js/app.js
@@ -41,31 +41,31 @@ let slideData = {
                 headColor: 'white',
                 className: '.mainSlide'
         },
+        // 1: {
+        //         bg_class: 'lightGray',
+        //         slideName: 'Портфолио',
+        //         headColor: 'black',
+        //         className: '.portfolio'
+        // },
         1: {
-                bg_class: 'lightGray',
-                slideName: 'Портфолио',
-                headColor: 'black',
-                className: '.portfolio'
-        },
-        2: {
                 bg_class: 'gray',
                 slideName: 'Услуги',
                 headColor: 'white',
                 className: '.services'
         },
-        3: {
-                bg_class: 'lightGray',
-                slideName: 'О студии',
-                headColor: 'black',
-                className: '.aboutUs'
-        },
-        4: {
-                bg_class: "gray",
-                slideName: 'Блог',
-                headColor: 'white',
-                className: '.blog'
-        },
-        5: {
+        // 3: {
+        //         bg_class: 'lightGray',
+        //         slideName: 'О студии',
+        //         headColor: 'black',
+        //         className: '.aboutUs'
+        // },
+        // 4: {
+        //         bg_class: "gray",
+        //         slideName: 'Блог',
+        //         headColor: 'white',
+        //         className: '.blog'
+        // },
+        2: {
                 bg_class: 'lightGray',
                 slideName: 'Контакты',
                 headColor: 'black',
@@ -129,7 +129,7 @@ const handleTouchMove = evt => {
 
         if (Math.abs(xDiff) < Math.abs(yDiff)) {
                 if (yDiff > 0) {
-                        if (bgId < 5) {
+                        if (bgId < 3) {
                                 let nextBg = bgId + 1;
                                 bgClass(nextBg, bgId);
                                 bg.id = nextBg;
@@ -155,7 +155,7 @@ document.querySelector('.fullpage').addEventListener("wheel", event => {
         let bgId = parseInt(bg.id);
         if (isAnimating) return;
         if (delta == 1) {
-                if (bgId < 5) {
+                if (bgId < 3) {
                         let nextBg = bgId + 1;
                         bgClass(nextBg, bgId);
                         bg.id = nextBg;
@@ -222,7 +222,7 @@ const listCount = document.querySelectorAll('.slides_counter li');
 
 listCount.forEach(el => {
         el.addEventListener('click', () => {
-                if (el.classList[1] != undefined) return;
+                if (el.classList[1] != undefined || isAnimating) return;
                 let current = document.querySelector('.fullpage')
                 bgClass(parseInt(el.classList[0][6]), parseInt(current.id))
                 current.id = parseInt(el.classList[0][6]);