summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/explore/groups/index.html.haml6
-rw-r--r--app/views/explore/projects/trending.html.haml4
-rw-r--r--app/views/shared/groups/_group.html.haml4
3 files changed, 6 insertions, 8 deletions
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index 80acb914365..86410db2b2d 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -1,14 +1,14 @@
- page_title "Groups"
- if current_user
= render 'dashboard/groups_head'
-.clearfix.append-bottom-10
+.gray-content-block.clearfix
.pull-left
= form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
= hidden_field_tag :sort, @sort
.form-group
= search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input", id: "groups_search"
.form-group
- = button_tag 'Search', class: "btn btn-primary wide"
+ = button_tag 'Search', class: "btn btn-default"
.pull-right
.dropdown.inline
@@ -30,7 +30,7 @@
= link_to explore_groups_path(sort: sort_value_oldest_updated) do
= sort_title_oldest_updated
-%ul.bordered-list
+%ul.content-list
- @groups.each do |group|
= render 'shared/groups/group', group: group
- unless @groups.present?
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index 4c7e7d44733..1590bb9fc63 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -1,12 +1,12 @@
- page_title "Trending Projects"
- if current_user
= render 'dashboard/projects_head'
-.explore-title
+
+.gray-content-block.explore-title
%h3
Explore GitLab
%p.lead
Discover projects and groups. Share your projects with others
-%hr
.explore-trending-block
.lead
%i.fa.fa-comments-o
diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml
index 2d7f911e351..444410b2584 100644
--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
@@ -5,11 +5,9 @@
- if can?(current_user, :admin_group, group)
= link_to edit_group_path(group), class: "btn-sm btn btn-grouped" do
%i.fa.fa-cogs
- Settings
= link_to leave_group_group_members_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Leave this group' do
%i.fa.fa-sign-out
- Leave
= image_tag group_icon(group), class: "avatar s48 hidden-xs"
= link_to group, class: 'group-name' do
@@ -17,7 +15,7 @@
- if group_member
as
- %strong #{group_member.human_access}
+ %span #{group_member.human_access}
%div.light
#{pluralize(group.projects.count, "project")}, #{pluralize(group.users.count, "user")}