summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-20 13:05:14 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-20 13:05:14 +0200
commit6a91e32af9e743c7f9f4ed4926ae0f8884abb999 (patch)
treed22c88f23ddf0716ce50e3da39ea0dff62f7c3b9
parent8129e2f33f1b1538f2c984f0c7c58855d32dcd8b (diff)
downloadgitlab-ce-top-menu-improvements.tar.gz
Cleanup groups pages UI a bittop-menu-improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/generic/common.scss2
-rw-r--r--app/views/dashboard/groups/index.html.haml9
-rw-r--r--app/views/explore/groups/index.html.haml5
3 files changed, 5 insertions, 11 deletions
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 081c8e2dd38..bf5c7a8d75e 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -379,7 +379,7 @@ table {
list-style: none;
text-align: center;
padding-bottom: 15px;
- margin-bottom: 10px;
+ margin-bottom: 15px;
li {
display: inline-block;
diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml
index 37315070ea8..0860fe3c761 100644
--- a/app/views/dashboard/groups/index.html.haml
+++ b/app/views/dashboard/groups/index.html.haml
@@ -1,16 +1,13 @@
- page_title "Groups"
= render 'dashboard/groups_head'
-%h3.page-title
- Group Membership
+.slead
+ Group members have access to all group projects.
- if current_user.can_create_group?
%span.pull-right.hidden-xs
- = link_to new_group_path, class: "btn btn-new" do
+ = link_to new_group_path, class: "btn btn-new btn-sm" do
%i.fa.fa-plus
New Group
-%p.light
- Group members have access to all group projects.
-%hr
.panel.panel-default
.panel-heading
%strong Groups
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index c34493d0c20..7dcefd330a1 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -1,7 +1,7 @@
- page_title "Groups"
- if current_user
= render 'dashboard/groups_head'
-.clearfix
+.clearfix.append-bottom-10
.pull-left
= form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
= hidden_field_tag :sort, @sort
@@ -30,15 +30,12 @@
= link_to explore_groups_path(sort: sort_value_oldest_updated) do
= sort_title_oldest_updated
-%hr
-
%ul.bordered-list
- @groups.each do |group|
%li
.clearfix
%h4
= link_to group_path(id: group.path) do
- %i.fa.fa-users
= group.name
.clearfix
%p