From 06d31b36a68c99f278a5683f4b4be9b900f0ef46 Mon Sep 17 00:00:00 2001
From: Emma Garland <emmagarland77@gmail.com>
Date: Mon, 5 Jun 2017 12:46:06 +0100
Subject: [PATCH] Updated css and html for github contributors, and updated
 list of contributors

---
 .../src/scss/sections/_contributors.scss      | 22 +++++++++++++------
 .../Partials/Home/GitHubContributors.cshtml   |  4 +++-
 OurUmbraco.Site/config/githubhq.txt           | 14 +++++++++---
 .../GitHubContributorController.cs            |  4 ++--
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/OurUmbraco.Client/src/scss/sections/_contributors.scss b/OurUmbraco.Client/src/scss/sections/_contributors.scss
index fc617670..3fdaf016 100644
--- a/OurUmbraco.Client/src/scss/sections/_contributors.scss
+++ b/OurUmbraco.Client/src/scss/sections/_contributors.scss
@@ -1,17 +1,25 @@
 #github-contributors {
     &:not(.all) {
-        .contributor:nth-child(n+17) {
+        .contributor {
+            @media (min-width: $md) {
+                &:nth-child(n+17) {
+                    display: none;
+                }
+            }
+        }
+    }
+
+    &.all {
+        .button {
             display: none;
         }
-   }
-    &.all {
-        .button { display: none; }
     }
-    .button {
+
+    .loadmore {
         margin: 20px auto;
-    }  
+    }
 }
-    
+
 .contributor {
     margin-bottom: 15px;
 
diff --git a/OurUmbraco.Site/Views/Partials/Home/GitHubContributors.cshtml b/OurUmbraco.Site/Views/Partials/Home/GitHubContributors.cshtml
index 6111e97d..22701e12 100644
--- a/OurUmbraco.Site/Views/Partials/Home/GitHubContributors.cshtml
+++ b/OurUmbraco.Site/Views/Partials/Home/GitHubContributors.cshtml
@@ -15,7 +15,9 @@
             </a>
         }
     }
-    <a class="button green" href="#" onclick="loadAllGitHubContributors(); return false;">Load more</a>
+    <div class="loadmore">
+        <a class="button transparent" href="#" onclick="loadAllGitHubContributors(); return false;">Load more</a>
+    </div>
 }
 
 else
diff --git a/OurUmbraco.Site/config/githubhq.txt b/OurUmbraco.Site/config/githubhq.txt
index c013988c..f7d2b898 100644
--- a/OurUmbraco.Site/config/githubhq.txt
+++ b/OurUmbraco.Site/config/githubhq.txt
@@ -1,7 +1,15 @@
-Shazwazza
-nul800sebastiaan
+Aaen
+clausjensen
+emilwangaa
+hartvig
 hemraker
 madsrasmussen
 mikkelhm
+nul800sebastiaan
 perploug
-sitereactor
\ No newline at end of file
+Shazwazza
+sitereactor
+sofietoft
+umbracoci
+warrenbuckley
+zpqrtbnk
\ No newline at end of file
diff --git a/OurUmbraco/Community/Controllers/GitHubContributorController.cs b/OurUmbraco/Community/Controllers/GitHubContributorController.cs
index 14e81007..9db085c2 100644
--- a/OurUmbraco/Community/Controllers/GitHubContributorController.cs
+++ b/OurUmbraco/Community/Controllers/GitHubContributorController.cs
@@ -62,9 +62,9 @@ namespace OurUmbraco.Community.Controllers
                     }, TimeSpan.FromDays(1));
 
                 var filteredContributors = contributors
-                    .OrderByDescending(c => c.Total)
                     .Where(g => !login.Contains(g.Author.Login))
-                    .GroupBy(g => g.Author.Id);
+                    .GroupBy(g => g.Author.Id)
+                    .OrderByDescending(c => c.Sum(g => g.Total));
 
                 model.Contributors = filteredContributors;
             }