deac
/
gitlabhq
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace right with pull-right

4-2-stable
Dmitriy Zaporozhets 2013-01-30 16:40:43 +02:00
parent 7ba4f2dcfa
commit e2fb18a3ec
96 changed files with 143 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View File

@ -95,7 +95,7 @@
form {
margin-bottom: 0;
margin-top: 3px;
margin-top: 0;
}
.btn-tiny {

1
app/assets/stylesheets/gitlab_bootstrap/common.scss
View File

@ -9,7 +9,6 @@
/** COMMON CLASSES **/
.left { float:left }
.right { float:right!important }
.append-bottom-10 { margin-bottom:10px }
.append-bottom-20 { margin-bottom:20px }
.prepend-top-10 { margin-top:10px }

2
app/assets/stylesheets/sections/events.scss
View File

@ -127,7 +127,7 @@
.btn-new-mr {
@extend .btn-info;
@extend .small;
@extend .right;
@extend .pull-right;
margin: -3px;
}
}

4
app/assets/stylesheets/sections/notes.scss
View File

@ -258,7 +258,7 @@ ul.notes {
}
.attachment {
@extend .right;
@extend .pull-right;
position: relative;
width: 350px;
height: 50px;
@ -274,7 +274,7 @@ ul.notes {
}
}
.notify_options {
@extend .right;
@extend .pull-right;
}
}
.note_text_and_preview {

2
app/assets/stylesheets/sections/projects.scss
View File

@ -4,7 +4,7 @@
}
.side {
@extend .right;
@extend .pull-right;
.projects_box {
> .title {

16
app/views/admin/dashboard/index.html.haml
View File

@ -31,7 +31,7 @@
- @projects.each do |project|
%p
= link_to project.name_with_namespace, [:admin, project]
%span.light.right
%span.light.pull-right
= time_ago_in_words project.created_at
ago
@ -42,7 +42,7 @@
%p
= link_to [:admin, user] do
= user.name
%span.light.right
%span.light.pull-right
= time_ago_in_words user.created_at
ago
@ -51,25 +51,25 @@
%hr
%p
Issues
%span.light.right
%span.light.pull-right
= Issue.count
%p
Merge Requests
%span.light.right
%span.light.pull-right
= MergeRequest.count
%p
Notes
%span.light.right
%span.light.pull-right
= Note.count
%p
Snippets
%span.light.right
%span.light.pull-right
= Snippet.count
%p
SSH Keys
%span.light.right
%span.light.pull-right
= Key.count
%p
Milestones
%span.light.right
%span.light.pull-right
= Milestone.count

2
app/views/admin/groups/index.html.haml
View File

@ -4,7 +4,7 @@
allows you to keep projects organized.
Use groups for uniting related projects.
= link_to 'New Group', new_admin_group_path, class: "btn btn-small right"
= link_to 'New Group', new_admin_group_path, class: "btn btn-small pull-right"
%br
= form_tag admin_groups_path, method: :get, class: 'form-inline' do
= text_field_tag :name, params[:name], class: "xlarge"

4
app/views/admin/groups/show.html.haml
View File

@ -14,7 +14,7 @@
%td
= @group.name
 
= link_to edit_admin_group_path(@group), class: "btn btn-small right" do
= link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
%i.icon-edit
Rename
%tr
@ -29,7 +29,7 @@
Owner:
%td
= @group.owner_name
.right
.pull-right
= link_to "#", class: "btn btn-small change-owner-link" do
%i.icon-edit
Change owner

4
app/views/admin/hooks/index.html.haml
View File

@ -33,7 +33,7 @@
%td
= link_to admin_hook_path(hook) do
%strong= hook.url
= link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small right"
= link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small pull-right"
%td POST
%td
= link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small right"
= link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small pull-right"

8
app/views/admin/logs/show.html.haml
View File

@ -15,7 +15,7 @@
.file_title
%i.icon-file
githost.log
.right
.pull-right
= link_to '#', class: 'log-bottom' do
%i.icon-arrow-down
Scroll down
@ -29,7 +29,7 @@
.file_title
%i.icon-file
application.log
.right
.pull-right
= link_to '#', class: 'log-bottom' do
%i.icon-arrow-down
Scroll down
@ -43,7 +43,7 @@
.file_title
%i.icon-file
production.log
.right
.pull-right
= link_to '#', class: 'log-bottom' do
%i.icon-arrow-down
Scroll down
@ -57,7 +57,7 @@
.file_title
%i.icon-file
sidekiq.log
.right
.pull-right
= link_to '#', class: 'log-bottom' do
%i.icon-arrow-down
Scroll down

4
app/views/admin/projects/index.html.haml
View File

@ -1,6 +1,6 @@
%h3.page_title
Projects
= link_to 'New Project', new_project_path, class: "btn btn-small right"
= link_to 'New Project', new_project_path, class: "btn btn-small pull-right"
%hr
@ -51,7 +51,7 @@
- else
%i.icon-lock.cgreen
= link_to project.name_with_namespace, [:admin, project]
.right
.pull-right
= link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
= link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
- if @projects.blank?

2
app/views/admin/projects/show.html.haml
View File

@ -1,6 +1,6 @@
%h3.page_title
Project: #{@project.name_with_namespace}
= link_to edit_admin_project_path(@project), class: "btn right" do
= link_to edit_admin_project_path(@project), class: "btn pull-right" do
%i.icon-edit
Edit

2
app/views/admin/teams/index.html.haml
View File

@ -3,7 +3,7 @@
%small
simple Teams description
= link_to 'New Team', new_admin_team_path, class: "btn btn-small right"
= link_to 'New Team', new_admin_team_path, class: "btn btn-small pull-right"
%br
= form_tag admin_teams_path, method: :get, class: 'form-inline' do

8
app/views/admin/teams/show.html.haml
View File

@ -14,7 +14,7 @@
%td
= @team.name
 
= link_to edit_admin_team_path(@team), class: "btn btn-small right" do
= link_to edit_admin_team_path(@team), class: "btn btn-small pull-right" do
%i.icon-edit
Rename
%tr
@ -23,7 +23,7 @@
Owner:
%td
= @team.owner.name
.right
.pull-right
= link_to "#", class: "btn btn-small change-owner-link" do
%i.icon-edit
Change owner
@ -42,7 +42,7 @@
%fieldset
%legend
Members (#{@team.members.count})
%span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary btn-small right", id: :add_members_to_team
%span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary btn-small pull-right", id: :add_members_to_team
- if @team.members.any?
%table#members_list
%thead
@ -67,7 +67,7 @@
%fieldset
%legend
Projects (#{@team.projects.count})
%span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary btn-small right", id: :assign_projects_to_team
%span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary btn-small pull-right", id: :assign_projects_to_team
- if @team.projects.any?
%table#projects_list
%thead

2
app/views/admin/users/index.html.haml
View File

@ -1,6 +1,6 @@
%h3.page_title
Users
= link_to 'New User', new_admin_user_path, class: "btn btn-small right"
= link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right"
%br
= form_tag admin_users_path, method: :get, class: 'form-inline' do

2
app/views/admin/users/show.html.haml
View File

@ -4,7 +4,7 @@
%small Blocked
- if @admin_user.admin
%small Administrator
= link_to edit_admin_user_path(@admin_user), class: "btn right" do
= link_to edit_admin_user_path(@admin_user), class: "btn pull-right" do
%i.icon-edit
Edit

2
app/views/blame/_head.html.haml
View File

@ -3,5 +3,5 @@
= render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
= nav_link(controller: :refs) do
= link_to 'Source', project_tree_path(@project, @ref)
%li.right
%li.pull-right
= render "shared/clone_panel"

2
app/views/commit/show.html.haml
View File

@ -1,6 +1,6 @@
= render "commits/commit_box"
%p.right.cgray
%p.pull-right.cgray
This commit has
%span.cgreen #{@commit.stats.additions} additions
and

2
app/views/commits/_commit_box.html.haml
View File

@ -1,6 +1,6 @@
.ui-box.ui-box-show
.ui-box-head
.right
.pull-right
- if @notes_count > 0
%span.btn.disabled.grouped
%i.icon-comment

4
app/views/commits/_diffs.html.haml
View File

@ -25,7 +25,7 @@
%span= diff.old_path
- if @commit.prev_commit
= link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn right view-file'} do
= link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn pull-right view-file'} do
View file @
%span.commit-short-id= @commit.short_id(6)
- else
@ -33,7 +33,7 @@
- if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
%span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
= link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny right view-file'} do
= link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do
View file @
%span.commit-short-id= @commit.short_id(6)

2
app/views/commits/_head.html.haml
View File

@ -22,7 +22,7 @@
- if current_controller?(:commits) && current_user.private_token
%li.right
%li.pull-right
%span.rss-icon
= link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
= image_tag "rss_ui.png", title: "feed"

4
app/views/dashboard/_filter.html.haml
View File

@ -25,9 +25,9 @@
%li{class: ("active" if params[:project_id] == project.id.to_s)}
= link_to dashboard_filter_path(entity, project_id: project.id) do
= project.name_with_namespace
%small.right= entities_per_project(project, entity)
%small.pull-right= entities_per_project(project, entity)
%fieldset
%hr
= link_to "Reset", dashboard_filter_path(entity), class: 'btn right'
= link_to "Reset", dashboard_filter_path(entity), class: 'btn pull-right'

4
app/views/dashboard/_groups.html.haml
View File

@ -4,7 +4,7 @@
%small
(#{groups.count})
- if current_user.can_create_group?
%span.right
%span.pull-right
= link_to new_group_path, class: "btn btn-tiny info" do
%i.icon-plus
New Group
@ -13,6 +13,6 @@
%li
= link_to group_path(id: group.path), class: dom_class(group) do
%strong.well-title= truncate(group.name, length: 35)
%span.right.light
%span.pull-right.light
- if group.owner == current_user
%i.icon-wrench

2
app/views/dashboard/_projects.html.haml
View File

@ -4,7 +4,7 @@
%small
(#{@projects_count})
- if current_user.can_create_project?
%span.right
%span.pull-right
= link_to new_project_path, class: "btn btn-tiny info" do
%i.icon-plus
New Project

4
app/views/dashboard/_teams.html.haml
View File

@ -3,7 +3,7 @@
Teams
%small
(#{@teams.count})
%span.right
%span.pull-right
= link_to new_team_path, class: "btn btn-tiny info" do
%i.icon-plus
New Team
@ -12,7 +12,7 @@
%li
= link_to team_path(id: team.path), class: dom_class(team) do
%strong.well-title= truncate(team.name, length: 35)
%span.right.light
%span.pull-right.light
- if team.owner == current_user
%i.icon-wrench
- tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)

2
app/views/dashboard/issues.html.haml
View File

@ -1,7 +1,7 @@
%h3.page_title
Issues
%small (assigned to you)
%small.right #{@issues.total_count} issues
%small.pull-right #{@issues.total_count} issues
%hr

2
app/views/dashboard/merge_requests.html.haml
View File

@ -1,7 +1,7 @@
%h3.page_title
Merge Requests
%small (authored by or assigned to you)
%small.right #{@merge_requests.total_count} merge requests
%small.pull-right #{@merge_requests.total_count} merge requests
%hr
.row

4
app/views/dashboard/projects.html.haml
View File

@ -3,7 +3,7 @@
%span
(#{@projects.total_count})
- if current_user.can_create_project?
%span.right
%span.pull-right
= link_to new_project_path, class: "btn btn-tiny info" do
%i.icon-plus
New Project
@ -42,7 +42,7 @@
%small.light
%strong Last activity:
%span= project_last_activity(project)
.right.light
.pull-right.light
- if project.owner == current_user
%i.icon-wrench
- tm = project.team.get_tm(current_user.id)

2
app/views/deploy_keys/_show.html.haml
View File

@ -8,5 +8,5 @@
= time_ago_in_words(key.created_at)
ago
%td
= 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"
= 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"

2
app/views/deploy_keys/show.html.haml
View File

@ -10,5 +10,5 @@
← To keys list
%hr
%pre= @key.key
.right
.pull-right
= link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"

2
app/views/devise/passwords/edit.html.haml
View File

@ -9,4 +9,4 @@
= f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
%div
= f.submit "Change my password", class: "btn btn-primary"
.right= render partial: "devise/shared/links"
.pull-right= render partial: "devise/shared/links"

2
app/views/devise/sessions/_new_ldap.html.haml
View File

@ -25,5 +25,5 @@
%span Remember me
%br/
= f.submit "Sign in", :class => "btn-primary btn"
.right
.pull-right
= render :partial => "devise/shared/links"

2
app/views/devise/sessions/new.html.haml
View File

@ -12,7 +12,7 @@
%span Remember me
%br/
= f.submit "Sign in", :class => "btn-primary btn wide"
.right
.pull-right
= link_to "Forgot your password?", new_password_path(resource_name), :class => "btn"
%br/
%br/

2
app/views/events/_event.html.haml
View File

@ -1,6 +1,6 @@
- if event.proper?
%div.event-item
%span.cgray.right
%span.cgray.pull-right
#{time_ago_in_words(event.created_at)} ago.
= image_tag gravatar_icon(event.author_email), class: "avatar s24"

4
app/views/groups/_filter.html.haml
View File

@ -25,9 +25,9 @@
%li{class: ("active" if params[:project_id] == project.id.to_s)}
= link_to group_filter_path(entity, project_id: project.id) do
= project.name_with_namespace
%small.right= entities_per_project(project, entity)
%small.pull-right= entities_per_project(project, entity)
%fieldset
%hr
= link_to "Reset", group_filter_path(entity), class: 'btn right'
= link_to "Reset", group_filter_path(entity), class: 'btn pull-right'

4
app/views/groups/_people_filter.html.haml
View File

@ -6,9 +6,9 @@
%li{class: ("active" if params[:project_id] == project.id.to_s)}
= link_to people_group_path(@group, project_id: project.id) do
= project.name_with_namespace
%small.right= project.users.count
%small.pull-right= project.users.count
%fieldset
%hr
= link_to "Reset", people_group_path(@group), class: 'btn right'
= link_to "Reset", people_group_path(@group), class: 'btn pull-right'

2
app/views/groups/_projects.html.haml
View File

@ -4,7 +4,7 @@
%small
(#{projects.count})
- if can? current_user, :manage_group, @group
%span.right
%span.pull-right
= link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do
%i.icon-plus
New Project

2
app/views/groups/issues.html.haml
View File

@ -1,7 +1,7 @@
%h3.page_title
Issues
%small (assigned to you)
%small.right #{@issues.total_count} issues
%small.pull-right #{@issues.total_count} issues
%hr
.row

2
app/views/groups/merge_requests.html.haml
View File

@ -1,7 +1,7 @@
%h3.page_title
Merge Requests
%small (authored by or assigned to you)
%small.right #{@merge_requests.total_count} merge requests
%small.pull-right #{@merge_requests.total_count} merge requests
%hr
.row

2
app/views/groups/people.html.haml
View File

@ -16,5 +16,5 @@
%strong= user.name
%span.cgray= user.email
- if @group.owner == user
%span.btn.btn-small.disabled.right Group Owner
%span.btn.btn-small.disabled.pull-right Group Owner

2
app/views/help/_layout.html.haml
View File

@ -30,5 +30,5 @@
%li
%strong= link_to "Public Access", help_public_access_path
.span9.right
.span9.pull-right
= yield

2
app/views/help/index.html.haml
View File

@ -1,6 +1,6 @@
%h3.page_title
GITLAB
.right
.pull-right
%span= Gitlab::Version
%small= Gitlab::Revision
%hr

2
app/views/hooks/index.html.haml
View File

@ -37,6 +37,6 @@
→
%span.monospace= hook.url
%td
.right
.pull-right
= link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
= link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small grouped"

2
app/views/issues/_filter.html.haml
View File

@ -16,5 +16,5 @@
%fieldset
%hr
= link_to "Reset", project_issues_path(@project), class: 'btn right'
= link_to "Reset", project_issues_path(@project), class: 'btn pull-right'

2
app/views/issues/_head.html.haml
View File

@ -5,7 +5,7 @@
= link_to 'Milestones', project_milestones_path(@project), class: "tab"
= nav_link(controller: :labels) do
= link_to 'Labels', project_labels_path(@project), class: "tab"
%li.right
%li.pull-right
%span.rss-icon
= link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
= image_tag "rss_ui.png", title: "feed"

2
app/views/issues/_issues.html.haml
View File

@ -4,7 +4,7 @@
- if @issues.present?
%li.bottom
.left= paginate @issues, remote: true, theme: "gitlab"
.right
.pull-right
%span.issue_counter #{@issues.total_count}
issues for this filter
- else

2
app/views/issues/_show.html.haml
View File

@ -2,7 +2,7 @@
- if controller.controller_name == 'issues'
.issue_check
= check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
.right
.pull-right
- if issue.notes.any?
%span.btn.btn-small.disabled.grouped
%i.icon-comment

8
app/views/issues/index.html.haml
View File

@ -3,16 +3,16 @@
%h3.page_title
Issues
%span (<span class=issue_counter>#{@issues.total_count}</span>)
.right
.pull-right
.span5
- if can? current_user, :write_issue, @project
= 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
= 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
%i.icon-plus
New Issue
= form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do
= form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right' do
= hidden_field_tag :project_id, @project.id, { id: 'project_id' }
= hidden_field_tag :status, params[:status]
= search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 right neib search-text-input' }
= search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 pull-right neib search-text-input' }
.clearfix

6
app/views/issues/show.html.haml
View File

@ -5,7 +5,7 @@
created at
= @issue.created_at.stamp("Aug 21, 2011")
%span.right
%span.pull-right
- if can?(current_user, :admin_project, @project) || @issue.author == current_user
- if @issue.closed
= 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 @@
%i.icon-edit
Edit
.right
.pull-right
.span3#votes= render 'votes/votes_block', votable: @issue
.back_link
@ -42,7 +42,7 @@
%cite.cgray and attached to milestone
%strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
.right
.pull-right
- @issue.labels.each do |label|
%span.label
%i.icon-tag

2
app/views/kaminari/admin/_paginator.html.haml
View File

@ -10,7 +10,7 @@
%ul
= prev_page_tag unless current_page.first?
- each_page do |page|
- if page.left_outer? || page.right_outer? || page.inside_window?
- if page.left_outer? || page.pull-right_outer? || page.inside_window?
= page_tag page
- elsif !page.was_truncated?
= gap_tag

2
app/views/kaminari/gitlab/_paginator.html.haml
View File

@ -9,7 +9,7 @@
%nav.gitlab_pagination
= prev_page_tag
- each_page do |page|
- if page.left_outer? || page.right_outer? || page.inside_window?
- if page.left_outer? || page.pull-right_outer? || page.inside_window?
= page_tag page
- elsif !page.was_truncated?
= gap_tag

2
app/views/keys/_show.html.haml
View File

@ -8,5 +8,5 @@
= time_ago_in_words(key.created_at)
ago
%td
= link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key right"
= link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key pull-right"

2
app/views/keys/index.html.haml
View File

@ -1,6 +1,6 @@
%h3.page_title
SSH Keys
= link_to "Add new", new_key_path, class: "btn right"
= link_to "Add new", new_key_path, class: "btn pull-right"
%hr
%p.slead

2
app/views/keys/show.html.haml
View File

@ -10,5 +10,5 @@
%hr
%pre= @key.key
.right
.pull-right
= link_to 'Remove', @key, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key"

2
app/views/labels/_label.html.haml
View File

@ -2,7 +2,7 @@
%strong
%i.icon-tag
= label.name
.right
.pull-right
= link_to project_issues_path(label_name: label.name) do
%strong
= pluralize(label.count, 'issue')

2
app/views/merge_requests/_filter.html.haml
View File

@ -16,5 +16,5 @@
%fieldset
%hr
= link_to "Reset", project_merge_requests_path(@project), class: 'btn right'
= link_to "Reset", project_merge_requests_path(@project), class: 'btn pull-right'

2
app/views/merge_requests/_merge_request.html.haml
View File

@ -1,5 +1,5 @@
%li{ class: mr_css_classes(merge_request) }
.right
.pull-right
.left
- if merge_request.merged?
%span.btn.btn-small.disabled.grouped

6
app/views/merge_requests/index.html.haml
View File

@ -1,5 +1,5 @@
- if can? current_user, :write_merge_request, @project
= link_to new_project_merge_request_path(@project), class: "right btn btn-primary", title: "New Merge Request" do
= link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
%i.icon-plus
New Merge Request
%h3.page_title
@ -28,8 +28,8 @@
- if @merge_requests.present?
%li.bottom
.left= paginate @merge_requests, theme: "gitlab"
.right
%span.cgray.right #{@merge_requests.total_count} merge requests for this filter
.pull-right
%span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
:javascript
$(merge_requestsPage);

4
app/views/merge_requests/show/_mr_title.html.haml
View File

@ -5,7 +5,7 @@
&rarr;
%span.label_branch= @merge_request.target_branch
%span.right
%span.pull-right
- if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open?
.left.btn-group
@ -23,7 +23,7 @@
%i.icon-edit
Edit
.right
.pull-right
.span3#votes= render 'votes/votes_block', votable: @merge_request
.back_link

2
app/views/milestones/_milestone.html.haml
View File

@ -1,5 +1,5 @@
%li{class: "milestone milestone-#{milestone.closed ? 'closed' : 'open'}", id: dom_id(milestone) }
.right
.pull-right
- if can?(current_user, :admin_milestone, milestone.project) and milestone.open?
= link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
%i.icon-edit

2
app/views/milestones/index.html.haml
View File

@ -3,7 +3,7 @@
%h3.page_title
Milestones
- if can? current_user, :admin_milestone, @project
= link_to "New Milestone", new_project_milestone_path(@project), class: "right btn btn-small", title: "New Milestone"
= link_to "New Milestone", new_project_milestone_path(@project), class: "pull-right btn btn-small", title: "New Milestone"
%br
%div.ui-box
.title

4
app/views/milestones/show.html.haml
View File

@ -8,7 +8,7 @@
= link_to project_milestones_path(@project) do
&larr; To milestones list
.span6
.right
.pull-right
- unless @milestone.closed
= link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
%i.icon-plus
@ -43,7 +43,7 @@
#{@milestone.closed_items_count} closed
&ndash;
#{@milestone.open_items_count} open
%span.right= @milestone.expires_at
%span.pull-right= @milestone.expires_at
.progress.progress-info
.bar{style: "width: #{@milestone.percent_complete}%;"}

2
app/views/notes/_form.html.haml
View File

@ -19,7 +19,7 @@
= f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
%a.btn.grouped.js-close-discussion-note-form Cancel
.hint
.right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
.pull-right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
.clearfix
.note_options

2
app/views/notes/_note.html.haml
View File

@ -30,7 +30,7 @@
- if note.attachment.url
- if note.attachment.image?
= image_tag note.attachment.url, class: 'note-image-attach'
.attachment.right
.attachment.pull-right
= link_to note.attachment.url, target: "_blank" do
%i.icon-attachment
= note.attachment_identifier

4
app/views/profiles/account.html.haml
View File

@ -12,7 +12,7 @@
%fieldset
%legend
Private token
%span.cred.right
%span.cred.pull-right
keep it secret!
.padded
= form_for @user, url: reset_private_token_profile_path, method: :put do |f|
@ -56,7 +56,7 @@
%fieldset.update-username
%legend
Username
%small.cred.right
%small.cred.pull-right
Changing your username can have unintended side effects!
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
.padded

8
app/views/profiles/show.html.haml
View File

@ -6,7 +6,7 @@
%small
= @user.email
.right
.pull-right
= link_to destroy_user_session_path, class: "logout", method: :delete do
%small
%i.icon-signout
@ -46,7 +46,7 @@
= f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
%span.help-block Tell us about yourself in fewer than 250 characters.
.span5.right
.span5.pull-right
%fieldset.tips
%legend Tips:
%ul
@ -76,7 +76,7 @@
%fieldset
%legend
Personal projects:
%small.right
%small.pull-right
%span= current_user.personal_projects.count
of
%span= current_user.projects_limit
@ -87,7 +87,7 @@
%fieldset
%legend
SSH public keys:
%span.right
%span.pull-right
= link_to pluralize(current_user.keys.count, 'key'), keys_path
.padded
= link_to "Add Public Key", new_key_path, class: "btn btn-small"

4
app/views/projects/_clone_panel.html.haml
View File

@ -2,8 +2,8 @@
.row
.span7
.form-horizontal= render "shared/clone_panel"
.span4.right
.right
.span4.pull-right
.pull-right
- unless @project.empty_repo?
- if can? current_user, :download_code, @project
= link_to archive_project_repository_path(@project), class: "btn-small btn grouped" do

2
app/views/projects/_form.html.haml
View File

@ -81,5 +81,5 @@
= link_to 'Cancel', @project, class: "btn"
- unless @project.new_record?
- if can?(current_user, :remove_project, @project)
.right
.pull-right
= link_to 'Remove Project', @project, confirm: 'Removed project can not be restored! Are you sure?', method: :delete, class: "btn btn-remove"

2
app/views/projects/empty.html.haml
View File

@ -31,4 +31,4 @@
- if can? current_user, :remove_project, @project
.prepend-top-20
= link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove right"
= link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove pull-right"

2
app/views/public/projects/index.html.haml
View File

@ -9,7 +9,7 @@
%h5
%i.icon-share
= project.name_with_namespace
.right
.pull-right
%pre.dark.tiny git clone #{project.http_url_to_repo}

2
app/views/repositories/_feed.html.haml
View File

@ -15,6 +15,6 @@
= image_tag gravatar_icon(commit.author_email), class: "", width: 16
= gfm escape_once(truncate(commit.title, length: 40))
%td
%span.right.cgray
%span.pull-right.cgray
= time_ago_in_words(commit.committed_date)
ago

2
app/views/repositories/stats.html.haml
View File

@ -23,7 +23,7 @@
= image_tag gravatar_icon(author.email, 16), class: 'avatar s16'
= author.name
%small.light= author.email
.right
.pull-right
= author.commits

2
app/views/services/_gitlab_ci.html.haml
View File

@ -1,7 +1,7 @@
%h3.page_title
GitLab CI
%small Continuous integration server from GitLab
.right
.pull-right
- if @service.active
%small.cgreen Enabled
- else

6
app/views/services/index.html.haml
View File

@ -8,7 +8,7 @@
= link_to edit_project_service_path(@project, :gitlab_ci) do
GitLab CI
%small Continuous integration server from GitLab
.right
.pull-right
- if @gitlab_ci_service.try(:active)
%small.cgreen
%i.icon-ok
@ -21,11 +21,11 @@
%h4
Jenkins CI
%small An extendable open source continuous integration server
.right
.pull-right
%small Not implemented yet
%li.disabled
%h4
Campfire
%small Web-based group chat tool
.right
.pull-right
%small Not implemented yet

2
app/views/snippets/_form.html.haml
View File

@ -30,7 +30,7 @@
= f.submit 'Save', class: "btn-save btn"
= link_to "Cancel", project_snippets_path(@project), class: " btn"
- unless @snippet.new_record?
.right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
.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}"
:javascript

2
app/views/snippets/index.html.haml
View File

@ -5,7 +5,7 @@
%small share code pastes with others out of git repository
- if can? current_user, :write_snippet, @project
= link_to new_project_snippet_path(@project), class: "btn btn-small add_new right", title: "New Snippet" do
= link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
Add new snippet
%br
%table

2
app/views/snippets/show.html.haml
View File

@ -4,7 +4,7 @@
= @snippet.title
%small= @snippet.file_name
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
= link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small right"
= link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right"
%br
%div= render 'blob'

4
app/views/team_members/_show.html.haml
View File

@ -10,12 +10,12 @@
%br
%small.cgray= user.email
.span5.right
.span5.pull-right
- if allow_admin
.left
= form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
= f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2"
.right
.pull-right
- if current_user == user
%span.btn.disabled This is you!
- if @project.namespace_owner == user

4
app/views/team_members/_show_team.html.haml
View File

@ -7,8 +7,8 @@
%br
%small.cgray Members: #{team.members.count}
.span5.right
.right
.span5.pull-right
.pull-right
- if allow_admin
.left
= link_to resign_project_team_path(@project, team), method: :delete, confirm: "Are you shure?", class: "btn btn-remove small" do

2
app/views/team_members/index.html.haml
View File

@ -7,7 +7,7 @@
%strong= link_to "here", help_permissions_path, class: "vlink"
- if can? current_user, :admin_team_member, @project
%span.right
%span.pull-right
= link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
Import team from another project
= link_to available_project_teams_path(@project), class: "btn btn-small grouped", title: "Assign project to team of users" do

2
app/views/team_members/show.html.haml
View File

@ -2,7 +2,7 @@
.team_member_show
- if can? current_user, :admin_project, @project
= link_to 'Remove from team', project_team_member_path(@project, @member), confirm: 'Are you sure?', method: :delete, class: "right btn btn-remove"
= link_to 'Remove from team', project_team_member_path(@project, @member), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove pull-right"
.profile_avatar_holder
= image_tag gravatar_icon(@member.email, 60), class: "borders"
%h3.page_title

4
app/views/teams/_filter.html.haml
View File

@ -25,9 +25,9 @@
%li{class: ("active" if params[:project_id] == project.id.to_s)}
= link_to team_filter_path(entity, project_id: project.id) do
= project.name_with_namespace
%small.right= entities_per_project(project, entity)
%small.pull-right= entities_per_project(project, entity)
%fieldset
%hr
= link_to "Reset", team_filter_path(entity), class: 'btn right'
= link_to "Reset", team_filter_path(entity), class: 'btn pull-right'

2
app/views/teams/_projects.html.haml
View File

@ -4,7 +4,7 @@
%small
(#{projects.count})
- if can? current_user, :manage_user_team, @team
%span.right
%span.pull-right
= link_to new_team_project_path(@team), class: "btn btn-tiny info" do
%i.icon-plus
Assign Project

2
app/views/teams/issues.html.haml
View File

@ -1,7 +1,7 @@
%h3.page_title
Issues
%small (in Team projects assigned to Team members)
%small.right #{@issues.total_count} issues
%small.pull-right #{@issues.total_count} issues
%hr
.row

4
app/views/teams/members/_show.html.haml
View File

@ -10,7 +10,7 @@
%br
%small.cgray= user.email
.span6.right
.span6.pull-right
- if allow_admin
.left.span2
= form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f|
@ -19,7 +19,7 @@
%span
= check_box_tag :group_admin, true, @team.admin?(user)
Admin access
.right
.pull-right
- if current_user == user
%span.btn.disabled This is you!
- if @team.owner == user

2
app/views/teams/members/index.html.haml
View File

@ -6,7 +6,7 @@
%strong= link_to "here", help_permissions_path, class: "vlink"
- if can? current_user, :manage_user_team, @team
%span.right
%span.pull-right
= link_to new_team_member_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do
New Team Member
%hr

2
app/views/teams/members/show.html.haml
View File

@ -3,7 +3,7 @@
.team_member_show
- if can? current_user, :admin_project, @project
= 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"
= 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"
.profile_avatar_holder
= image_tag gravatar_icon(user.email, 60), class: "borders"
%h3.page_title

2
app/views/teams/merge_requests.html.haml
View File

@ -1,7 +1,7 @@
%h3.page_title
Merge Requests
%small (authored by or assigned to Team members)
%small.right #{@merge_requests.total_count} merge requests
%small.pull-right #{@merge_requests.total_count} merge requests
%hr
.row

2
app/views/teams/projects/index.html.haml
View File

@ -5,7 +5,7 @@
%strong= link_to "here", help_permissions_path, class: "vlink"
- if current_user.can?(:manage_user_team, @team) && @avaliable_projects.any?
%span.right
%span.pull-right
= link_to new_team_project_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do
Assign project to Team

2
app/views/tree/_head.html.haml
View File

@ -3,5 +3,5 @@
= render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: @path}
= nav_link(controller: :tree) do
= link_to 'Source', project_tree_path(@project, @ref)
%li.right
%li.pull-right
= render "shared/clone_panel"

2
app/views/tree/_tree.html.haml
View File

@ -24,7 +24,7 @@
%th Name
%th Last Update
%th Last Commit
%th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny right"
%th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right"
- if tree.up_dir?
%tr.tree-item

10
app/views/users/_profile.html.haml
View File

@ -4,20 +4,20 @@
%ul.well-list
%li
%strong Email
%span.right= mail_to @user.email
%span.pull-right= mail_to @user.email
- unless @user.skype.blank?
%li
%strong Skype
%span.right= @user.skype
%span.pull-right= @user.skype
- unless @user.linkedin.blank?
%li
%strong LinkedIn
%span.right= @user.linkedin
%span.pull-right= @user.linkedin
- unless @user.twitter.blank?
%li
%strong Twitter
%span.right= @user.twitter
%span.pull-right= @user.twitter
- unless @user.bio.blank?
%li
%strong Bio
%span.right= @user.bio
%span.pull-right= @user.bio

2
app/views/users/_projects.html.haml
View File

@ -9,7 +9,7 @@
\/
%strong.well-title
= truncate(project.name, length: 45)
%span.right.light
%span.pull-right.light
- if project.owner == @user
%i.icon-wrench
- tm = project.team.get_tm(@user.id)

2
app/views/users/show.html.haml
View File

@ -4,7 +4,7 @@
= image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
= @user.name
- if @user == current_user
.right
.pull-right
= link_to profile_path, class: 'btn btn-small' do
%i.icon-edit
Edit Profile

2
app/views/wikis/edit.html.haml
View File

@ -2,7 +2,7 @@
%hr
= render 'form'
.right
.pull-right
- if can? current_user, :admin_wiki, @project
= 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
Delete this page

2
app/views/wikis/show.html.haml
View File

@ -1,6 +1,6 @@
%h3.page_title
= @wiki.title
%span.right
%span.pull-right
= link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do
Pages
- if can? current_user, :write_wiki, @project