Revert "Merge master and develop"

README.md

@@ -6,12 +6,10 @@ We are trying to create a medium where people who want to start with contributin
 
 [Website](http://opensourcehelpcommunity.herokuapp.com/) [WIP]
 
-After every commit, the `develop` branch on github is automatically deployed to [opensourcehelpcommunity-dev.herokuapp.com](http://opensourcehelpcommunity-dev.herokuapp.com/) and the `master` branch is automatically deployed [to opensourcehelpcommunity.herokuapp.com](http://opensourcehelpcommunity.herokuapp.com/) . All the development is done on `develop` branch and once we're ready for a new release we merge the `develop` branch with the `master` branch. Please submit your pull request based on `develop` branch.
 
 This is using [Django(1.11)](https://www.djangoproject.com/) and [Bootstrap](http://getbootstrap.com/).
 Feel free to suggest a better design.
 
-Please submit your pull request on develop branch, it will have the most recent changes.
 
 ## Installations
 Run

oshc/main/static/main/css/app.css

@@ -1,241 +1,65 @@
-/*   GLOBAL DEFINATIONS STARTS  */
-
-* {
-  padding: 0;
-  margin: 0;
-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  transition: opacity 0.7s ease-in-out;
-  font-family: "Montserrat", sans-serif
-}
-
 body {
-  overflow-x: hidden;
-  padding-top: 50px;
-}
-
-a {
-  cursor: pointer;
-  color: #0275d8;
-  text-decoration: none;
-}
-
-.line-gap-10px {
-  height: 10px;
-}
-
-
-/*   NAVBAR CSS STARTS  */
-
-.navbar {
-  margin-bottom: 0;
-}
-
-.navbar-inverse .navbar-brand {
-  color: #eee;
-}
-
-.navbar-inverse {
-  background-color: #24292e;
-}
-
-.navbar-inverse {
-  border-color: #24292e;
-}
-
-
-/*   SECTION ONE STARTS   */
-
-.main-section {
-  min-height: 70vh;
-  height: auto;
-  padding-top: 40px;
-  background: white;
-  background-color: white;
-  position: relative;
-  clear: both;
-}
-
-.logo-image {
-  width: 200px;
-  display: block;
-  margin-left: auto;
-  margin-right: auto
-}
-
-.jumbotron {
-  background-color: white;
-  word-wrap: break-word;
-  display: block;
-}
-
-.jumbotron h1 {
-  font-size: 60px;
-  color: #0275d8;
-}
-
-.jumbotron h4 {
-  color: #999;
-  font-size: 18px;
-  padding-top: 20px;
-}
-
-
-/*   SECTION TWO START   */
-
-.section-two {
-  height: auto;
-  padding: 70px 0;
-  background-color: #eee;
-  word-wrap: break-word;
-  display: block;
+  padding: 20px 0;
 }
 
-.section-two h3 {
-  font-size: 30px;
-  color: #444444;
+#logo {
+  width: 180px;
+  height: 180px;
 }
 
-.bi {
-  text-align: center;
-  font-style: italic;
-  padding: 10px 0;
-  font-size: 15px;
+.navbar ul {
+    margin-top: 5px;
 }
 
-.section-two .intro {
-  color: #666666;
-  font-size: 18px;
-  line-height: 35px;
-  text-align: justify;
+.navbar .navbar-brand {
+  color: #ED1B49;
+  font-size: 175%;
+  font-weight: 100;
 }
 
-
-/*   SECTION THREE START   */
-
-.section-three {
-  height: auto;
-  min-height: 500px;
-  padding: 40px 0;
-}
-
-.left-session-info {
-  padding: 30px 50px;
-}
-
-.sRegister {
-  color: white;
-  font-size: 15px;
-  background-color: #0275d8;
-  border-color: #0275d8;
-}
-
-.sRegister a {
-  color: white;
-  text-decoration: none;
-}
-
-.left-social-section {
-  padding: 0 50px;
-}
-
-
-/*   FOOTER CSS STARTS  */
-
 footer {
-  height: auto;
-  min-height: 120px;
-  padding-top: 10px;
-  background-color: #24292e;
-}
-
-footer .container {
-  width: 70%;
-  position: sticky;
-  display: block;
-}
-
-.rectangle {
-  height: 30px;
-  line-height: 30px;
-  margin-top: 15px;
+    height:70px;
+    background-color: #e7e7e7;
+    text-align: center;
+    border-radius: 7px;
+    border-style: solid !important;
+    border:1px;
+    border-color: #bdbdbd;
+    padding-top: 15px;
+    padding-left: 5px;
 }
 
-.backToTop {
-  float: right;
-  color: #999;
+footer .col-sm-6 a{
+    color: #777;
+    padding: 10px;
 }
 
-.backToTop a {
-  text-decoration: none;
+.navbar .navbar-brand:hover {
+  color: rgb(255, 100, 100);
 }
 
-.copyright {
-  color: #fff;
-  line-height: 30px;
-  min-height: 30px;
-  padding: 7px 0;
-}
+#organizers {
+  margin: 40px 0 40px;
+  background: #f4f4f4;
+  padding: 40px 20px 20px;
+  border-radius: 12px;
 
-.social {
-  color: #fff;
-  line-height: 30px;
-  min-height: 30px;
-  padding: 7px 0;
 }
 
-.social .left-align {
-  text-align: left;
+#organizers h2 {
+  font-weight: 100;
 }
 
-.social .right-align {
-  text-align: right;
+#organizers .title h2 {
+  font-size: 250%;
+  top: 85px;
+  color: #26A9E0;
 }
 
-.social ul {
-  list-style: none;
-}
-
-.social ul li {
-  width: 40px;
-  height: 30px;
-  color: #eee;
-  font-size: 22px;
-  display: inline-block;
-}
-
-.social a {
-  color: #fff;
-}
-
-
-/*Media queries*/
-
-@media (max-width: 320px) {
-  .jumbotron h1 {
-    font-size: 30px;
-  }
-}
-
-@media (min-width: 321px) and (max-width: 480px) {
-  .jumbotron h1 {
-    font-size: 38px;
-  }
-}
-
-@media (max-width: 768px) {
-  .main-section {
-    min-height: 50vh;
-    height: auto;
-    clear: both;
-  }
+.jumbotron {
+  background-color:#ffffff;
+  background-size:80px 50px;
 }
-
-@media (min-width: 769px) and (max-width: 1024px) {
-  .main-section {
-    min-height: 50vh;
-    height: auto;
-    clear: both;
-  }
+.jumbotron h1 {
+  color: #26A9E0;
 }