From 3f8fb9697560c8c90b6d778541dd99ccb5c3eedc Mon Sep 17 00:00:00 2001
From: pixeldesu <pixeldesu@nerdwerks.org>
Date: Fri, 12 Dec 2014 16:31:50 +0100
Subject: [PATCH 1/3] update about page things

---
 app/views/static/about.html.haml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 78a045a4..e1be8e3b 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -16,10 +16,20 @@
           %h3 The Team
           The people behind justask!
           %br/
-          %ul
-            - @admins.each do |user|
-              %li
-                %a= link_to user.screen_name, show_user_profile_path(user.screen_name)
+          .media
+            .pull-left
+              %a= show_user_profile_path('nilsding'.screen_name)
+                %img.img-rounded.answerbox--img{src: gravatar_url('nilsding')}
+            .media-body
+              %h4.entry-text nilsding
+              %h6.entry-subtext Backend, Server & Code
+          .media
+            .pull-left
+              %a= show_user_profile_path('pixeldesu'.screen_name)
+                %img.img-rounded.answerbox--img{src: gravatar_url('pixeldesu')}
+            .media-body
+              %h4.entry-text pixeldesu
+              %h6.entry-subtext Frontend Design & Layout
       .panel.panel-default
         .panel-body
           There are lies, damned lies, and then there are...

From ebd0719599f26b3399da551d52b16a39fc2e19e3 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Fri, 12 Dec 2014 16:45:39 +0100
Subject: [PATCH 2/3] foxed about page

---
 app/helpers/application_helper.rb | 1 +
 app/views/static/about.html.haml  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0108b35d..f64b0611 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -52,6 +52,7 @@ module ApplicationHelper
 
   def gravatar_url(user)
     return '//www.gravatar.com/avatar' if user.nil?
+    return "//www.gravatar.com/avatar/#{Digest::MD5.hexdigest(user)}" if user.is_a? String
     "//www.gravatar.com/avatar/#{Digest::MD5.hexdigest(user.email)}"
   end
 
diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index e1be8e3b..11f0023a 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -18,15 +18,15 @@
           %br/
           .media
             .pull-left
-              %a= show_user_profile_path('nilsding'.screen_name)
-                %img.img-rounded.answerbox--img{src: gravatar_url('nilsding')}
+              %a{href: show_user_profile_path('nilsding')}
+                %img.img-rounded.answerbox--img{src: gravatar_url('nilsding@nilsding.org')}
             .media-body
               %h4.entry-text nilsding
               %h6.entry-subtext Backend, Server & Code
           .media
             .pull-left
-              %a= show_user_profile_path('pixeldesu'.screen_name)
-                %img.img-rounded.answerbox--img{src: gravatar_url('pixeldesu')}
+              %a{href: show_user_profile_path('pixeldesu')}
+                %img.img-rounded.answerbox--img{src: gravatar_url('pixeldesu@outlook.com')}
             .media-body
               %h4.entry-text pixeldesu
               %h6.entry-subtext Frontend Design & Layout

From ba7df144d4c1f30c2b7f2916afa2a1b1604e49ee Mon Sep 17 00:00:00 2001
From: pixeldesu <pixeldesu@nerdwerks.org>
Date: Fri, 12 Dec 2014 16:49:15 +0100
Subject: [PATCH 3/3] fix top margin

---
 app/assets/stylesheets/scss/entry.scss | 4 ++++
 app/views/static/about.html.haml       | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/scss/entry.scss b/app/assets/stylesheets/scss/entry.scss
index 964e2980..4d145256 100644
--- a/app/assets/stylesheets/scss/entry.scss
+++ b/app/assets/stylesheets/scss/entry.scss
@@ -8,4 +8,8 @@
 
 .entry-text {
   margin-bottom: 0px;
+}
+
+.entry-about {
+  margin-top: 0px;
 }
\ No newline at end of file
diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index e1be8e3b..54206a8d 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -21,14 +21,14 @@
               %a= show_user_profile_path('nilsding'.screen_name)
                 %img.img-rounded.answerbox--img{src: gravatar_url('nilsding')}
             .media-body
-              %h4.entry-text nilsding
+              %h4.entry-text.entry-about nilsding
               %h6.entry-subtext Backend, Server & Code
           .media
             .pull-left
               %a= show_user_profile_path('pixeldesu'.screen_name)
                 %img.img-rounded.answerbox--img{src: gravatar_url('pixeldesu')}
             .media-body
-              %h4.entry-text pixeldesu
+              %h4.entry-text.entry-about pixeldesu
               %h6.entry-subtext Frontend Design & Layout
       .panel.panel-default
         .panel-body