diff options
author | Sullivan SENECHAL <soullivaneuh@gmail.com> | 2014-10-02 00:21:29 +0200 |
---|---|---|
committer | Sullivan SENECHAL <soullivaneuh@gmail.com> | 2014-10-03 12:19:24 +0200 |
commit | 5d8be4438add1183d91e030b852c628cf09f4916 (patch) | |
tree | fc06a25a526de719d3bc9c7ba5d4ebb4fe69a828 /app/views/groups | |
parent | 0cc30145f441a16ce513bba942ea67ede4086a7f (diff) | |
download | gitlab-ce-5d8be4438add1183d91e030b852c628cf09f4916.tar.gz |
Upgrade to Font Awesome v4.2
Diffstat (limited to 'app/views/groups')
-rw-r--r-- | app/views/groups/_projects.html.haml | 4 | ||||
-rw-r--r-- | app/views/groups/_settings_nav.html.haml | 4 | ||||
-rw-r--r-- | app/views/groups/edit.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/group_members/_group_member.html.haml | 6 | ||||
-rw-r--r-- | app/views/groups/issues.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/members.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/merge_requests.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/milestones/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/projects.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/show.html.haml | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index 2ebff21b819..2c65b3049e3 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -4,7 +4,7 @@ - if can? current_user, :create_projects, @group .panel-head-actions = link_to new_project_path(namespace_id: @group.id), class: "btn btn-new" do - %i.icon-plus + %i.fa.fa-plus New project %ul.well-list - if projects.blank? @@ -18,4 +18,4 @@ %span.project-name = project.name %span.arrow - %i.icon-angle-right + %i.fa.fa-angle-right diff --git a/app/views/groups/_settings_nav.html.haml b/app/views/groups/_settings_nav.html.haml index 32eae31a47d..ec1fb4a2c00 100644 --- a/app/views/groups/_settings_nav.html.haml +++ b/app/views/groups/_settings_nav.html.haml @@ -1,10 +1,10 @@ %ul.nav.nav-pills.nav-stacked.nav-stacked-menu = nav_link(path: 'groups#edit') do = link_to edit_group_path(@group) do - %i.icon-edit + %i.fa.fa-pencil-square-o Group = nav_link(path: 'groups#projects') do = link_to projects_group_path(@group) do - %i.icon-folder-close + %i.fa.fa-folder Projects diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 97f22df044f..0b15affe785 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -32,7 +32,7 @@ - else You can upload a group avatar here %a.choose-btn.btn.btn-small.js-choose-group-avatar-button - %i.icon-paper-clip + %i.fa.fa-paperclip %span Choose File ... %span.file_name.js-avatar-filename File name... diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml index 099e50a384e..d05016d9c3f 100644 --- a/app/views/groups/group_members/_group_member.html.haml +++ b/app/views/groups/group_members/_group_member.html.haml @@ -15,14 +15,14 @@ - if show_controls - if can?(current_user, :modify, member) = link_to '#', class: "btn-tiny btn js-toggle-button", title: 'Edit access level' do - %i.icon-edit + %i.fa.fa-pencil-square-o - if can?(current_user, :destroy, member) - if current_user == member.user = link_to leave_profile_group_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do - %i.icon-minus.icon-white + %i.fa.fa-minus.fa-inverse - else = link_to group_group_member_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do - %i.icon-minus.icon-white + %i.fa.fa-minus.fa-inverse .edit-member.hide.js-toggle-content = form_for [@group, member], remote: true do |f| diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 0152ae86833..1932ba2f644 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -11,7 +11,7 @@ .row .fixed.sidebar-expand-button.hidden-lg.hidden-md - %i.icon-list.icon-2x + %i.fa.fa-list.fa-2x .col-md-3.responsive-side = render 'shared/filter', entity: 'issue' .col-md-9 diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml index ebf407d4ef1..ba554cd5ef1 100644 --- a/app/views/groups/members.html.haml +++ b/app/views/groups/members.html.haml @@ -19,7 +19,7 @@ .pull-right = link_to '#', class: 'btn btn-new js-toggle-button' do Add members - %i.icon-chevron-down + %i.fa.fa-chevron-down .js-toggle-content.hide.new-group-member-holder = render "new_group_member" diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 71d346d0469..86d5acdaa32 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -10,7 +10,7 @@ %hr .row .fixed.sidebar-expand-button.hidden-lg.hidden-md - %i.icon-list.icon-2x + %i.fa.fa-list.fa-2x .col-md-3.responsive-side = render 'shared/filter', entity: 'merge_request' .col-md-9 diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml index 54e901173f0..2727525f070 100644 --- a/app/views/groups/milestones/index.html.haml +++ b/app/views/groups/milestones/index.html.haml @@ -11,7 +11,7 @@ .row .fixed.sidebar-expand-button.hidden-lg.hidden-md - %i.icon-list.icon-2x + %i.fa.fa-list.fa-2x .col-md-3.responsive-side = render 'groups/filter', entity: 'milestone' .col-md-9 diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index cdc087f949a..235e299343a 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -17,7 +17,7 @@ = f.label :avatar, "Group avatar", class: 'control-label' .col-sm-10 %a.choose-btn.btn.btn-small.js-choose-group-avatar-button - %i.icon-paper-clip + %i.fa.fa-paperclip %span Choose File ... %span.file_name.js-avatar-filename File name... diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml index a5e752d776f..65a66355c56 100644 --- a/app/views/groups/projects.html.haml +++ b/app/views/groups/projects.html.haml @@ -9,7 +9,7 @@ - if can? current_user, :manage_group, @group .panel-head-actions = link_to new_project_path(namespace_id: @group.id), class: "btn btn-new" do - %i.icon-plus + %i.fa.fa-plus New Project %ul.well-list - @projects.each do |project| diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 6db393c882c..4f4fc537d34 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -30,7 +30,7 @@ .prepend-top-20 = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do %strong - %i.icon-rss + %i.fa.fa-rss News Feed %hr |