Skip to content
Snippets Groups Projects
Commit e2fb18a3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

replace right with pull-right

parent 7ba4f2dc
No related branches found
No related tags found
2 merge requests!2940Expanding repos and hooks paths in settings,!2770Capistrano deploy
Showing
with 37 additions and 38 deletions
Loading
@@ -95,7 +95,7 @@
Loading
@@ -95,7 +95,7 @@
   
form { form {
margin-bottom: 0; margin-bottom: 0;
margin-top: 3px; margin-top: 0;
} }
   
.btn-tiny { .btn-tiny {
Loading
Loading
Loading
@@ -9,7 +9,6 @@
Loading
@@ -9,7 +9,6 @@
   
/** COMMON CLASSES **/ /** COMMON CLASSES **/
.left { float:left } .left { float:left }
.right { float:right!important }
.append-bottom-10 { margin-bottom:10px } .append-bottom-10 { margin-bottom:10px }
.append-bottom-20 { margin-bottom:20px } .append-bottom-20 { margin-bottom:20px }
.prepend-top-10 { margin-top:10px } .prepend-top-10 { margin-top:10px }
Loading
Loading
Loading
@@ -127,7 +127,7 @@
Loading
@@ -127,7 +127,7 @@
.btn-new-mr { .btn-new-mr {
@extend .btn-info; @extend .btn-info;
@extend .small; @extend .small;
@extend .right; @extend .pull-right;
margin: -3px; margin: -3px;
} }
} }
Loading
Loading
Loading
@@ -258,7 +258,7 @@ ul.notes {
Loading
@@ -258,7 +258,7 @@ ul.notes {
} }
   
.attachment { .attachment {
@extend .right; @extend .pull-right;
position: relative; position: relative;
width: 350px; width: 350px;
height: 50px; height: 50px;
Loading
@@ -274,7 +274,7 @@ ul.notes {
Loading
@@ -274,7 +274,7 @@ ul.notes {
} }
} }
.notify_options { .notify_options {
@extend .right; @extend .pull-right;
} }
} }
.note_text_and_preview { .note_text_and_preview {
Loading
Loading
Loading
@@ -4,7 +4,7 @@
Loading
@@ -4,7 +4,7 @@
} }
   
.side { .side {
@extend .right; @extend .pull-right;
   
.projects_box { .projects_box {
> .title { > .title {
Loading
Loading
Loading
@@ -31,7 +31,7 @@
Loading
@@ -31,7 +31,7 @@
- @projects.each do |project| - @projects.each do |project|
%p %p
= link_to project.name_with_namespace, [:admin, project] = link_to project.name_with_namespace, [:admin, project]
%span.light.right %span.light.pull-right
= time_ago_in_words project.created_at = time_ago_in_words project.created_at
ago ago
   
Loading
@@ -42,7 +42,7 @@
Loading
@@ -42,7 +42,7 @@
%p %p
= link_to [:admin, user] do = link_to [:admin, user] do
= user.name = user.name
%span.light.right %span.light.pull-right
= time_ago_in_words user.created_at = time_ago_in_words user.created_at
ago ago
   
Loading
@@ -51,25 +51,25 @@
Loading
@@ -51,25 +51,25 @@
%hr %hr
%p %p
Issues Issues
%span.light.right %span.light.pull-right
= Issue.count = Issue.count
%p %p
Merge Requests Merge Requests
%span.light.right %span.light.pull-right
= MergeRequest.count = MergeRequest.count
%p %p
Notes Notes
%span.light.right %span.light.pull-right
= Note.count = Note.count
%p %p
Snippets Snippets
%span.light.right %span.light.pull-right
= Snippet.count = Snippet.count
%p %p
SSH Keys SSH Keys
%span.light.right %span.light.pull-right
= Key.count = Key.count
%p %p
Milestones Milestones
%span.light.right %span.light.pull-right
= Milestone.count = Milestone.count
Loading
@@ -4,7 +4,7 @@
Loading
@@ -4,7 +4,7 @@
allows you to keep projects organized. allows you to keep projects organized.
Use groups for uniting related projects. 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 %br
= form_tag admin_groups_path, method: :get, class: 'form-inline' do = form_tag admin_groups_path, method: :get, class: 'form-inline' do
= text_field_tag :name, params[:name], class: "xlarge" = text_field_tag :name, params[:name], class: "xlarge"
Loading
Loading
Loading
@@ -14,7 +14,7 @@
Loading
@@ -14,7 +14,7 @@
%td %td
= @group.name = @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 %i.icon-edit
Rename Rename
%tr %tr
Loading
@@ -29,7 +29,7 @@
Loading
@@ -29,7 +29,7 @@
Owner: Owner:
%td %td
= @group.owner_name = @group.owner_name
.right .pull-right
= link_to "#", class: "btn btn-small change-owner-link" do = link_to "#", class: "btn btn-small change-owner-link" do
%i.icon-edit %i.icon-edit
Change owner Change owner
Loading
Loading
Loading
@@ -33,7 +33,7 @@
Loading
@@ -33,7 +33,7 @@
%td %td
= link_to admin_hook_path(hook) do = link_to admin_hook_path(hook) do
%strong= hook.url %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 POST
%td %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"
Loading
@@ -15,7 +15,7 @@
Loading
@@ -15,7 +15,7 @@
.file_title .file_title
%i.icon-file %i.icon-file
githost.log githost.log
.right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.icon-arrow-down
Scroll down Scroll down
Loading
@@ -29,7 +29,7 @@
Loading
@@ -29,7 +29,7 @@
.file_title .file_title
%i.icon-file %i.icon-file
application.log application.log
.right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.icon-arrow-down
Scroll down Scroll down
Loading
@@ -43,7 +43,7 @@
Loading
@@ -43,7 +43,7 @@
.file_title .file_title
%i.icon-file %i.icon-file
production.log production.log
.right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.icon-arrow-down
Scroll down Scroll down
Loading
@@ -57,7 +57,7 @@
Loading
@@ -57,7 +57,7 @@
.file_title .file_title
%i.icon-file %i.icon-file
sidekiq.log sidekiq.log
.right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.icon-arrow-down
Scroll down Scroll down
Loading
Loading
%h3.page_title %h3.page_title
Projects 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 %hr
   
Loading
@@ -51,7 +51,7 @@
Loading
@@ -51,7 +51,7 @@
- else - else
%i.icon-lock.cgreen %i.icon-lock.cgreen
= link_to project.name_with_namespace, [:admin, project] = 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 '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" = link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
- if @projects.blank? - if @projects.blank?
Loading
Loading
%h3.page_title %h3.page_title
Project: #{@project.name_with_namespace} 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 %i.icon-edit
Edit Edit
   
Loading
Loading
Loading
@@ -3,7 +3,7 @@
Loading
@@ -3,7 +3,7 @@
%small %small
simple Teams description 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 %br
   
= form_tag admin_teams_path, method: :get, class: 'form-inline' do = form_tag admin_teams_path, method: :get, class: 'form-inline' do
Loading
Loading
Loading
@@ -14,7 +14,7 @@
Loading
@@ -14,7 +14,7 @@
%td %td
= @team.name = @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 %i.icon-edit
Rename Rename
%tr %tr
Loading
@@ -23,7 +23,7 @@
Loading
@@ -23,7 +23,7 @@
Owner: Owner:
%td %td
= @team.owner.name = @team.owner.name
.right .pull-right
= link_to "#", class: "btn btn-small change-owner-link" do = link_to "#", class: "btn btn-small change-owner-link" do
%i.icon-edit %i.icon-edit
Change owner Change owner
Loading
@@ -42,7 +42,7 @@
Loading
@@ -42,7 +42,7 @@
%fieldset %fieldset
%legend %legend
Members (#{@team.members.count}) 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? - if @team.members.any?
%table#members_list %table#members_list
%thead %thead
Loading
@@ -67,7 +67,7 @@
Loading
@@ -67,7 +67,7 @@
%fieldset %fieldset
%legend %legend
Projects (#{@team.projects.count}) 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? - if @team.projects.any?
%table#projects_list %table#projects_list
%thead %thead
Loading
Loading
%h3.page_title %h3.page_title
Users 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 %br
   
= form_tag admin_users_path, method: :get, class: 'form-inline' do = form_tag admin_users_path, method: :get, class: 'form-inline' do
Loading
Loading
Loading
@@ -4,7 +4,7 @@
Loading
@@ -4,7 +4,7 @@
%small Blocked %small Blocked
- if @admin_user.admin - if @admin_user.admin
%small Administrator %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 %i.icon-edit
Edit Edit
   
Loading
Loading
Loading
@@ -3,5 +3,5 @@
Loading
@@ -3,5 +3,5 @@
= render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]} = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
= nav_link(controller: :refs) do = nav_link(controller: :refs) do
= link_to 'Source', project_tree_path(@project, @ref) = link_to 'Source', project_tree_path(@project, @ref)
%li.right %li.pull-right
= render "shared/clone_panel" = render "shared/clone_panel"
= render "commits/commit_box" = render "commits/commit_box"
   
%p.right.cgray %p.pull-right.cgray
This commit has This commit has
%span.cgreen #{@commit.stats.additions} additions %span.cgreen #{@commit.stats.additions} additions
and and
Loading
Loading
.ui-box.ui-box-show .ui-box.ui-box-show
.ui-box-head .ui-box-head
.right .pull-right
- if @notes_count > 0 - if @notes_count > 0
%span.btn.disabled.grouped %span.btn.disabled.grouped
%i.icon-comment %i.icon-comment
Loading
Loading
Loading
@@ -25,7 +25,7 @@
Loading
@@ -25,7 +25,7 @@
%span= diff.old_path %span= diff.old_path
   
- if @commit.prev_commit - 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 @ View file @
%span.commit-short-id= @commit.short_id(6) %span.commit-short-id= @commit.short_id(6)
- else - else
Loading
@@ -33,7 +33,7 @@
Loading
@@ -33,7 +33,7 @@
- if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
%span.file-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 @ View file @
%span.commit-short-id= @commit.short_id(6) %span.commit-short-id= @commit.short_id(6)
   
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment