Download as
Browse Code »

Commit e2fb18a3ec8052997f0c9b795f76a6e4d57a9d97

Authored by Dmitriy Zaporozhets
1 parent 7ba4f2dc
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

replace right with pull-right

Showing 96 changed files with 143 additions and 144 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @e2fb18a
... ... @@ -95,7 +95,7 @@
95 95  
96 96 form {
97 97 margin-bottom: 0;
98   - margin-top: 3px;
  98 + margin-top: 0;
99 99 }
100 100  
101 101 .btn-tiny {
... ...
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @e2fb18a
... ... @@ -9,7 +9,6 @@
9 9  
10 10 /** COMMON CLASSES **/
11 11 .left { float:left }
12   -.right { float:right!important }
13 12 .append-bottom-10 { margin-bottom:10px }
14 13 .append-bottom-20 { margin-bottom:20px }
15 14 .prepend-top-10 { margin-top:10px }
... ...
app/assets/stylesheets/sections/events.scss
  Diff comments   View file @e2fb18a
... ... @@ -127,7 +127,7 @@
127 127 .btn-new-mr {
128 128 @extend .btn-info;
129 129 @extend .small;
130   - @extend .right;
  130 + @extend .pull-right;
131 131 margin: -3px;
132 132 }
133 133 }
... ...
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @e2fb18a
... ... @@ -258,7 +258,7 @@ ul.notes {
258 258 }
259 259  
260 260 .attachment {
261   - @extend .right;
  261 + @extend .pull-right;
262 262 position: relative;
263 263 width: 350px;
264 264 height: 50px;
... ... @@ -274,7 +274,7 @@ ul.notes {
274 274 }
275 275 }
276 276 .notify_options {
277   - @extend .right;
  277 + @extend .pull-right;
278 278 }
279 279 }
280 280 .note_text_and_preview {
... ...
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @e2fb18a
... ... @@ -4,7 +4,7 @@
4 4 }
5 5  
6 6 .side {
7   - @extend .right;
  7 + @extend .pull-right;
8 8  
9 9 .projects_box {
10 10 > .title {
... ...
app/views/admin/dashboard/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -31,7 +31,7 @@
31 31 - @projects.each do |project|
32 32 %p
33 33 = link_to project.name_with_namespace, [:admin, project]
34   - %span.light.right
  34 + %span.light.pull-right
35 35 = time_ago_in_words project.created_at
36 36 ago
37 37  
... ... @@ -42,7 +42,7 @@
42 42 %p
43 43 = link_to [:admin, user] do
44 44 = user.name
45   - %span.light.right
  45 + %span.light.pull-right
46 46 = time_ago_in_words user.created_at
47 47 ago
48 48  
... ... @@ -51,25 +51,25 @@
51 51 %hr
52 52 %p
53 53 Issues
54   - %span.light.right
  54 + %span.light.pull-right
55 55 = Issue.count
56 56 %p
57 57 Merge Requests
58   - %span.light.right
  58 + %span.light.pull-right
59 59 = MergeRequest.count
60 60 %p
61 61 Notes
62   - %span.light.right
  62 + %span.light.pull-right
63 63 = Note.count
64 64 %p
65 65 Snippets
66   - %span.light.right
  66 + %span.light.pull-right
67 67 = Snippet.count
68 68 %p
69 69 SSH Keys
70   - %span.light.right
  70 + %span.light.pull-right
71 71 = Key.count
72 72 %p
73 73 Milestones
74   - %span.light.right
  74 + %span.light.pull-right
75 75 = Milestone.count
... ...
app/views/admin/groups/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -4,7 +4,7 @@
4 4 allows you to keep projects organized.
5 5 Use groups for uniting related projects.
6 6  
7   - = link_to 'New Group', new_admin_group_path, class: "btn btn-small right"
  7 + = link_to 'New Group', new_admin_group_path, class: "btn btn-small pull-right"
8 8 %br
9 9 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
10 10 = text_field_tag :name, params[:name], class: "xlarge"
... ...
app/views/admin/groups/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -14,7 +14,7 @@
14 14 %td
15 15 = @group.name
16 16  
17   - = link_to edit_admin_group_path(@group), class: "btn btn-small right" do
  17 + = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
18 18 %i.icon-edit
19 19 Rename
20 20 %tr
... ... @@ -29,7 +29,7 @@
29 29 Owner:
30 30 %td
31 31 = @group.owner_name
32   - .right
  32 + .pull-right
33 33 = link_to "#", class: "btn btn-small change-owner-link" do
34 34 %i.icon-edit
35 35 Change owner
... ...
app/views/admin/hooks/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -33,7 +33,7 @@
33 33 %td
34 34 = link_to admin_hook_path(hook) do
35 35 %strong= hook.url
36   - = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small right"
  36 + = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small pull-right"
37 37 %td POST
38 38 %td
39   - = link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small right"
  39 + = link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small pull-right"
... ...
app/views/admin/logs/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -15,7 +15,7 @@
15 15 .file_title
16 16 %i.icon-file
17 17 githost.log
18   - .right
  18 + .pull-right
19 19 = link_to '#', class: 'log-bottom' do
20 20 %i.icon-arrow-down
21 21 Scroll down
... ... @@ -29,7 +29,7 @@
29 29 .file_title
30 30 %i.icon-file
31 31 application.log
32   - .right
  32 + .pull-right
33 33 = link_to '#', class: 'log-bottom' do
34 34 %i.icon-arrow-down
35 35 Scroll down
... ... @@ -43,7 +43,7 @@
43 43 .file_title
44 44 %i.icon-file
45 45 production.log
46   - .right
  46 + .pull-right
47 47 = link_to '#', class: 'log-bottom' do
48 48 %i.icon-arrow-down
49 49 Scroll down
... ... @@ -57,7 +57,7 @@
57 57 .file_title
58 58 %i.icon-file
59 59 sidekiq.log
60   - .right
  60 + .pull-right
61 61 = link_to '#', class: 'log-bottom' do
62 62 %i.icon-arrow-down
63 63 Scroll down
... ...
app/views/admin/projects/index.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 Projects
3   - = link_to 'New Project', new_project_path, class: "btn btn-small right"
  3 + = link_to 'New Project', new_project_path, class: "btn btn-small pull-right"
4 4  
5 5 %hr
6 6  
... ... @@ -51,7 +51,7 @@
51 51 - else
52 52 %i.icon-lock.cgreen
53 53 = link_to project.name_with_namespace, [:admin, project]
54   - .right
  54 + .pull-right
55 55 = link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
56 56 = link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
57 57 - if @projects.blank?
... ...
app/views/admin/projects/show.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 Project: #{@project.name_with_namespace}
3   - = link_to edit_admin_project_path(@project), class: "btn right" do
  3 + = link_to edit_admin_project_path(@project), class: "btn pull-right" do
4 4 %i.icon-edit
5 5 Edit
6 6  
... ...
app/views/admin/teams/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -3,7 +3,7 @@
3 3 %small
4 4 simple Teams description
5 5  
6   - = link_to 'New Team', new_admin_team_path, class: "btn btn-small right"
  6 + = link_to 'New Team', new_admin_team_path, class: "btn btn-small pull-right"
7 7 %br
8 8  
9 9 = form_tag admin_teams_path, method: :get, class: 'form-inline' do
... ...
app/views/admin/teams/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -14,7 +14,7 @@
14 14 %td
15 15 = @team.name
16 16  
17   - = link_to edit_admin_team_path(@team), class: "btn btn-small right" do
  17 + = link_to edit_admin_team_path(@team), class: "btn btn-small pull-right" do
18 18 %i.icon-edit
19 19 Rename
20 20 %tr
... ... @@ -23,7 +23,7 @@
23 23 Owner:
24 24 %td
25 25 = @team.owner.name
26   - .right
  26 + .pull-right
27 27 = link_to "#", class: "btn btn-small change-owner-link" do
28 28 %i.icon-edit
29 29 Change owner
... ... @@ -42,7 +42,7 @@
42 42 %fieldset
43 43 %legend
44 44 Members (#{@team.members.count})
45   - %span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary btn-small right", id: :add_members_to_team
  45 + %span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary btn-small pull-right", id: :add_members_to_team
46 46 - if @team.members.any?
47 47 %table#members_list
48 48 %thead
... ... @@ -67,7 +67,7 @@
67 67 %fieldset
68 68 %legend
69 69 Projects (#{@team.projects.count})
70   - %span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary btn-small right", id: :assign_projects_to_team
  70 + %span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary btn-small pull-right", id: :assign_projects_to_team
71 71 - if @team.projects.any?
72 72 %table#projects_list
73 73 %thead
... ...
app/views/admin/users/index.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 Users
3   - = link_to 'New User', new_admin_user_path, class: "btn btn-small right"
  3 + = link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right"
4 4 %br
5 5  
6 6 = form_tag admin_users_path, method: :get, class: 'form-inline' do
... ...
app/views/admin/users/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -4,7 +4,7 @@
4 4 %small Blocked
5 5 - if @admin_user.admin
6 6 %small Administrator
7   - = link_to edit_admin_user_path(@admin_user), class: "btn right" do
  7 + = link_to edit_admin_user_path(@admin_user), class: "btn pull-right" do
8 8 %i.icon-edit
9 9 Edit
10 10  
... ...
app/views/blame/_head.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -3,5 +3,5 @@
3 3 = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
4 4 = nav_link(controller: :refs) do
5 5 = link_to 'Source', project_tree_path(@project, @ref)
6   - %li.right
  6 + %li.pull-right
7 7 = render "shared/clone_panel"
... ...
app/views/commit/show.html.haml
  Diff comments   View file @e2fb18a
1 1 = render "commits/commit_box"
2 2  
3   -%p.right.cgray
  3 +%p.pull-right.cgray
4 4 This commit has
5 5 %span.cgreen #{@commit.stats.additions} additions
6 6 and
... ...
app/views/commits/_commit_box.html.haml
  Diff comments   View file @e2fb18a
1 1 .ui-box.ui-box-show
2 2 .ui-box-head
3   - .right
  3 + .pull-right
4 4 - if @notes_count > 0
5 5 %span.btn.disabled.grouped
6 6 %i.icon-comment
... ...
app/views/commits/_diffs.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -25,7 +25,7 @@
25 25 %span= diff.old_path
26 26  
27 27 - if @commit.prev_commit
28   - = link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn right view-file'} do
  28 + = link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn pull-right view-file'} do
29 29 View file @
30 30 %span.commit-short-id= @commit.short_id(6)
31 31 - else
... ... @@ -33,7 +33,7 @@
33 33 - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
34 34 %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
35 35  
36   - = link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny right view-file'} do
  36 + = link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do
37 37 View file @
38 38 %span.commit-short-id= @commit.short_id(6)
39 39  
... ...
app/views/commits/_head.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -22,7 +22,7 @@
22 22  
23 23  
24 24 - if current_controller?(:commits) && current_user.private_token
25   - %li.right
  25 + %li.pull-right
26 26 %span.rss-icon
27 27 = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
28 28 = image_tag "rss_ui.png", title: "feed"
... ...
app/views/dashboard/_filter.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -25,9 +25,9 @@
25 25 %li{class: ("active" if params[:project_id] == project.id.to_s)}
26 26 = link_to dashboard_filter_path(entity, project_id: project.id) do
27 27 = project.name_with_namespace
28   - %small.right= entities_per_project(project, entity)
  28 + %small.pull-right= entities_per_project(project, entity)
29 29  
30 30 %fieldset
31 31 %hr
32   - = link_to "Reset", dashboard_filter_path(entity), class: 'btn right'
  32 + = link_to "Reset", dashboard_filter_path(entity), class: 'btn pull-right'
33 33  
... ...
app/views/dashboard/_groups.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -4,7 +4,7 @@
4 4 %small
5 5 (#{groups.count})
6 6 - if current_user.can_create_group?
7   - %span.right
  7 + %span.pull-right
8 8 = link_to new_group_path, class: "btn btn-tiny info" do
9 9 %i.icon-plus
10 10 New Group
... ... @@ -13,6 +13,6 @@
13 13 %li
14 14 = link_to group_path(id: group.path), class: dom_class(group) do
15 15 %strong.well-title= truncate(group.name, length: 35)
16   - %span.right.light
  16 + %span.pull-right.light
17 17 - if group.owner == current_user
18 18 %i.icon-wrench
... ...
app/views/dashboard/_projects.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -4,7 +4,7 @@
4 4 %small
5 5 (#{@projects_count})
6 6 - if current_user.can_create_project?
7   - %span.right
  7 + %span.pull-right
8 8 = link_to new_project_path, class: "btn btn-tiny info" do
9 9 %i.icon-plus
10 10 New Project
... ...
app/views/dashboard/_teams.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -3,7 +3,7 @@
3 3 Teams
4 4 %small
5 5 (#{@teams.count})
6   - %span.right
  6 + %span.pull-right
7 7 = link_to new_team_path, class: "btn btn-tiny info" do
8 8 %i.icon-plus
9 9 New Team
... ... @@ -12,7 +12,7 @@
12 12 %li
13 13 = link_to team_path(id: team.path), class: dom_class(team) do
14 14 %strong.well-title= truncate(team.name, length: 35)
15   - %span.right.light
  15 + %span.pull-right.light
16 16 - if team.owner == current_user
17 17 %i.icon-wrench
18 18 - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
... ...
app/views/dashboard/issues.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 Issues
3 3 %small (assigned to you)
4   - %small.right #{@issues.total_count} issues
  4 + %small.pull-right #{@issues.total_count} issues
5 5  
6 6 %hr
7 7  
... ...
app/views/dashboard/merge_requests.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 Merge Requests
3 3 %small (authored by or assigned to you)
4   - %small.right #{@merge_requests.total_count} merge requests
  4 + %small.pull-right #{@merge_requests.total_count} merge requests
5 5  
6 6 %hr
7 7 .row
... ...
app/views/dashboard/projects.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -3,7 +3,7 @@
3 3 %span
4 4 (#{@projects.total_count})
5 5 - if current_user.can_create_project?
6   - %span.right
  6 + %span.pull-right
7 7 = link_to new_project_path, class: "btn btn-tiny info" do
8 8 %i.icon-plus
9 9 New Project
... ... @@ -42,7 +42,7 @@
42 42 %small.light
43 43 %strong Last activity:
44 44 %span= project_last_activity(project)
45   - .right.light
  45 + .pull-right.light
46 46 - if project.owner == current_user
47 47 %i.icon-wrench
48 48 - tm = project.team.get_tm(current_user.id)
... ...
app/views/deploy_keys/_show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -8,5 +8,5 @@
8 8 = time_ago_in_words(key.created_at)
9 9 ago
10 10 %td
11   - = link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small right"
  11 + = link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
12 12  
... ...
app/views/deploy_keys/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -10,5 +10,5 @@
10 10 ← To keys list
11 11 %hr
12 12 %pre= @key.key
13   -.right
  13 +.pull-right
14 14 = link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
... ...
app/views/devise/passwords/edit.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -9,4 +9,4 @@
9 9 = f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
10 10 %div
11 11 = f.submit "Change my password", class: "btn btn-primary"
12   - .right= render partial: "devise/shared/links"
  12 + .pull-right= render partial: "devise/shared/links"
... ...
app/views/devise/sessions/_new_ldap.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -25,5 +25,5 @@
25 25 %span Remember me
26 26 %br/
27 27 = f.submit "Sign in", :class => "btn-primary btn"
28   - .right
  28 + .pull-right
29 29 = render :partial => "devise/shared/links"
... ...
app/views/devise/sessions/new.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -12,7 +12,7 @@
12 12 %span Remember me
13 13 %br/
14 14 = f.submit "Sign in", :class => "btn-primary btn wide"
15   - .right
  15 + .pull-right
16 16 = link_to "Forgot your password?", new_password_path(resource_name), :class => "btn"
17 17 %br/
18 18 %br/
... ...
app/views/events/_event.html.haml
  Diff comments   View file @e2fb18a
1 1 - if event.proper?
2 2 %div.event-item
3   - %span.cgray.right
  3 + %span.cgray.pull-right
4 4 #{time_ago_in_words(event.created_at)} ago.
5 5  
6 6 = image_tag gravatar_icon(event.author_email), class: "avatar s24"
... ...
app/views/groups/_filter.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -25,9 +25,9 @@
25 25 %li{class: ("active" if params[:project_id] == project.id.to_s)}
26 26 = link_to group_filter_path(entity, project_id: project.id) do
27 27 = project.name_with_namespace
28   - %small.right= entities_per_project(project, entity)
  28 + %small.pull-right= entities_per_project(project, entity)
29 29  
30 30 %fieldset
31 31 %hr
32   - = link_to "Reset", group_filter_path(entity), class: 'btn right'
  32 + = link_to "Reset", group_filter_path(entity), class: 'btn pull-right'
33 33  
... ...
app/views/groups/_people_filter.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -6,9 +6,9 @@
6 6 %li{class: ("active" if params[:project_id] == project.id.to_s)}
7 7 = link_to people_group_path(@group, project_id: project.id) do
8 8 = project.name_with_namespace
9   - %small.right= project.users.count
  9 + %small.pull-right= project.users.count
10 10  
11 11 %fieldset
12 12 %hr
13   - = link_to "Reset", people_group_path(@group), class: 'btn right'
  13 + = link_to "Reset", people_group_path(@group), class: 'btn pull-right'
14 14  
... ...
app/views/groups/_projects.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -4,7 +4,7 @@
4 4 %small
5 5 (#{projects.count})
6 6 - if can? current_user, :manage_group, @group
7   - %span.right
  7 + %span.pull-right
8 8 = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do
9 9 %i.icon-plus
10 10 New Project
... ...
app/views/groups/issues.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 Issues
3 3 %small (assigned to you)
4   - %small.right #{@issues.total_count} issues
  4 + %small.pull-right #{@issues.total_count} issues
5 5  
6 6 %hr
7 7 .row
... ...
app/views/groups/merge_requests.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 Merge Requests
3 3 %small (authored by or assigned to you)
4   - %small.right #{@merge_requests.total_count} merge requests
  4 + %small.pull-right #{@merge_requests.total_count} merge requests
5 5  
6 6 %hr
7 7 .row
... ...
app/views/groups/people.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -16,5 +16,5 @@
16 16 %strong= user.name
17 17 %span.cgray= user.email
18 18 - if @group.owner == user
19   - %span.btn.btn-small.disabled.right Group Owner
  19 + %span.btn.btn-small.disabled.pull-right Group Owner
20 20  
... ...
app/views/help/_layout.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -30,5 +30,5 @@
30 30 %li
31 31 %strong= link_to "Public Access", help_public_access_path
32 32  
33   - .span9.right
  33 + .span9.pull-right
34 34 = yield
... ...
app/views/help/index.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 GITLAB
3   - .right
  3 + .pull-right
4 4 %span= Gitlab::Version
5 5 %small= Gitlab::Revision
6 6 %hr
... ...
app/views/hooks/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -37,6 +37,6 @@
37 37 →
38 38 %span.monospace= hook.url
39 39 %td
40   - .right
  40 + .pull-right
41 41 = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
42 42 = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small grouped"
... ...
app/views/issues/_filter.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -16,5 +16,5 @@
16 16  
17 17 %fieldset
18 18 %hr
19   - = link_to "Reset", project_issues_path(@project), class: 'btn right'
  19 + = link_to "Reset", project_issues_path(@project), class: 'btn pull-right'
20 20  
... ...
app/views/issues/_head.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -5,7 +5,7 @@
5 5 = link_to 'Milestones', project_milestones_path(@project), class: "tab"
6 6 = nav_link(controller: :labels) do
7 7 = link_to 'Labels', project_labels_path(@project), class: "tab"
8   - %li.right
  8 + %li.pull-right
9 9 %span.rss-icon
10 10 = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
11 11 = image_tag "rss_ui.png", title: "feed"
... ...
app/views/issues/_issues.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -4,7 +4,7 @@
4 4 - if @issues.present?
5 5 %li.bottom
6 6 .left= paginate @issues, remote: true, theme: "gitlab"
7   - .right
  7 + .pull-right
8 8 %span.issue_counter #{@issues.total_count}
9 9 issues for this filter
10 10 - else
... ...
app/views/issues/_show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -2,7 +2,7 @@
2 2 - if controller.controller_name == 'issues'
3 3 .issue_check
4 4 = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
5   - .right
  5 + .pull-right
6 6 - if issue.notes.any?
7 7 %span.btn.btn-small.disabled.grouped
8 8 %i.icon-comment
... ...
app/views/issues/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -3,16 +3,16 @@
3 3 %h3.page_title
4 4 Issues
5 5 %span (<span class=issue_counter>#{@issues.total_count}</span>)
6   - .right
  6 + .pull-right
7 7 .span5
8 8 - if can? current_user, :write_issue, @project
9   - = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "right btn btn-primary", title: "New Issue", id: "new_issue_link" do
  9 + = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-primary pull-right", title: "New Issue", id: "new_issue_link" do
10 10 %i.icon-plus
11 11 New Issue
12   - = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do
  12 + = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right' do
13 13 = hidden_field_tag :project_id, @project.id, { id: 'project_id' }
14 14 = hidden_field_tag :status, params[:status]
15   - = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 right neib search-text-input' }
  15 + = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 pull-right neib search-text-input' }
16 16  
17 17 .clearfix
18 18  
... ...
app/views/issues/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -5,7 +5,7 @@
5 5 created at
6 6 = @issue.created_at.stamp("Aug 21, 2011")
7 7  
8   - %span.right
  8 + %span.pull-right
9 9 - if can?(current_user, :admin_project, @project) || @issue.author == current_user
10 10 - if @issue.closed
11 11 = link_to 'Reopen', project_issue_path(@project, @issue, issue: {closed: false }, status_only: true), method: :put, class: "btn grouped reopen_issue"
... ... @@ -16,7 +16,7 @@
16 16 %i.icon-edit
17 17 Edit
18 18  
19   -.right
  19 +.pull-right
20 20 .span3#votes= render 'votes/votes_block', votable: @issue
21 21  
22 22 .back_link
... ... @@ -42,7 +42,7 @@
42 42 %cite.cgray and attached to milestone
43 43 %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
44 44  
45   - .right
  45 + .pull-right
46 46 - @issue.labels.each do |label|
47 47 %span.label
48 48 %i.icon-tag
... ...
app/views/kaminari/admin/_paginator.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -10,7 +10,7 @@
10 10 %ul
11 11 = prev_page_tag unless current_page.first?
12 12 - each_page do |page|
13   - - if page.left_outer? || page.right_outer? || page.inside_window?
  13 + - if page.left_outer? || page.pull-right_outer? || page.inside_window?
14 14 = page_tag page
15 15 - elsif !page.was_truncated?
16 16 = gap_tag
... ...
app/views/kaminari/gitlab/_paginator.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -9,7 +9,7 @@
9 9 %nav.gitlab_pagination
10 10 = prev_page_tag
11 11 - each_page do |page|
12   - - if page.left_outer? || page.right_outer? || page.inside_window?
  12 + - if page.left_outer? || page.pull-right_outer? || page.inside_window?
13 13 = page_tag page
14 14 - elsif !page.was_truncated?
15 15 = gap_tag
... ...
app/views/keys/_show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -8,5 +8,5 @@
8 8 = time_ago_in_words(key.created_at)
9 9 ago
10 10 %td
11   - = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key right"
  11 + = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key pull-right"
12 12  
... ...
app/views/keys/index.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 SSH Keys
3   - = link_to "Add new", new_key_path, class: "btn right"
  3 + = link_to "Add new", new_key_path, class: "btn pull-right"
4 4  
5 5 %hr
6 6 %p.slead
... ...
app/views/keys/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -10,5 +10,5 @@
10 10 %hr
11 11  
12 12 %pre= @key.key
13   -.right
  13 +.pull-right
14 14 = link_to 'Remove', @key, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key"
... ...
app/views/labels/_label.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -2,7 +2,7 @@
2 2 %strong
3 3 %i.icon-tag
4 4 = label.name
5   - .right
  5 + .pull-right
6 6 = link_to project_issues_path(label_name: label.name) do
7 7 %strong
8 8 = pluralize(label.count, 'issue')
... ...
app/views/merge_requests/_filter.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -16,5 +16,5 @@
16 16  
17 17 %fieldset
18 18 %hr
19   - = link_to "Reset", project_merge_requests_path(@project), class: 'btn right'
  19 + = link_to "Reset", project_merge_requests_path(@project), class: 'btn pull-right'
20 20  
... ...
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @e2fb18a
1 1 %li{ class: mr_css_classes(merge_request) }
2   - .right
  2 + .pull-right
3 3 .left
4 4 - if merge_request.merged?
5 5 %span.btn.btn-small.disabled.grouped
... ...
app/views/merge_requests/index.html.haml
  Diff comments   View file @e2fb18a
1 1 - if can? current_user, :write_merge_request, @project
2   - = link_to new_project_merge_request_path(@project), class: "right btn btn-primary", title: "New Merge Request" do
  2 + = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
3 3 %i.icon-plus
4 4 New Merge Request
5 5 %h3.page_title
... ... @@ -28,8 +28,8 @@
28 28 - if @merge_requests.present?
29 29 %li.bottom
30 30 .left= paginate @merge_requests, theme: "gitlab"
31   - .right
32   - %span.cgray.right #{@merge_requests.total_count} merge requests for this filter
  31 + .pull-right
  32 + %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
33 33  
34 34 :javascript
35 35 $(merge_requestsPage);
... ...
app/views/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -5,7 +5,7 @@
5 5 &rarr;
6 6 %span.label_branch= @merge_request.target_branch
7 7  
8   - %span.right
  8 + %span.pull-right
9 9 - if can?(current_user, :modify_merge_request, @merge_request)
10 10 - if @merge_request.open?
11 11 .left.btn-group
... ... @@ -23,7 +23,7 @@
23 23 %i.icon-edit
24 24 Edit
25 25  
26   -.right
  26 +.pull-right
27 27 .span3#votes= render 'votes/votes_block', votable: @merge_request
28 28  
29 29 .back_link
... ...
app/views/milestones/_milestone.html.haml
  Diff comments   View file @e2fb18a
1 1 %li{class: "milestone milestone-#{milestone.closed ? 'closed' : 'open'}", id: dom_id(milestone) }
2   - .right
  2 + .pull-right
3 3 - if can?(current_user, :admin_milestone, milestone.project) and milestone.open?
4 4 = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
5 5 %i.icon-edit
... ...
app/views/milestones/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -3,7 +3,7 @@
3 3 %h3.page_title
4 4 Milestones
5 5 - if can? current_user, :admin_milestone, @project
6   - = link_to "New Milestone", new_project_milestone_path(@project), class: "right btn btn-small", title: "New Milestone"
  6 + = link_to "New Milestone", new_project_milestone_path(@project), class: "pull-right btn btn-small", title: "New Milestone"
7 7 %br
8 8 %div.ui-box
9 9 .title
... ...
app/views/milestones/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -8,7 +8,7 @@
8 8 = link_to project_milestones_path(@project) do
9 9 &larr; To milestones list
10 10 .span6
11   - .right
  11 + .pull-right
12 12 - unless @milestone.closed
13 13 = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
14 14 %i.icon-plus
... ... @@ -43,7 +43,7 @@
43 43 #{@milestone.closed_items_count} closed
44 44 &ndash;
45 45 #{@milestone.open_items_count} open
46   - %span.right= @milestone.expires_at
  46 + %span.pull-right= @milestone.expires_at
47 47 .progress.progress-info
48 48 .bar{style: "width: #{@milestone.percent_complete}%;"}
49 49  
... ...
app/views/notes/_form.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -19,7 +19,7 @@
19 19 = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
20 20 %a.btn.grouped.js-close-discussion-note-form Cancel
21 21 .hint
22   - .right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
  22 + .pull-right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
23 23 .clearfix
24 24  
25 25 .note_options
... ...
app/views/notes/_note.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -30,7 +30,7 @@
30 30 - if note.attachment.url
31 31 - if note.attachment.image?
32 32 = image_tag note.attachment.url, class: 'note-image-attach'
33   - .attachment.right
  33 + .attachment.pull-right
34 34 = link_to note.attachment.url, target: "_blank" do
35 35 %i.icon-attachment
36 36 = note.attachment_identifier
... ...
app/views/profiles/account.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -12,7 +12,7 @@
12 12 %fieldset
13 13 %legend
14 14 Private token
15   - %span.cred.right
  15 + %span.cred.pull-right
16 16 keep it secret!
17 17 .padded
18 18 = form_for @user, url: reset_private_token_profile_path, method: :put do |f|
... ... @@ -56,7 +56,7 @@
56 56 %fieldset.update-username
57 57 %legend
58 58 Username
59   - %small.cred.right
  59 + %small.cred.pull-right
60 60 Changing your username can have unintended side effects!
61 61 = form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
62 62 .padded
... ...
app/views/profiles/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -6,7 +6,7 @@
6 6 %small
7 7 = @user.email
8 8  
9   - .right
  9 + .pull-right
10 10 = link_to destroy_user_session_path, class: "logout", method: :delete do
11 11 %small
12 12 %i.icon-signout
... ... @@ -46,7 +46,7 @@
46 46 = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
47 47 %span.help-block Tell us about yourself in fewer than 250 characters.
48 48  
49   - .span5.right
  49 + .span5.pull-right
50 50 %fieldset.tips
51 51 %legend Tips:
52 52 %ul
... ... @@ -76,7 +76,7 @@
76 76 %fieldset
77 77 %legend
78 78 Personal projects:
79   - %small.right
  79 + %small.pull-right
80 80 %span= current_user.personal_projects.count
81 81 of
82 82 %span= current_user.projects_limit
... ... @@ -87,7 +87,7 @@
87 87 %fieldset
88 88 %legend
89 89 SSH public keys:
90   - %span.right
  90 + %span.pull-right
91 91 = link_to pluralize(current_user.keys.count, 'key'), keys_path
92 92 .padded
93 93 = link_to "Add Public Key", new_key_path, class: "btn btn-small"
... ...
app/views/projects/_clone_panel.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -2,8 +2,8 @@
2 2 .row
3 3 .span7
4 4 .form-horizontal= render "shared/clone_panel"
5   - .span4.right
6   - .right
  5 + .span4.pull-right
  6 + .pull-right
7 7 - unless @project.empty_repo?
8 8 - if can? current_user, :download_code, @project
9 9 = link_to archive_project_repository_path(@project), class: "btn-small btn grouped" do
... ...
app/views/projects/_form.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -81,5 +81,5 @@
81 81 = link_to 'Cancel', @project, class: "btn"
82 82 - unless @project.new_record?
83 83 - if can?(current_user, :remove_project, @project)
84   - .right
  84 + .pull-right
85 85 = link_to 'Remove Project', @project, confirm: 'Removed project can not be restored! Are you sure?', method: :delete, class: "btn btn-remove"
... ...
app/views/projects/empty.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -31,4 +31,4 @@
31 31  
32 32 - if can? current_user, :remove_project, @project
33 33 .prepend-top-20
34   - = link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove right"
  34 + = link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove pull-right"
... ...
app/views/public/projects/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -9,7 +9,7 @@
9 9 %h5
10 10 %i.icon-share
11 11 = project.name_with_namespace
12   - .right
  12 + .pull-right
13 13 %pre.dark.tiny git clone #{project.http_url_to_repo}
14 14  
15 15  
... ...
app/views/repositories/_feed.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -15,6 +15,6 @@
15 15 = image_tag gravatar_icon(commit.author_email), class: "", width: 16
16 16 = gfm escape_once(truncate(commit.title, length: 40))
17 17 %td
18   - %span.right.cgray
  18 + %span.pull-right.cgray
19 19 = time_ago_in_words(commit.committed_date)
20 20 ago
... ...
app/views/repositories/stats.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -23,7 +23,7 @@
23 23 = image_tag gravatar_icon(author.email, 16), class: 'avatar s16'
24 24 = author.name
25 25 %small.light= author.email
26   - .right
  26 + .pull-right
27 27 = author.commits
28 28  
29 29  
... ...
app/views/services/_gitlab_ci.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 GitLab CI
3 3 %small Continuous integration server from GitLab
4   - .right
  4 + .pull-right
5 5 - if @service.active
6 6 %small.cgreen Enabled
7 7 - else
... ...
app/views/services/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -8,7 +8,7 @@
8 8 = link_to edit_project_service_path(@project, :gitlab_ci) do
9 9 GitLab CI
10 10 %small Continuous integration server from GitLab
11   - .right
  11 + .pull-right
12 12 - if @gitlab_ci_service.try(:active)
13 13 %small.cgreen
14 14 %i.icon-ok
... ... @@ -21,11 +21,11 @@
21 21 %h4
22 22 Jenkins CI
23 23 %small An extendable open source continuous integration server
24   - .right
  24 + .pull-right
25 25 %small Not implemented yet
26 26 %li.disabled
27 27 %h4
28 28 Campfire
29 29 %small Web-based group chat tool
30   - .right
  30 + .pull-right
31 31 %small Not implemented yet
... ...
app/views/snippets/_form.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -30,7 +30,7 @@
30 30 = f.submit 'Save', class: "btn-save btn"
31 31 = link_to "Cancel", project_snippets_path(@project), class: " btn"
32 32 - unless @snippet.new_record?
33   - .right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
  33 + .pull-right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
34 34  
35 35  
36 36 :javascript
... ...
app/views/snippets/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -5,7 +5,7 @@
5 5 %small share code pastes with others out of git repository
6 6  
7 7 - if can? current_user, :write_snippet, @project
8   - = link_to new_project_snippet_path(@project), class: "btn btn-small add_new right", title: "New Snippet" do
  8 + = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
9 9 Add new snippet
10 10 %br
11 11 %table
... ...
app/views/snippets/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -4,7 +4,7 @@
4 4 = @snippet.title
5 5 %small= @snippet.file_name
6 6 - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
7   - = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small right"
  7 + = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right"
8 8  
9 9 %br
10 10 %div= render 'blob'
... ...
app/views/team_members/_show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -10,12 +10,12 @@
10 10 %br
11 11 %small.cgray= user.email
12 12  
13   - .span5.right
  13 + .span5.pull-right
14 14 - if allow_admin
15 15 .left
16 16 = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
17 17 = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2"
18   - .right
  18 + .pull-right
19 19 - if current_user == user
20 20 %span.btn.disabled This is you!
21 21 - if @project.namespace_owner == user
... ...
app/views/team_members/_show_team.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -7,8 +7,8 @@
7 7 %br
8 8 %small.cgray Members: #{team.members.count}
9 9  
10   - .span5.right
11   - .right
  10 + .span5.pull-right
  11 + .pull-right
12 12 - if allow_admin
13 13 .left
14 14 = link_to resign_project_team_path(@project, team), method: :delete, confirm: "Are you shure?", class: "btn btn-remove small" do
... ...
app/views/team_members/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -7,7 +7,7 @@
7 7 %strong= link_to "here", help_permissions_path, class: "vlink"
8 8  
9 9 - if can? current_user, :admin_team_member, @project
10   - %span.right
  10 + %span.pull-right
11 11 = link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
12 12 Import team from another project
13 13 = link_to available_project_teams_path(@project), class: "btn btn-small grouped", title: "Assign project to team of users" do
... ...
app/views/team_members/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -2,7 +2,7 @@
2 2  
3 3 .team_member_show
4 4 - if can? current_user, :admin_project, @project
5   - = link_to 'Remove from team', project_team_member_path(@project, @member), confirm: 'Are you sure?', method: :delete, class: "right btn btn-remove"
  5 + = link_to 'Remove from team', project_team_member_path(@project, @member), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove pull-right"
6 6 .profile_avatar_holder
7 7 = image_tag gravatar_icon(@member.email, 60), class: "borders"
8 8 %h3.page_title
... ...
app/views/teams/_filter.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -25,9 +25,9 @@
25 25 %li{class: ("active" if params[:project_id] == project.id.to_s)}
26 26 = link_to team_filter_path(entity, project_id: project.id) do
27 27 = project.name_with_namespace
28   - %small.right= entities_per_project(project, entity)
  28 + %small.pull-right= entities_per_project(project, entity)
29 29  
30 30 %fieldset
31 31 %hr
32   - = link_to "Reset", team_filter_path(entity), class: 'btn right'
  32 + = link_to "Reset", team_filter_path(entity), class: 'btn pull-right'
33 33  
... ...
app/views/teams/_projects.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -4,7 +4,7 @@
4 4 %small
5 5 (#{projects.count})
6 6 - if can? current_user, :manage_user_team, @team
7   - %span.right
  7 + %span.pull-right
8 8 = link_to new_team_project_path(@team), class: "btn btn-tiny info" do
9 9 %i.icon-plus
10 10 Assign Project
... ...
app/views/teams/issues.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 Issues
3 3 %small (in Team projects assigned to Team members)
4   - %small.right #{@issues.total_count} issues
  4 + %small.pull-right #{@issues.total_count} issues
5 5  
6 6 %hr
7 7 .row
... ...
app/views/teams/members/_show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -10,7 +10,7 @@
10 10 %br
11 11 %small.cgray= user.email
12 12  
13   - .span6.right
  13 + .span6.pull-right
14 14 - if allow_admin
15 15 .left.span2
16 16 = form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f|
... ... @@ -19,7 +19,7 @@
19 19 %span
20 20 = check_box_tag :group_admin, true, @team.admin?(user)
21 21 Admin access
22   - .right
  22 + .pull-right
23 23 - if current_user == user
24 24 %span.btn.disabled This is you!
25 25 - if @team.owner == user
... ...
app/views/teams/members/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -6,7 +6,7 @@
6 6 %strong= link_to "here", help_permissions_path, class: "vlink"
7 7  
8 8 - if can? current_user, :manage_user_team, @team
9   - %span.right
  9 + %span.pull-right
10 10 = link_to new_team_member_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do
11 11 New Team Member
12 12 %hr
... ...
app/views/teams/members/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -3,7 +3,7 @@
3 3  
4 4 .team_member_show
5 5 - if can? current_user, :admin_project, @project
6   - = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "right btn btn-remove"
  6 + = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "pull-right btn btn-remove"
7 7 .profile_avatar_holder
8 8 = image_tag gravatar_icon(user.email, 60), class: "borders"
9 9 %h3.page_title
... ...
app/views/teams/merge_requests.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 Merge Requests
3 3 %small (authored by or assigned to Team members)
4   - %small.right #{@merge_requests.total_count} merge requests
  4 + %small.pull-right #{@merge_requests.total_count} merge requests
5 5  
6 6 %hr
7 7 .row
... ...
app/views/teams/projects/index.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -5,7 +5,7 @@
5 5 %strong= link_to "here", help_permissions_path, class: "vlink"
6 6  
7 7 - if current_user.can?(:manage_user_team, @team) && @avaliable_projects.any?
8   - %span.right
  8 + %span.pull-right
9 9 = link_to new_team_project_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do
10 10 Assign project to Team
11 11  
... ...
app/views/tree/_head.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -3,5 +3,5 @@
3 3 = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: @path}
4 4 = nav_link(controller: :tree) do
5 5 = link_to 'Source', project_tree_path(@project, @ref)
6   - %li.right
  6 + %li.pull-right
7 7 = render "shared/clone_panel"
... ...
app/views/tree/_tree.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -24,7 +24,7 @@
24 24 %th Name
25 25 %th Last Update
26 26 %th Last Commit
27   - %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny right"
  27 + %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right"
28 28  
29 29 - if tree.up_dir?
30 30 %tr.tree-item
... ...
app/views/users/_profile.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -4,20 +4,20 @@
4 4 %ul.well-list
5 5 %li
6 6 %strong Email
7   - %span.right= mail_to @user.email
  7 + %span.pull-right= mail_to @user.email
8 8 - unless @user.skype.blank?
9 9 %li
10 10 %strong Skype
11   - %span.right= @user.skype
  11 + %span.pull-right= @user.skype
12 12 - unless @user.linkedin.blank?
13 13 %li
14 14 %strong LinkedIn
15   - %span.right= @user.linkedin
  15 + %span.pull-right= @user.linkedin
16 16 - unless @user.twitter.blank?
17 17 %li
18 18 %strong Twitter
19   - %span.right= @user.twitter
  19 + %span.pull-right= @user.twitter
20 20 - unless @user.bio.blank?
21 21 %li
22 22 %strong Bio
23   - %span.right= @user.bio
  23 + %span.pull-right= @user.bio
... ...
app/views/users/_projects.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -9,7 +9,7 @@
9 9 \/
10 10 %strong.well-title
11 11 = truncate(project.name, length: 45)
12   - %span.right.light
  12 + %span.pull-right.light
13 13 - if project.owner == @user
14 14 %i.icon-wrench
15 15 - tm = project.team.get_tm(@user.id)
... ...
app/views/users/show.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -4,7 +4,7 @@
4 4 = image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
5 5 = @user.name
6 6 - if @user == current_user
7   - .right
  7 + .pull-right
8 8 = link_to profile_path, class: 'btn btn-small' do
9 9 %i.icon-edit
10 10 Edit Profile
... ...
app/views/wikis/edit.html.haml
  Diff comments   View file @e2fb18a
... ... @@ -2,7 +2,7 @@
2 2 %hr
3 3 = render 'form'
4 4  
5   -.right
  5 +.pull-right
6 6 - if can? current_user, :admin_wiki, @project
7 7 = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn btn-small btn-remove" do
8 8 Delete this page
9 9 \ No newline at end of file
... ...
app/views/wikis/show.html.haml
  Diff comments   View file @e2fb18a
1 1 %h3.page_title
2 2 = @wiki.title
3   - %span.right
  3 + %span.pull-right
4 4 = link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do
5 5 Pages
6 6 - if can? current_user, :write_wiki, @project
... ...