Fix merge conflicts

HackBerkeley · Mar 12, 2017 · a1b44c4 · a1b44c4
2 parents 41dfe83 + 4f1d6ee
commit a1b44c4
Show file tree

Hide file tree

Showing 30 changed files with 36 additions and 3,694 deletions.
diff --git a/css/style.css b/css/style.css
@@ -70,6 +70,10 @@ a:hover, a:focus, a:active {
   margin-bottom: 15px;
 }
 
+body {
+  background-color: #fdfdfd;
+}
+
 /* Buttons */
 
 i {
@@ -108,32 +112,34 @@ i:hover {
   height: 700px;
   position: relative;
   padding: 200px 60px 0px 60px;
-  background-color: #5DCCCB;
 }
 
 .home-title {
   font-family: Phenomena, Helvetica, Arial,  sans-serif;
-  font-size:74px;
+  font-size: 100px;
   color: #5DCCCB;
   line-height: 72px;
 }
 
-.home-sub-title{
-    font-size: 36px;
-    color: #5DCCCB;
+.home-sub-title {
+  font-size: 36px;
+  color: #FFD454;
+  margin-top: -35px;
+  margin-bottom: 50px;
 }
 
-.home-info{
-    margin-top: 20px;
-    font-size: 23px;
+.home-info {
+  margin-top: 10px;
+  font-size: 28px;
 }
 
-.home-button{
-    font-family: Phenomena, Helvetica, Arial,  sans-serif;
-    font-size:24px;
-    color: #FFD454;
-    line-height: 72px;
-    text-transform: uppercase;
+.home-apply-button {
+  font-family: Phenomena, Helvetica, Arial,  sans-serif;
+  font-size: 36px;
+  color: #FFD454;
+  line-height: 72px;
+  text-transform: uppercase;
+  /* more button stuff*/
 }
 
 /* About */
@@ -211,7 +217,8 @@ i:hover {
   width: 75px;
 }
 
-/*** NAVBAR ***/
+/* Navbar */
+
 .navbar-nav li a, .navbar-header a {
   line-height: 61px;
   font-size: 16px;
@@ -220,4 +227,5 @@ i:hover {
 .navbar {
   background-color: #ffffff;
   border: 0;
+  box-shadow: 0px 0px 10px #ddd;
 }
diff --git a/fonts/font-awesome/less/animated.less b/fonts/font-awesome/less/animated.less
diff --git a/fonts/font-awesome/less/bordered-pulled.less b/fonts/font-awesome/less/bordered-pulled.less
diff --git a/fonts/font-awesome/less/core.less b/fonts/font-awesome/less/core.less
diff --git a/fonts/font-awesome/less/fixed-width.less b/fonts/font-awesome/less/fixed-width.less
diff --git a/fonts/font-awesome/less/font-awesome.less b/fonts/font-awesome/less/font-awesome.less