work in progress

customize.dist/src/less2/pages/page-index.less

@@ -13,6 +13,7 @@
     color: #FFF;
     background: linear-gradient( @background_darker, @background_lighter ), url('/customize/bg14.jpg');
     background-size: cover;
+    min-height: 100vh;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
@@ -84,6 +85,7 @@
             font-size: 1.6rem;
         }
     }
+<<<<<<< HEAD
     img {
         height: 5vh;
         margin-top: -4px;
@@ -93,6 +95,11 @@
             transform: none;
         }
     };
+=======
+    a.cp-logo {
+        display: none;
+    }
+>>>>>>> ae176b0465121f57e2147ed0c80c9e62ce65c3a5
 }
 @callout-padding: 15px;
 a:hover {
@@ -213,10 +220,14 @@ h4 {
     .navbar-nav a {
         text-align: right !important;
     }
+<<<<<<< HEAD
     .cp-right .cp-login-btn {
         padding: 0.5em;
     }
 }
 .collapsing a {
     text-align: right !important;
-}
+}
+=======
+}
+>>>>>>> ae176b0465121f57e2147ed0c80c9e62ce65c3a5