From ac245ede43385381254942365399dc465b2b4917 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 14 Nov 2014 14:28:46 -0500 Subject: [PATCH] UX: Fixes for group view --- .../javascripts/discourse/templates/group.hbs | 14 ++++++++------ app/assets/stylesheets/desktop/user.scss | 16 +++++++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs index fe8f28bb259..d88ae8f1268 100644 --- a/app/assets/javascripts/discourse/templates/group.hbs +++ b/app/assets/javascripts/discourse/templates/group.hbs @@ -15,12 +15,14 @@
-
-
-

{{name}}

-
-
- {{outlet}} +
+
+
+

{{name}}

+
+
+ {{outlet}} +
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 7f2c38e3933..e6e4c9f0f0e 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -115,9 +115,7 @@ margin-bottom: 50px; table.group-members { - width: 75%; - float: right; - + width: 100%; p { max-width: 600px; white-space: nowrap; @@ -141,6 +139,10 @@ } } + .user-right.groups { + margin-top: 0; + } + .user-right { width: 75%; float: right; @@ -188,10 +190,10 @@ color: $secondary; &.group { - width: 75%; - float: right; - margin-top: 20px; - .details {padding: 15px;} + .details { + padding: 15px; + margin: 0; + } } .secondary {