From d613f3c817c76363f6658e31117b08ed6dfe5c14 Mon Sep 17 00:00:00 2001 From: Aaron Gunderson Date: Sun, 11 Dec 2016 17:25:47 -0500 Subject: [PATCH 1/3] Removed Achievements weird navigation and moved to top bar --- client/app/achievements/achievements.html | 6 ------ client/app/main/main.html | 6 ------ client/components/navbar/navbar.controller.js | 3 +++ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/client/app/achievements/achievements.html b/client/app/achievements/achievements.html index 8ccc4cd6..9baf4a82 100644 --- a/client/app/achievements/achievements.html +++ b/client/app/achievements/achievements.html @@ -12,12 +12,6 @@

Rensselaer Center for Open Source

-

-

-

About Achievements
diff --git a/client/app/main/main.html b/client/app/main/main.html index bd58283e..c8f62b9a 100644 --- a/client/app/main/main.html +++ b/client/app/main/main.html @@ -12,12 +12,6 @@

Rensselaer Center for Open Source

-

-

-

Statistics
diff --git a/client/components/navbar/navbar.controller.js b/client/components/navbar/navbar.controller.js index 80042538..54525c2d 100644 --- 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' },{ From 1498fb3891b93c7c16ad31884ef1bc52224145e5 Mon Sep 17 00:00:00 2001 From: Aaron Gunderson Date: Sun, 11 Dec 2016 23:48:45 -0500 Subject: [PATCH 2/3] New landing page layout and buttons are red --- client/app/app.less | 9 ++++ client/app/main/main.html | 95 +++++++++++++++++++++++++++------------ client/app/main/main.less | 4 +- 3 files changed, 78 insertions(+), 30 deletions(-) diff --git a/client/app/app.less b/client/app/app.less index cfa1833b..ea622b01 100644 --- 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 index c8f62b9a..786c301f 100644 --- a/client/app/main/main.html +++ b/client/app/main/main.html @@ -11,7 +11,60 @@

Rensselaer Center for Open Source

-
+
+

Developers

+ We are a group of passionate open source developers at RPI. + +

+
+ View Developers +

+
+
+

Projects

+ We work on a bunch of awesome open source projects. + +

+
+ View Projects +

+
+
+

Achievements

+ We are not your average college students. + +

+
+ View Achievements +

+
+
+
+ +
+
+

Description

+ 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 projects page. To see the presentation schedule look here. +

+

+

Benefits of being an RCOS member

+

  • The opportunity to help society by creating useful software.
  • An excellent environment to share your skills with your peers and + learn from them as well
  • Great practice in the code review process, a very important skill + for your software career!
  • 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!
+

+

Details

+ 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. +

+

Donations

+ RCOS uses funds to financially support open source software development. Follow this link if you can help us out by donating! +
+
Statistics
@@ -43,35 +96,21 @@

Rensselaer Center for Open Source

-
-

Mission Statement

- 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. -

-

Description

- 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 projects page. To see the presentation schedule look here. -

-

-

Benefits of being an RCOS member

-

  • The opportunity to help society by creating useful software.
  • An excellent environment to share your skills with your peers and - learn from them as well
  • Great practice in the code review process, a very important skill - for your software career!
  • 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!
-

-

Details

- 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. -

-

Donations

- RCOS uses funds to financially support open source software development. Follow this link if you can help us out by donating! -
+
+
+
+

Mission Statement

+

+ 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. +

+
+
+
+
diff --git a/client/app/main/main.less b/client/app/main/main.less index c2277a9b..6f57e13b 100644 --- a/client/app/main/main.less +++ b/client/app/main/main.less @@ -44,6 +44,6 @@ body { margin-bottom: 90px; } -.side-bar { - margin-top: 20px; +.statistics { + margin-top: 50px; } From a2e8af6b2d5f2f478dbda73e1c78f3375124015a Mon Sep 17 00:00:00 2001 From: Aaron Gunderson Date: Fri, 16 Dec 2016 17:38:53 -0500 Subject: [PATCH 3/3] Updated with suggestions and switched to h3 --- client/app/main/main.html | 15 ++++++++------- client/app/main/main.less | 7 ++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/client/app/main/main.html b/client/app/main/main.html index 786c301f..b217fdba 100644 --- a/client/app/main/main.html +++ b/client/app/main/main.html @@ -12,7 +12,7 @@

Rensselaer Center for Open Source

-

Developers

+

Developers

We are a group of passionate open source developers at RPI.

@@ -21,7 +21,7 @@

Developers

-

Projects

+

Projects

We work on a bunch of awesome open source projects.

@@ -30,7 +30,7 @@

Projects

-

Achievements

+

Achievements

We are not your average college students.

@@ -43,25 +43,26 @@

Achievements

-

Description

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 projects page. To see the presentation schedule look here.

-

Benefits of being an RCOS member

+

Benefits of being an RCOS member

+

  • The opportunity to help society by creating useful software.
  • An excellent environment to share your skills with your peers and learn from them as well
  • Great practice in the code review process, a very important skill for your software career!
  • 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!

-

Details

+

Details

+

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.

-

Donations

+

Donations

RCOS uses funds to financially support open source software development. Follow this link if you can help us out by donating!
diff --git a/client/app/main/main.less b/client/app/main/main.less index 6f57e13b..9a0b9f5f 100644 --- 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; -} - -.statistics { - margin-top: 50px; + font-size: 16px; }