Download as
Browse Code »

Commit 1fdeb9e03042b1b645ed0fe6c33fb4f21dd6ddb1

Authored by Dmitriy Zaporozhets
2 parents 7d593c54 bfd00caf
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'refactor/css' of dev.gitlabhq.com:gitlab/gitlabhq

Showing 128 changed files with 268 additions and 262 deletions   Show diff stats

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 128 files displayed.

app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @1fdeb9e
... ... @@ -17,6 +17,8 @@ $baseLineHeight: 18px !default;
17 17 @import "gitlab_bootstrap/variables.scss";
18 18 @import "gitlab_bootstrap/fonts.scss";
19 19 @import "gitlab_bootstrap/mixins.scss";
  20 +@import "gitlab_bootstrap/avatar.scss";
  21 +@import "gitlab_bootstrap/nav.scss";
20 22 @import "gitlab_bootstrap/common.scss";
21 23 @import "gitlab_bootstrap/typography.scss";
22 24 @import "gitlab_bootstrap/buttons.scss";
... ...
app/assets/stylesheets/gitlab_bootstrap/avatar.scss 0 → 100644
  Diff comments   View file @1fdeb9e
... ... @@ -0,0 +1,8 @@
  1 +/** AVATARS **/
  2 +img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
  3 +img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
  4 +img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
  5 +img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
  6 +img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }
  7 +img.lil_av { padding-left: 4px; padding-right: 3px; }
  8 +img.small { width: 80px; }
... ...
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @1fdeb9e
... ... @@ -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/buttons.scss
  Diff comments   View file @1fdeb9e
... ... @@ -67,6 +67,7 @@
67 67 @extend .btn-primary;
68 68 }
69 69  
  70 + &.btn-close,
70 71 &.btn-remove {
71 72 @extend .btn-danger;
72 73 border-color: #BD362F;
... ...
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @1fdeb9e
... ... @@ -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 }
... ... @@ -22,82 +21,13 @@
22 21 .light { color: #888 }
23 22 .tiny { font-weight: normal }
24 23  
25   -/** PILLS & TABS**/
26   -.nav-pills {
27   - .active a {
28   - background: $primary_color;
29   - }
30   -
31   - > li > a {
32   - @include border-radius(0);
33   - }
34   - &.nav-stacked {
35   - > li > a {
36   - border-left: 4px solid #EEE;
37   - padding: 12px;
38   - }
39   - > .active > a {
40   - border-color: #29B;
41   - border-radius: 0;
42   - background: #F1F1F1;
43   - color: $style_color;
44   - font-weight: bold;
45   - }
46   - }
47   -}
48   -
49   -.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
50   -
51   -
52   -
53   -/**
54   - * nav-tabs
55   - *
56   - */
57   -.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
58   -.nav.nav-tabs {
59   - li {
60   - > a {
61   - padding: 8px 20px;
62   - margin-right: 7px;
63   - line-height: 20px;
64   - border-color: #EEE;
65   - color: #888;
66   - border-bottom: 1px solid #ddd;
67   - .badge {
68   - background-color: #eee;
69   - color: #888;
70   - text-shadow: 0 1px 1px #fff;
71   - }
72   - i[class^="icon-"] {
73   - line-height: 14px;
74   - }
75   - }
76   - &.active {
77   - > a {
78   - border-color: #CCC;
79   - border-bottom: 1px solid #fff;
80   - color: #333;
81   - }
82   - }
83   - }
84   -
85   - &.nav-small-tabs > li > a { padding: 6px 9px; }
86   -}
87 24  
88 25 /** ALERT MESSAGES **/
89   -.alert-message { @extend .alert; }
90   -.alert-messag.success { @extend .alert-success; }
91   -.alert-message.error { @extend .alert-error; }
92   -
93   -/** AVATARS **/
94   -img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
95   -img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
96   -img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
97   -img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
98   -img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }
99   -img.lil_av { padding-left: 4px; padding-right: 3px; }
100   -img.small { width: 80px; }
  26 +.alert.alert-disabled {
  27 + background: #EEE;
  28 + color: #777;
  29 + border-color: #DDD;
  30 +}
101 31  
102 32 /** HELPERS **/
103 33 .nothing_here_message {
... ...
app/assets/stylesheets/gitlab_bootstrap/nav.scss 0 → 100644
  Diff comments   View file @1fdeb9e
... ... @@ -0,0 +1,65 @@
  1 +/**
  2 + * nav-pills
  3 + *
  4 + */
  5 +.nav-pills {
  6 + .active a {
  7 + background: $primary_color;
  8 + }
  9 +
  10 + > li > a {
  11 + @include border-radius(0);
  12 + }
  13 + &.nav-stacked {
  14 + > li > a {
  15 + border-left: 4px solid #EEE;
  16 + padding: 12px;
  17 + }
  18 + > .active > a {
  19 + border-color: #29B;
  20 + border-radius: 0;
  21 + background: #F1F1F1;
  22 + color: $style_color;
  23 + font-weight: bold;
  24 + }
  25 + }
  26 +}
  27 +
  28 +.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
  29 +
  30 +
  31 +
  32 +/**
  33 + * nav-tabs
  34 + *
  35 + */
  36 +.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
  37 +.nav.nav-tabs {
  38 + li {
  39 + > a {
  40 + padding: 8px 20px;
  41 + margin-right: 7px;
  42 + line-height: 20px;
  43 + border-color: #EEE;
  44 + color: #888;
  45 + border-bottom: 1px solid #ddd;
  46 + .badge {
  47 + background-color: #eee;
  48 + color: #888;
  49 + text-shadow: 0 1px 1px #fff;
  50 + }
  51 + i[class^="icon-"] {
  52 + line-height: 14px;
  53 + }
  54 + }
  55 + &.active {
  56 + > a {
  57 + border-color: #CCC;
  58 + border-bottom: 1px solid #fff;
  59 + color: #333;
  60 + }
  61 + }
  62 + }
  63 +
  64 + &.nav-small-tabs > li > a { padding: 6px 9px; }
  65 +}
... ...
app/assets/stylesheets/sections/events.scss
  Diff comments   View file @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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/helpers/projects_helper.rb
  Diff comments   View file @1fdeb9e
... ... @@ -43,7 +43,7 @@ module ProjectsHelper
43 43 tm = project.team_member_by_id(author)
44 44  
45 45 if tm
46   - link_to author_html, project_team_member_path(project, tm), class: "author_link"
  46 + link_to author_html, project_team_member_path(project, tm.user_username), class: "author_link"
47 47 else
48 48 author_html
49 49 end.html_safe
... ...
app/models/users_project.rb
  Diff comments   View file @1fdeb9e
... ... @@ -33,7 +33,7 @@ class UsersProject < ActiveRecord::Base
33 33 validates :project_access, inclusion: { in: [GUEST, REPORTER, DEVELOPER, MASTER] }, presence: true
34 34 validates :project, presence: true
35 35  
36   - delegate :name, :email, to: :user, prefix: true
  36 + delegate :name, :username, :email, to: :user, prefix: true
37 37  
38 38 scope :guests, where(project_access: GUEST)
39 39 scope :reporters, where(project_access: REPORTER)
... ...
app/views/admin/dashboard/index.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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/edit.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -2,7 +2,7 @@
2 2 %hr
3 3 = form_for [:admin, @group] do |f|
4 4 - if @group.errors.any?
5   - .alert-message.block-message.error
  5 + .alert.alert-error
6 6 %span= @group.errors.full_messages.first
7 7 .clearfix.group_name_holder
8 8 = f.label :name do
... ...
app/views/admin/groups/index.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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/new.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -2,7 +2,7 @@
2 2 %hr
3 3 = form_for [:admin, @group] do |f|
4 4 - if @group.errors.any?
5   - .alert-message.block-message.error
  5 + .alert.alert-error
6 6 %span= @group.errors.full_messages.first
7 7 .clearfix
8 8 = f.label :name do
... ...
app/views/admin/groups/show.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -7,7 +7,7 @@
7 7  
8 8 = form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
9 9 -if @hook.errors.any?
10   - .alert-message.block-message.error
  10 + .alert.alert-error
11 11 - @hook.errors.full_messages.each do |msg|
12 12 %p= msg
13 13 .clearfix
... ... @@ -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 @1fdeb9e
... ... @@ -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/_form.html.haml
  Diff comments   View file @1fdeb9e
1 1 = form_for [:admin, project] do |f|
2 2 -if project.errors.any?
3   - .alert-message.block-message.error
  3 + .alert.alert-error
4 4 %ul
5 5 - project.errors.full_messages.each do |msg|
6 6 %li= msg
... ...
app/views/admin/projects/index.html.haml
  Diff comments   View file @1fdeb9e
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/members/_form.html.haml
  Diff comments   View file @1fdeb9e
1 1 = form_for @team_member_relation, as: :team_member, url: admin_project_member_path(@project, @member) do |f|
2 2 -if @team_member_relation.errors.any?
3   - .alert-message.block-message.error
  3 + .alert.alert-error
4 4 %ul
5 5 - @team_member_relation.errors.full_messages.each do |msg|
6 6 %li= msg
... ...
app/views/admin/projects/show.html.haml
  Diff comments   View file @1fdeb9e
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/edit.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -2,7 +2,7 @@
2 2 %hr
3 3 = form_for @team, url: admin_team_path(@team), method: :put do |f|
4 4 - if @team.errors.any?
5   - .alert-message.block-message.error
  5 + .alert.alert-error
6 6 %span= @team.errors.full_messages.first
7 7 .clearfix.team_name_holder
8 8 = f.label :name do
... ...
app/views/admin/teams/index.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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/members/_form.html.haml
  Diff comments   View file @1fdeb9e
1 1 = form_tag admin_team_member_path(@team, @member), method: :put do
2 2 -if @member.errors.any?
3   - .alert-message.block-message.error
  3 + .alert.alert-error
4 4 %ul
5 5 - @member.errors.full_messages.each do |msg|
6 6 %li= msg
... ...
app/views/admin/teams/new.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -2,7 +2,7 @@
2 2 %hr
3 3 = form_for @team, url: admin_teams_path do |f|
4 4 - if @team.errors.any?
5   - .alert-message.block-message.error
  5 + .alert.alert-error
6 6 %span= @team.errors.full_messages.first
7 7 .clearfix
8 8 = f.label :name do
... ...
app/views/admin/teams/projects/_form.html.haml
  Diff comments   View file @1fdeb9e
1 1 = form_tag admin_team_project_path(@team, @project), method: :put do
2 2 -if @project.errors.any?
3   - .alert-message.block-message.error
  3 + .alert.alert-error
4 4 %ul
5 5 - @project.errors.full_messages.each do |msg|
6 6 %li= msg
... ...
app/views/admin/teams/show.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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 @1fdeb9e
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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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/huge_commit.html.haml
  Diff comments   View file @1fdeb9e
1 1 = render "commits/commit_box"
2   -.alert-message.block-message.error
  2 +.alert.alert-error
3 3 %h4 Commit diffs are too big to be displayed
... ...
app/views/commit/show.html.haml
  Diff comments   View file @1fdeb9e
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 @1fdeb9e
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 @1fdeb9e
1 1 - if @suppress_diff
2   - .alert-message.block-message
  2 + .alert.alert-block
3 3 %p
4 4 %strong Warning! Large commit with more than #{Commit::DIFF_SAFE_SIZE} files changed.
5 5 %p To prevent performance issue we rejected diff information.
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
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 @1fdeb9e
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 @1fdeb9e
... ... @@ -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/_form.html.haml
  Diff comments   View file @1fdeb9e
1 1 %div
2 2 = form_for [@project, @key], url: project_deploy_keys_path do |f|
3 3 -if @key.errors.any?
4   - .alert-message.block-message.error
  4 + .alert.alert-error
5 5 %ul
6 6 - @key.errors.full_messages.each do |msg|
7 7 %li= msg
... ...
app/views/deploy_keys/_show.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
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 @1fdeb9e
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/new.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -2,7 +2,7 @@
2 2 %hr
3 3 = form_for @group do |f|
4 4 - if @group.errors.any?
5   - .alert-message.block-message.error
  5 + .alert.alert-error
6 6 %span= @group.errors.full_messages.first
7 7 .clearfix
8 8 = f.label :name do
... ...
app/views/groups/people.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
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 @1fdeb9e
... ... @@ -10,7 +10,7 @@
10 10  
11 11 = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
12 12 -if @hook.errors.any?
13   - .alert-message.block-message.error
  13 + .alert.alert-error
14 14 - @hook.errors.full_messages.each do |msg|
15 15 %p= msg
16 16 .clearfix
... ... @@ -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 @1fdeb9e
... ... @@ -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/_form.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -2,7 +2,7 @@
2 2 %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
3 3 = form_for [@project, @issue] do |f|
4 4 -if @issue.errors.any?
5   - .alert-message.block-message.error
  5 + .alert.alert-error
6 6 - @issue.errors.full_messages.each do |msg|
7 7 %span= msg
8 8 %br
... ...
app/views/issues/_head.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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/_form.html.haml
  Diff comments   View file @1fdeb9e
1 1 %div
2 2 = form_for @key do |f|
3 3 -if @key.errors.any?
4   - .alert-message.block-message.error
  4 + .alert.alert-error
5 5 %ul
6 6 - @key.errors.full_messages.each do |msg|
7 7 %li= msg
... ...
app/views/keys/_show.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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 @1fdeb9e
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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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/_form.html.haml
  Diff comments   View file @1fdeb9e
1 1 = form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
2 2 -if @merge_request.errors.any?
3   - .alert-message.block-message.error
  3 + .alert.alert-error
4 4 %ul
5 5 - @merge_request.errors.full_messages.each do |msg|
6 6 %li= msg
... ...
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @1fdeb9e
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 @1fdeb9e
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_accept.html.haml
  Diff comments   View file @1fdeb9e
1 1 - unless can?(current_user, :accept_mr, @project)
2   - .alert-message
  2 + .alert
3 3 %strong Only masters can accept MR
4 4  
5 5  
... ... @@ -29,14 +29,14 @@
29 29 %strong This repository does not have satellite. Ask administrator to fix this issue
30 30  
31 31 .automerge_widget.cannot_be_merged{style: "display:none"}
32   - .alert.alert-info
  32 + .alert.alert-disabled
33 33 %span
34 34 = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
35 35 &nbsp;
36 36 %strong This request can't be merged with GitLab. You should do it manually
37 37  
38 38 .automerge_widget.unchecked
39   - .alert-message
  39 + .alert
40 40 %strong
41 41 %i.icon-refresh
42 42 Checking for ability to automatically merge…
... ...
app/views/merge_requests/show/_mr_ci.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -23,7 +23,7 @@
23 23 = link_to "Build page", ci_build_details_path(@merge_request)
24 24  
25 25 .ci_widget
26   - .alert-message
  26 + .alert
27 27 %strong
28 28 %i.icon-refresh
29 29 Checking for CI status for #{@merge_request.last_commit_short_sha}
... ...
app/views/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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
... ... @@ -17,13 +17,13 @@
17 17 %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
18 18 %li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff)
19 19  
20   - = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close merge request"
  20 + = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close merge request"
21 21  
22 22 = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
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/_form.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -7,7 +7,7 @@
7 7  
8 8 = form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"} do |f|
9 9 -if @milestone.errors.any?
10   - .alert-message.block-message.error
  10 + .alert.alert-error
11 11 %ul
12 12 - @milestone.errors.full_messages.each do |msg|
13 13 %li= msg
... ...
app/views/milestones/_milestone.html.haml
  Diff comments   View file @1fdeb9e
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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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|
... ... @@ -35,7 +35,7 @@
35 35 .padded
36 36 %p.slead After successful password update you will be redirected to login page where you should login with new password
37 37 -if @user.errors.any?
38   - .alert-message.block-message.error
  38 + .alert.alert-error
39 39 %ul
40 40 - @user.errors.full_messages.each do |msg|
41 41 %li= msg
... ... @@ -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 @1fdeb9e
... ... @@ -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
... ... @@ -15,7 +15,7 @@
15 15  
16 16 = form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" } do |f|
17 17 -if @user.errors.any?
18   - %div.alert-message.block-message.error
  18 + %div.alert.alert-error
19 19 %ul
20 20 - @user.errors.full_messages.each do |msg|
21 21 %li= msg
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
1 1 = form_for(@project, remote: true) do |f|
2 2 - if @project.errors.any?
3   - .alert-message.block-message.error
  3 + .alert.alert-error
4 4 %ul
5 5 - @project.errors.full_messages.each do |msg|
6 6 %li= msg
... ... @@ -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/_new_form.html.haml
  Diff comments   View file @1fdeb9e
1 1 = form_for(@project, remote: true) do |f|
2 2 - if @project.errors.any?
3   - .alert-message.block-message.error
  3 + .alert.alert-error
4 4 %span= @project.errors.full_messages.first
5 5 .clearfix.project_name_holder
6 6 = f.label :name do
... ...
app/views/projects/_project_head.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -13,19 +13,19 @@
13 13 = link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
14 14  
15 15 - if can? current_user, :admin_project, @project
16   - = nav_link(controller: :deploy_keys, html_options: {class: 'right'}) do
  16 + = nav_link(controller: :deploy_keys, html_options: {class: 'pull-right'}) do
17 17 = link_to project_deploy_keys_path(@project) do
18 18 %span
19 19 Deploy Keys
20   - = nav_link(controller: :hooks, html_options: {class: 'right'}) do
  20 + = nav_link(controller: :hooks, html_options: {class: 'pull-right'}) do
21 21 = link_to project_hooks_path(@project) do
22 22 %span
23 23 Hooks
24   - = nav_link(controller: :services, html_options: {class: 'right'}) do
  24 + = nav_link(controller: :services, html_options: {class: 'pull-right'}) do
25 25 = link_to project_services_path(@project) do
26 26 %span
27 27 Services
28   - = nav_link(path: 'projects#edit', html_options: {class: 'right'}) do
  28 + = nav_link(path: 'projects#edit', html_options: {class: 'pull-right'}) do
29 29 = link_to edit_project_path(@project), class: "stat-tab tab " do
30 30 %i.icon-edit
31 31 Edit
... ...
app/views/projects/empty.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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/protected_branches/index.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -14,7 +14,7 @@
14 14 - if can? current_user, :admin_project, @project
15 15 = form_for [@project, @protected_branch] do |f|
16 16 -if @protected_branch.errors.any?
17   - .alert-message.block-message.error
  17 + .alert.alert-error
18 18 %ul
19 19 - @protected_branch.errors.full_messages.each do |msg|
20 20 %li= msg
... ...
app/views/public/projects/index.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
... ... @@ -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 @1fdeb9e
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
... ... @@ -16,7 +16,7 @@
16 16 %hr
17 17 = form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f|
18 18 - if @service.errors.any?
19   - .alert-message.block-message.error
  19 + .alert.alert-error
20 20 %ul
21 21 - @service.errors.full_messages.each do |msg|
22 22 %li= msg
... ...
app/views/services/index.html.haml
  Diff comments   View file @1fdeb9e
... ... @@ -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
... ...