Browse Source

fix conflict

Tanya Sashyna 5 years ago
parent
commit
778fb5b316
1 changed files with 0 additions and 47 deletions
  1. 0 47
      src/conteiners/home/home.scss

+ 0 - 47
src/conteiners/home/home.scss

@@ -7,23 +7,6 @@
     display: flex;
     align-items: center;
 
-<<<<<<< HEAD
-    &-wrap {
-    }
-
-    &-logo {
-        position: relative;
-        z-index: 4;
-
-        @media (min-width: 992px) {
-            display: flex;
-            align-content: center;
-            margin-bottom: 30px;
-        }
-
-        img {
-            max-width: 250px;
-=======
     &-logo {
         position: relative;
         z-index: 4;
@@ -34,26 +17,12 @@
         img {
             max-width: 300px;
             width: 100%;
->>>>>>> b626d87502528699ccdaa8292687f59a95c9d386
         }
 
         h3 {
             display: flex;
             flex-direction: column;
             justify-content: center;
-<<<<<<< HEAD
-            padding-left: 50px;
-            padding-top: 15px;
-            font-size: 6rem;
-            text-transform: uppercase;
-            color: $color-white;
-            font-weight: $bold;
-            line-height: 1;
-
-            span {
-                display: block;
-                font-size: 10rem;
-=======
             padding-left: 60px;
             font-size: 9rem;
             font-weight: $bold;
@@ -66,18 +35,13 @@
             span {
                 display: block;
                 font-size: 11rem;
->>>>>>> b626d87502528699ccdaa8292687f59a95c9d386
             }
         }
     }
 
     h1 {
-<<<<<<< HEAD
-        font-size: 4rem;
-=======
         font-size: 5rem;
         font-weight: $bold;
->>>>>>> b626d87502528699ccdaa8292687f59a95c9d386
         color: $color-white;
         position: relative;
         z-index: 4;
@@ -127,20 +91,9 @@
 }
 
 .home {
-<<<<<<< HEAD
-    &.events {
-        padding-top: 60px;
-        background-image: url('../../assets/img/girl-bg.jpg');
-    }
-
-    .event-content {
-        min-height: 180px;
-    }
-=======
     padding-top: 60px;
 
     &.events {
         background-image: url('../../assets/img/girl-bg.jpg');
     }
->>>>>>> b626d87502528699ccdaa8292687f59a95c9d386
 }