From 82b056bd43a304574fbd1cbbe230d5ef5415257b Mon Sep 17 00:00:00 2001 From: Boris Bera Date: Sat, 4 Jul 2015 15:03:53 -0400 Subject: [PATCH] Group description now displayed on group page It gets displayed instead of the account username --- src/main/twirl/gitbucket/core/account/main.scala.html | 6 +++++- src/main/webapp/assets/common/css/gitbucket.css | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html index b4467f9aa..058e38abe 100644 --- a/src/main/twirl/gitbucket/core/account/main.scala.html +++ b/src/main/twirl/gitbucket/core/account/main.scala.html @@ -10,7 +10,11 @@
- + @if(account.isGroupAccount) { +
@account.groupDescription
+ } else { + + }
@if(account.url.isDefined){ diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 24e5ddfdb..c99e1ccb9 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -403,7 +403,8 @@ div.signin-form { font-weight: bold; } -.account-username { +.account-username, +.group-description { margin-top: 10px; font-size: 140%; color: #888888; @@ -1780,5 +1781,4 @@ div.container.blame-container{ /****************************************************************************/ a[href]:after { display: none; -} - +}