Merge pull request #555 from rcos/layout

Working on Layout and design of pages
rcos · Dec 16, 2016 · 06ead8d · 06ead8d
2 parents e15cf1a + a2e8af6
commit 06ead8d
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 43 deletions.
diff --git a/client/app/achievements/achievements.html b/client/app/achievements/achievements.html
@@ -12,12 +12,6 @@ <h1>Rensselaer Center for Open Source</h1>
 <div class="container">
   <div class="row text-area">
     <div class="col-md-4 col-md-push-8 side-bar">
-      <p>
-      <ul class="nav nav-pills nav-stacked">
-        <li role="presentation" ><a href="/">Home</a></li>
-        <li role="presentation" class="active"><a href="#">Achievements</a></li>
-      </ul>
-      <p>
       <div class="panel panel-default">
         <div class="panel-heading">About Achievements</div>
         <div class="panel-body">

diff --git a/client/app/app.less b/client/app/app.less
@@ -102,6 +102,15 @@ textarea.form-control {
   margin-bottom: 0;
 }
 
+.btn-primary,
+.btn-primary:hover,
+.btn-primary:active,
+.btn-primary:visited,
+.btn-primary:focus {
+  background-color: @rpi-red;
+  border-color: @rpi-red;
+}
+
 /* columns of same height styles */
 
 .row-height {

diff --git a/client/app/main/main.html b/client/app/main/main.html
@@ -11,13 +11,61 @@ <h1>Rensselaer Center for Open Source</h1>
 
 <div class="container">
   <div class="row text-area">
-    <div class="col-md-4 col-md-push-8 side-bar">
+    <div class="col-sm-4 text-center">
+      <h3>Developers</h3>
+      We are a group of passionate open source developers at RPI.
+
       <p>
-      <ul class="nav nav-pills nav-stacked">
-          <li role="presentation" class="active"><a href="#">Home</a></li>
-          <li role="presentation"><a href="/achievements">Achievements</a></li>
-      </ul>
+      <br>
+      <a class="btn btn-primary" ng-href="/users/" role="button">View Developers</a>
+      </p>
+    </div>
+    <div class="col-sm-4 text-center">
+      <h3>Projects</h3>
+      We work on a bunch of awesome open source projects.
+
+      <p>
+      <br>
+      <a class="btn btn-primary" ng-href="/projects" role="button">View Projects</a>
+      </p>
+    </div>
+    <div class="col-md-4 text-center">
+      <h3>Achievements</h3>
+      We are not your average college students.
+
       <p>
+      <br>
+      <a class="btn btn-primary" ng-href="/achievements" role="button">View Achievements</a>
+      </p>
+    </div>
+  </div>
+  <hr>
+
+  <div class="row text-area">
+    <div class="col-sm-8">
+      RCOS is a group of RPI students who work on open source projects.
+      Our members work on a variety of projects, which can be seen on the <a ng-href="/projects">projects</a> page. To see the presentation schedule look <a target="_blank" href="https://docs.google.com/spreadsheets/d/1A6naU2lG5ALS7RELFpeG__QHaUjLbwXmCGIyzGJum7s/edit#gid=0" title="Presentations Link">here</a>.
+      </p>
+      </p>
+      <h3>Benefits of being an RCOS member</h3>
+      <p>
+      <ul><li>The opportunity to help society by creating useful software.</li><li>An excellent environment to share your skills with your peers and
+          learn from them as well</li><li>Great practice in the code review process, a very important skill
+          for your software career!</li><li>Practice giving and receiving feedback. Learning how to discuss
+          technical and non-technical aspects of a project in a constructive
+          fashion is a critical skill that employers look for!</li></ul>
+      </p>
+      <h3>Details</h3>
+      <p>
+      Students can participate in RCOS for course credit or for a stipend.
+      At the beginning of each semester, the Internal Advisory Board will
+      review project proposals and decide which projects should receive
+      financial support.
+      </p>
+      <h3>Donations</h3>
+      RCOS uses funds to financially support open source software development. Follow this <a href="https://securelb.imodules.com/s/1225/giving/index.aspx?sid=1225&gid=1&pgid=1947&cid=4524&appealcode=WGAFP&_ga=1.191668650.1206279174.1408978267" title="RPI Donate Link">link</a> if you can help us out by donating!
+    </div>
+    <div class="col-sm-4 col-xs-12 statistics">
       <!-- Statistics Panel -->
       <div class="panel panel-default">
         <div class="panel-heading">Statistics</div>
@@ -49,35 +97,21 @@ <h1>Rensselaer Center for Open Source</h1>
       </div>
       <!-- End Meeting Times Panel -->
     </div>
-    <div class="col-md-8 col-md-pull-4">
-      <h2>Mission Statement</h2><p>
-      To provide a creative, intellectual and entrepreneurial outlet for
-      students to use the latest open-source software platforms to develop
-      applications that solve societal problems.
-      </p>
-      <h2>Description</h2><p>
-      RCOS is a group of RPI students who work on open source projects.
-      Our members work on a variety of projects, which can be seen on the <a ng-href="/projects">projects</a> page. To see the presentation schedule look <a target="_blank" href="https://docs.google.com/spreadsheets/d/1A6naU2lG5ALS7RELFpeG__QHaUjLbwXmCGIyzGJum7s/edit#gid=0" title="Presentations Link">here</a>.
-      </p>
-      </p>
-      <h2>Benefits of being an RCOS member</h2><p>
-      <ul><li>The opportunity to help society by creating useful software.</li><li>An excellent environment to share your skills with your peers and
-          learn from them as well</li><li>Great practice in the code review process, a very important skill
-          for your software career!</li><li>Practice giving and receiving feedback. Learning how to discuss
-          technical and non-technical aspects of a project in a constructive
-          fashion is a critical skill that employers look for!</li></ul>
-      </p>
-      <h2>Details</h2><p>
-      Students can participate in RCOS for course credit or for a stipend.
-      At the beginning of each semester, the Internal Advisory Board will
-      review project proposals and decide which projects should receive
-      financial support.
-      </p>
-      <h2>Donations</h2>
-      RCOS uses funds to financially support open source software development. Follow this <a href="https://securelb.imodules.com/s/1225/giving/index.aspx?sid=1225&gid=1&pgid=1947&cid=4524&appealcode=WGAFP&_ga=1.191668650.1206279174.1408978267" title="RPI Donate Link">link</a> if you can help us out by donating!
-    </div>
+  </div>
+  <hr>
+  <div class="jumbotron">
+    <h2>Mission Statement</h2>
+    <p>
+    To provide a creative, intellectual and entrepreneurial outlet for
+    students to use the latest open-source software platforms to develop
+    applications that solve societal problems.
+    </p>
+  </div>
+  <hr>
 
+  <div class="row textarea">
   </div>
 </div>
+</div>
 
 <div ng-include="'components/footer/footer.html'"></div>
diff --git a/client/app/main/main.less b/client/app/main/main.less
@@ -15,7 +15,7 @@
 }
 
 #body-text h2{
-	font-size: 20px;
+	font-size: 18px;
 }
 
 .hero-unit {
@@ -42,8 +42,5 @@ html {
 body {
   /* Margin bottom by footer height */
   margin-bottom: 90px;
-}
-
-.side-bar {
-  margin-top: 20px;
+  font-size: 16px;
 }
diff --git a/client/components/navbar/navbar.controller.js b/client/components/navbar/navbar.controller.js
@@ -3,6 +3,9 @@
 angular.module('observatory3App')
   .controller('NavbarCtrl', function ($scope, $location, $http, Auth) {
     $scope.menu = [{
+      'title': 'Achievements',
+      'link': '/achievements'
+    }, {
       'title': 'Projects',
       'link': '/projects'
     },{