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
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @1fdeb9e
@@ -17,6 +17,8 @@ $baseLineHeight: 18px !default; @@ -17,6 +17,8 @@ $baseLineHeight: 18px !default;
17 @import "gitlab_bootstrap/variables.scss"; 17 @import "gitlab_bootstrap/variables.scss";
18 @import "gitlab_bootstrap/fonts.scss"; 18 @import "gitlab_bootstrap/fonts.scss";
19 @import "gitlab_bootstrap/mixins.scss"; 19 @import "gitlab_bootstrap/mixins.scss";
  20 +@import "gitlab_bootstrap/avatar.scss";
  21 +@import "gitlab_bootstrap/nav.scss";
20 @import "gitlab_bootstrap/common.scss"; 22 @import "gitlab_bootstrap/common.scss";
21 @import "gitlab_bootstrap/typography.scss"; 23 @import "gitlab_bootstrap/typography.scss";
22 @import "gitlab_bootstrap/buttons.scss"; 24 @import "gitlab_bootstrap/buttons.scss";
app/assets/stylesheets/gitlab_bootstrap/avatar.scss 0 → 100644
  Diff comments   View file @1fdeb9e
@@ -0,0 +1,8 @@ @@ -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,7 +95,7 @@
95 95
96 form { 96 form {
97 margin-bottom: 0; 97 margin-bottom: 0;
98 - margin-top: 3px; 98 + margin-top: 0;
99 } 99 }
100 100
101 .btn-tiny { 101 .btn-tiny {
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @1fdeb9e
@@ -67,6 +67,7 @@ @@ -67,6 +67,7 @@
67 @extend .btn-primary; 67 @extend .btn-primary;
68 } 68 }
69 69
  70 + &.btn-close,
70 &.btn-remove { 71 &.btn-remove {
71 @extend .btn-danger; 72 @extend .btn-danger;
72 border-color: #BD362F; 73 border-color: #BD362F;
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @1fdeb9e
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 9
10 /** COMMON CLASSES **/ 10 /** COMMON CLASSES **/
11 .left { float:left } 11 .left { float:left }
12 -.right { float:right!important }  
13 .append-bottom-10 { margin-bottom:10px } 12 .append-bottom-10 { margin-bottom:10px }
14 .append-bottom-20 { margin-bottom:20px } 13 .append-bottom-20 { margin-bottom:20px }
15 .prepend-top-10 { margin-top:10px } 14 .prepend-top-10 { margin-top:10px }
@@ -22,82 +21,13 @@ @@ -22,82 +21,13 @@
22 .light { color: #888 } 21 .light { color: #888 }
23 .tiny { font-weight: normal } 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 /** ALERT MESSAGES **/ 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 /** HELPERS **/ 32 /** HELPERS **/
103 .nothing_here_message { 33 .nothing_here_message {
app/assets/stylesheets/gitlab_bootstrap/nav.scss 0 → 100644
  Diff comments   View file @1fdeb9e
@@ -0,0 +1,65 @@ @@ -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,7 +127,7 @@
127 .btn-new-mr { 127 .btn-new-mr {
128 @extend .btn-info; 128 @extend .btn-info;
129 @extend .small; 129 @extend .small;
130 - @extend .right; 130 + @extend .pull-right;
131 margin: -3px; 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,7 +258,7 @@ ul.notes {
258 } 258 }
259 259
260 .attachment { 260 .attachment {
261 - @extend .right; 261 + @extend .pull-right;
262 position: relative; 262 position: relative;
263 width: 350px; 263 width: 350px;
264 height: 50px; 264 height: 50px;
@@ -274,7 +274,7 @@ ul.notes { @@ -274,7 +274,7 @@ ul.notes {
274 } 274 }
275 } 275 }
276 .notify_options { 276 .notify_options {
277 - @extend .right; 277 + @extend .pull-right;
278 } 278 }
279 } 279 }
280 .note_text_and_preview { 280 .note_text_and_preview {
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @1fdeb9e
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 } 4 }
5 5
6 .side { 6 .side {
7 - @extend .right; 7 + @extend .pull-right;
8 8
9 .projects_box { 9 .projects_box {
10 > .title { 10 > .title {
app/helpers/projects_helper.rb
  Diff comments   View file @1fdeb9e
@@ -43,7 +43,7 @@ module ProjectsHelper @@ -43,7 +43,7 @@ module ProjectsHelper
43 tm = project.team_member_by_id(author) 43 tm = project.team_member_by_id(author)
44 44
45 if tm 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 else 47 else
48 author_html 48 author_html
49 end.html_safe 49 end.html_safe
app/models/users_project.rb
  Diff comments   View file @1fdeb9e
@@ -33,7 +33,7 @@ class UsersProject < ActiveRecord::Base @@ -33,7 +33,7 @@ class UsersProject < ActiveRecord::Base
33 validates :project_access, inclusion: { in: [GUEST, REPORTER, DEVELOPER, MASTER] }, presence: true 33 validates :project_access, inclusion: { in: [GUEST, REPORTER, DEVELOPER, MASTER] }, presence: true
34 validates :project, presence: true 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 scope :guests, where(project_access: GUEST) 38 scope :guests, where(project_access: GUEST)
39 scope :reporters, where(project_access: REPORTER) 39 scope :reporters, where(project_access: REPORTER)
app/views/admin/dashboard/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 - @projects.each do |project| 31 - @projects.each do |project|
32 %p 32 %p
33 = link_to project.name_with_namespace, [:admin, project] 33 = link_to project.name_with_namespace, [:admin, project]
34 - %span.light.right 34 + %span.light.pull-right
35 = time_ago_in_words project.created_at 35 = time_ago_in_words project.created_at
36 ago 36 ago
37 37
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 %p 42 %p
43 = link_to [:admin, user] do 43 = link_to [:admin, user] do
44 = user.name 44 = user.name
45 - %span.light.right 45 + %span.light.pull-right
46 = time_ago_in_words user.created_at 46 = time_ago_in_words user.created_at
47 ago 47 ago
48 48
@@ -51,25 +51,25 @@ @@ -51,25 +51,25 @@
51 %hr 51 %hr
52 %p 52 %p
53 Issues 53 Issues
54 - %span.light.right 54 + %span.light.pull-right
55 = Issue.count 55 = Issue.count
56 %p 56 %p
57 Merge Requests 57 Merge Requests
58 - %span.light.right 58 + %span.light.pull-right
59 = MergeRequest.count 59 = MergeRequest.count
60 %p 60 %p
61 Notes 61 Notes
62 - %span.light.right 62 + %span.light.pull-right
63 = Note.count 63 = Note.count
64 %p 64 %p
65 Snippets 65 Snippets
66 - %span.light.right 66 + %span.light.pull-right
67 = Snippet.count 67 = Snippet.count
68 %p 68 %p
69 SSH Keys 69 SSH Keys
70 - %span.light.right 70 + %span.light.pull-right
71 = Key.count 71 = Key.count
72 %p 72 %p
73 Milestones 73 Milestones
74 - %span.light.right 74 + %span.light.pull-right
75 = Milestone.count 75 = Milestone.count
app/views/admin/groups/edit.html.haml
  Diff comments   View file @1fdeb9e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for [:admin, @group] do |f| 3 = form_for [:admin, @group] do |f|
4 - if @group.errors.any? 4 - if @group.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @group.errors.full_messages.first 6 %span= @group.errors.full_messages.first
7 .clearfix.group_name_holder 7 .clearfix.group_name_holder
8 = f.label :name do 8 = f.label :name do
app/views/admin/groups/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 allows you to keep projects organized. 4 allows you to keep projects organized.
5 Use groups for uniting related projects. 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 %br 8 %br
9 = form_tag admin_groups_path, method: :get, class: 'form-inline' do 9 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
10 = text_field_tag :name, params[:name], class: "xlarge" 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,7 +2,7 @@
2 %hr 2 %hr
3 = form_for [:admin, @group] do |f| 3 = form_for [:admin, @group] do |f|
4 - if @group.errors.any? 4 - if @group.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @group.errors.full_messages.first 6 %span= @group.errors.full_messages.first
7 .clearfix 7 .clearfix
8 = f.label :name do 8 = f.label :name do
app/views/admin/groups/show.html.haml
  Diff comments   View file @1fdeb9e
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 %td 14 %td
15 = @group.name 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 %i.icon-edit 18 %i.icon-edit
19 Rename 19 Rename
20 %tr 20 %tr
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 Owner: 29 Owner:
30 %td 30 %td
31 = @group.owner_name 31 = @group.owner_name
32 - .right 32 + .pull-right
33 = link_to "#", class: "btn btn-small change-owner-link" do 33 = link_to "#", class: "btn btn-small change-owner-link" do
34 %i.icon-edit 34 %i.icon-edit
35 Change owner 35 Change owner
app/views/admin/hooks/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 = form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f| 8 = form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
9 -if @hook.errors.any? 9 -if @hook.errors.any?
10 - .alert-message.block-message.error 10 + .alert.alert-error
11 - @hook.errors.full_messages.each do |msg| 11 - @hook.errors.full_messages.each do |msg|
12 %p= msg 12 %p= msg
13 .clearfix 13 .clearfix
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 %td 33 %td
34 = link_to admin_hook_path(hook) do 34 = link_to admin_hook_path(hook) do
35 %strong= hook.url 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 %td POST 37 %td POST
38 %td 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,7 +15,7 @@
15 .file_title 15 .file_title
16 %i.icon-file 16 %i.icon-file
17 githost.log 17 githost.log
18 - .right 18 + .pull-right
19 = link_to '#', class: 'log-bottom' do 19 = link_to '#', class: 'log-bottom' do
20 %i.icon-arrow-down 20 %i.icon-arrow-down
21 Scroll down 21 Scroll down
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 .file_title 29 .file_title
30 %i.icon-file 30 %i.icon-file
31 application.log 31 application.log
32 - .right 32 + .pull-right
33 = link_to '#', class: 'log-bottom' do 33 = link_to '#', class: 'log-bottom' do
34 %i.icon-arrow-down 34 %i.icon-arrow-down
35 Scroll down 35 Scroll down
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 .file_title 43 .file_title
44 %i.icon-file 44 %i.icon-file
45 production.log 45 production.log
46 - .right 46 + .pull-right
47 = link_to '#', class: 'log-bottom' do 47 = link_to '#', class: 'log-bottom' do
48 %i.icon-arrow-down 48 %i.icon-arrow-down
49 Scroll down 49 Scroll down
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 .file_title 57 .file_title
58 %i.icon-file 58 %i.icon-file
59 sidekiq.log 59 sidekiq.log
60 - .right 60 + .pull-right
61 = link_to '#', class: 'log-bottom' do 61 = link_to '#', class: 'log-bottom' do
62 %i.icon-arrow-down 62 %i.icon-arrow-down
63 Scroll down 63 Scroll down
app/views/admin/projects/_form.html.haml
  Diff comments   View file @1fdeb9e
1 = form_for [:admin, project] do |f| 1 = form_for [:admin, project] do |f|
2 -if project.errors.any? 2 -if project.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - project.errors.full_messages.each do |msg| 5 - project.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/admin/projects/index.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 Projects 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 %hr 5 %hr
6 6
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 - else 51 - else
52 %i.icon-lock.cgreen 52 %i.icon-lock.cgreen
53 = link_to project.name_with_namespace, [:admin, project] 53 = link_to project.name_with_namespace, [:admin, project]
54 - .right 54 + .pull-right
55 = link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" 55 = link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
56 = link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove" 56 = link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
57 - if @projects.blank? 57 - if @projects.blank?
app/views/admin/projects/members/_form.html.haml
  Diff comments   View file @1fdeb9e
1 = form_for @team_member_relation, as: :team_member, url: admin_project_member_path(@project, @member) do |f| 1 = form_for @team_member_relation, as: :team_member, url: admin_project_member_path(@project, @member) do |f|
2 -if @team_member_relation.errors.any? 2 -if @team_member_relation.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @team_member_relation.errors.full_messages.each do |msg| 5 - @team_member_relation.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/admin/projects/show.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 Project: #{@project.name_with_namespace} 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 %i.icon-edit 4 %i.icon-edit
5 Edit 5 Edit
6 6
app/views/admin/teams/edit.html.haml
  Diff comments   View file @1fdeb9e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for @team, url: admin_team_path(@team), method: :put do |f| 3 = form_for @team, url: admin_team_path(@team), method: :put do |f|
4 - if @team.errors.any? 4 - if @team.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @team.errors.full_messages.first 6 %span= @team.errors.full_messages.first
7 .clearfix.team_name_holder 7 .clearfix.team_name_holder
8 = f.label :name do 8 = f.label :name do
app/views/admin/teams/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 %small 3 %small
4 simple Teams description 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 %br 7 %br
8 8
9 = form_tag admin_teams_path, method: :get, class: 'form-inline' do 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 = form_tag admin_team_member_path(@team, @member), method: :put do 1 = form_tag admin_team_member_path(@team, @member), method: :put do
2 -if @member.errors.any? 2 -if @member.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @member.errors.full_messages.each do |msg| 5 - @member.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/admin/teams/new.html.haml
  Diff comments   View file @1fdeb9e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for @team, url: admin_teams_path do |f| 3 = form_for @team, url: admin_teams_path do |f|
4 - if @team.errors.any? 4 - if @team.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @team.errors.full_messages.first 6 %span= @team.errors.full_messages.first
7 .clearfix 7 .clearfix
8 = f.label :name do 8 = f.label :name do
app/views/admin/teams/projects/_form.html.haml
  Diff comments   View file @1fdeb9e
1 = form_tag admin_team_project_path(@team, @project), method: :put do 1 = form_tag admin_team_project_path(@team, @project), method: :put do
2 -if @project.errors.any? 2 -if @project.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @project.errors.full_messages.each do |msg| 5 - @project.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/admin/teams/show.html.haml
  Diff comments   View file @1fdeb9e
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 %td 14 %td
15 = @team.name 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 %i.icon-edit 18 %i.icon-edit
19 Rename 19 Rename
20 %tr 20 %tr
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 Owner: 23 Owner:
24 %td 24 %td
25 = @team.owner.name 25 = @team.owner.name
26 - .right 26 + .pull-right
27 = link_to "#", class: "btn btn-small change-owner-link" do 27 = link_to "#", class: "btn btn-small change-owner-link" do
28 %i.icon-edit 28 %i.icon-edit
29 Change owner 29 Change owner
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 %fieldset 42 %fieldset
43 %legend 43 %legend
44 Members (#{@team.members.count}) 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 - if @team.members.any? 46 - if @team.members.any?
47 %table#members_list 47 %table#members_list
48 %thead 48 %thead
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 %fieldset 67 %fieldset
68 %legend 68 %legend
69 Projects (#{@team.projects.count}) 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 - if @team.projects.any? 71 - if @team.projects.any?
72 %table#projects_list 72 %table#projects_list
73 %thead 73 %thead
app/views/admin/users/index.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 Users 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 %br 4 %br
5 5
6 = form_tag admin_users_path, method: :get, class: 'form-inline' do 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,7 +4,7 @@
4 %small Blocked 4 %small Blocked
5 - if @admin_user.admin 5 - if @admin_user.admin
6 %small Administrator 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 %i.icon-edit 8 %i.icon-edit
9 Edit 9 Edit
10 10
app/views/blame/_head.html.haml
  Diff comments   View file @1fdeb9e
@@ -3,5 +3,5 @@ @@ -3,5 +3,5 @@
3 = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]} 3 = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
4 = nav_link(controller: :refs) do 4 = nav_link(controller: :refs) do
5 = link_to 'Source', project_tree_path(@project, @ref) 5 = link_to 'Source', project_tree_path(@project, @ref)
6 - %li.right 6 + %li.pull-right
7 = render "shared/clone_panel" 7 = render "shared/clone_panel"
app/views/commit/huge_commit.html.haml
  Diff comments   View file @1fdeb9e
1 = render "commits/commit_box" 1 = render "commits/commit_box"
2 -.alert-message.block-message.error 2 +.alert.alert-error
3 %h4 Commit diffs are too big to be displayed 3 %h4 Commit diffs are too big to be displayed
app/views/commit/show.html.haml
  Diff comments   View file @1fdeb9e
1 = render "commits/commit_box" 1 = render "commits/commit_box"
2 2
3 -%p.right.cgray 3 +%p.pull-right.cgray
4 This commit has 4 This commit has
5 %span.cgreen #{@commit.stats.additions} additions 5 %span.cgreen #{@commit.stats.additions} additions
6 and 6 and
app/views/commits/_commit_box.html.haml
  Diff comments   View file @1fdeb9e
1 .ui-box.ui-box-show 1 .ui-box.ui-box-show
2 .ui-box-head 2 .ui-box-head
3 - .right 3 + .pull-right
4 - if @notes_count > 0 4 - if @notes_count > 0
5 %span.btn.disabled.grouped 5 %span.btn.disabled.grouped
6 %i.icon-comment 6 %i.icon-comment
app/views/commits/_diffs.html.haml
  Diff comments   View file @1fdeb9e
1 - if @suppress_diff 1 - if @suppress_diff
2 - .alert-message.block-message 2 + .alert.alert-block
3 %p 3 %p
4 %strong Warning! Large commit with more than #{Commit::DIFF_SAFE_SIZE} files changed. 4 %strong Warning! Large commit with more than #{Commit::DIFF_SAFE_SIZE} files changed.
5 %p To prevent performance issue we rejected diff information. 5 %p To prevent performance issue we rejected diff information.
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 %span= diff.old_path 25 %span= diff.old_path
26 26
27 - if @commit.prev_commit 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 View file @ 29 View file @
30 %span.commit-short-id= @commit.short_id(6) 30 %span.commit-short-id= @commit.short_id(6)
31 - else 31 - else
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode 33 - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
34 %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}" 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 View file @ 37 View file @
38 %span.commit-short-id= @commit.short_id(6) 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,7 +22,7 @@
22 22
23 23
24 - if current_controller?(:commits) && current_user.private_token 24 - if current_controller?(:commits) && current_user.private_token
25 - %li.right 25 + %li.pull-right
26 %span.rss-icon 26 %span.rss-icon
27 = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do 27 = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
28 = image_tag "rss_ui.png", title: "feed" 28 = image_tag "rss_ui.png", title: "feed"
app/views/dashboard/_filter.html.haml
  Diff comments   View file @1fdeb9e
@@ -25,9 +25,9 @@ @@ -25,9 +25,9 @@
25 %li{class: ("active" if params[:project_id] == project.id.to_s)} 25 %li{class: ("active" if params[:project_id] == project.id.to_s)}
26 = link_to dashboard_filter_path(entity, project_id: project.id) do 26 = link_to dashboard_filter_path(entity, project_id: project.id) do
27 = project.name_with_namespace 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 %fieldset 30 %fieldset
31 %hr 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,7 +4,7 @@
4 %small 4 %small
5 (#{groups.count}) 5 (#{groups.count})
6 - if current_user.can_create_group? 6 - if current_user.can_create_group?
7 - %span.right 7 + %span.pull-right
8 = link_to new_group_path, class: "btn btn-tiny info" do 8 = link_to new_group_path, class: "btn btn-tiny info" do
9 %i.icon-plus 9 %i.icon-plus
10 New Group 10 New Group
@@ -13,6 +13,6 @@ @@ -13,6 +13,6 @@
13 %li 13 %li
14 = link_to group_path(id: group.path), class: dom_class(group) do 14 = link_to group_path(id: group.path), class: dom_class(group) do
15 %strong.well-title= truncate(group.name, length: 35) 15 %strong.well-title= truncate(group.name, length: 35)
16 - %span.right.light 16 + %span.pull-right.light
17 - if group.owner == current_user 17 - if group.owner == current_user
18 %i.icon-wrench 18 %i.icon-wrench
app/views/dashboard/_projects.html.haml
  Diff comments   View file @1fdeb9e
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 %small 4 %small
5 (#{@projects_count}) 5 (#{@projects_count})
6 - if current_user.can_create_project? 6 - if current_user.can_create_project?
7 - %span.right 7 + %span.pull-right
8 = link_to new_project_path, class: "btn btn-tiny info" do 8 = link_to new_project_path, class: "btn btn-tiny info" do
9 %i.icon-plus 9 %i.icon-plus
10 New Project 10 New Project
app/views/dashboard/_teams.html.haml
  Diff comments   View file @1fdeb9e
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 Teams 3 Teams
4 %small 4 %small
5 (#{@teams.count}) 5 (#{@teams.count})
6 - %span.right 6 + %span.pull-right
7 = link_to new_team_path, class: "btn btn-tiny info" do 7 = link_to new_team_path, class: "btn btn-tiny info" do
8 %i.icon-plus 8 %i.icon-plus
9 New Team 9 New Team
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 %li 12 %li
13 = link_to team_path(id: team.path), class: dom_class(team) do 13 = link_to team_path(id: team.path), class: dom_class(team) do
14 %strong.well-title= truncate(team.name, length: 35) 14 %strong.well-title= truncate(team.name, length: 35)
15 - %span.right.light 15 + %span.pull-right.light
16 - if team.owner == current_user 16 - if team.owner == current_user
17 %i.icon-wrench 17 %i.icon-wrench
18 - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id) 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 %h3.page_title 1 %h3.page_title
2 Issues 2 Issues
3 %small (assigned to you) 3 %small (assigned to you)
4 - %small.right #{@issues.total_count} issues 4 + %small.pull-right #{@issues.total_count} issues
5 5
6 %hr 6 %hr
7 7
app/views/dashboard/merge_requests.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 Merge Requests 2 Merge Requests
3 %small (authored by or assigned to you) 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 %hr 6 %hr
7 .row 7 .row
app/views/dashboard/projects.html.haml
  Diff comments   View file @1fdeb9e
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 %span 3 %span
4 (#{@projects.total_count}) 4 (#{@projects.total_count})
5 - if current_user.can_create_project? 5 - if current_user.can_create_project?
6 - %span.right 6 + %span.pull-right
7 = link_to new_project_path, class: "btn btn-tiny info" do 7 = link_to new_project_path, class: "btn btn-tiny info" do
8 %i.icon-plus 8 %i.icon-plus
9 New Project 9 New Project
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 %small.light 42 %small.light
43 %strong Last activity: 43 %strong Last activity:
44 %span= project_last_activity(project) 44 %span= project_last_activity(project)
45 - .right.light 45 + .pull-right.light
46 - if project.owner == current_user 46 - if project.owner == current_user
47 %i.icon-wrench 47 %i.icon-wrench
48 - tm = project.team.get_tm(current_user.id) 48 - tm = project.team.get_tm(current_user.id)
app/views/deploy_keys/_form.html.haml
  Diff comments   View file @1fdeb9e
1 %div 1 %div
2 = form_for [@project, @key], url: project_deploy_keys_path do |f| 2 = form_for [@project, @key], url: project_deploy_keys_path do |f|
3 -if @key.errors.any? 3 -if @key.errors.any?
4 - .alert-message.block-message.error 4 + .alert.alert-error
5 %ul 5 %ul
6 - @key.errors.full_messages.each do |msg| 6 - @key.errors.full_messages.each do |msg|
7 %li= msg 7 %li= msg
app/views/deploy_keys/_show.html.haml
  Diff comments   View file @1fdeb9e
@@ -8,5 +8,5 @@ @@ -8,5 +8,5 @@
8 = time_ago_in_words(key.created_at) 8 = time_ago_in_words(key.created_at)
9 ago 9 ago
10 %td 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,5 +10,5 @@
10 ← To keys list 10 ← To keys list
11 %hr 11 %hr
12 %pre= @key.key 12 %pre= @key.key
13 -.right 13 +.pull-right
14 = link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key" 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,4 +9,4 @@
9 = f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password" 9 = f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
10 %div 10 %div
11 = f.submit "Change my password", class: "btn btn-primary" 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,5 +25,5 @@
25 %span Remember me 25 %span Remember me
26 %br/ 26 %br/
27 = f.submit "Sign in", :class => "btn-primary btn" 27 = f.submit "Sign in", :class => "btn-primary btn"
28 - .right 28 + .pull-right
29 = render :partial => "devise/shared/links" 29 = render :partial => "devise/shared/links"
app/views/devise/sessions/new.html.haml
  Diff comments   View file @1fdeb9e
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 %span Remember me 12 %span Remember me
13 %br/ 13 %br/
14 = f.submit "Sign in", :class => "btn-primary btn wide" 14 = f.submit "Sign in", :class => "btn-primary btn wide"
15 - .right 15 + .pull-right
16 = link_to "Forgot your password?", new_password_path(resource_name), :class => "btn" 16 = link_to "Forgot your password?", new_password_path(resource_name), :class => "btn"
17 %br/ 17 %br/
18 %br/ 18 %br/
app/views/events/_event.html.haml
  Diff comments   View file @1fdeb9e
1 - if event.proper? 1 - if event.proper?
2 %div.event-item 2 %div.event-item
3 - %span.cgray.right 3 + %span.cgray.pull-right
4 #{time_ago_in_words(event.created_at)} ago. 4 #{time_ago_in_words(event.created_at)} ago.
5 5
6 = image_tag gravatar_icon(event.author_email), class: "avatar s24" 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,9 +25,9 @@
25 %li{class: ("active" if params[:project_id] == project.id.to_s)} 25 %li{class: ("active" if params[:project_id] == project.id.to_s)}
26 = link_to group_filter_path(entity, project_id: project.id) do 26 = link_to group_filter_path(entity, project_id: project.id) do
27 = project.name_with_namespace 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 %fieldset 30 %fieldset
31 %hr 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,9 +6,9 @@
6 %li{class: ("active" if params[:project_id] == project.id.to_s)} 6 %li{class: ("active" if params[:project_id] == project.id.to_s)}
7 = link_to people_group_path(@group, project_id: project.id) do 7 = link_to people_group_path(@group, project_id: project.id) do
8 = project.name_with_namespace 8 = project.name_with_namespace
9 - %small.right= project.users.count 9 + %small.pull-right= project.users.count
10 10
11 %fieldset 11 %fieldset
12 %hr 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,7 +4,7 @@
4 %small 4 %small
5 (#{projects.count}) 5 (#{projects.count})
6 - if can? current_user, :manage_group, @group 6 - if can? current_user, :manage_group, @group
7 - %span.right 7 + %span.pull-right
8 = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do 8 = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do
9 %i.icon-plus 9 %i.icon-plus
10 New Project 10 New Project
app/views/groups/issues.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 Issues 2 Issues
3 %small (assigned to you) 3 %small (assigned to you)
4 - %small.right #{@issues.total_count} issues 4 + %small.pull-right #{@issues.total_count} issues
5 5
6 %hr 6 %hr
7 .row 7 .row
app/views/groups/merge_requests.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 Merge Requests 2 Merge Requests
3 %small (authored by or assigned to you) 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 %hr 6 %hr
7 .row 7 .row
app/views/groups/new.html.haml
  Diff comments   View file @1fdeb9e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for @group do |f| 3 = form_for @group do |f|
4 - if @group.errors.any? 4 - if @group.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @group.errors.full_messages.first 6 %span= @group.errors.full_messages.first
7 .clearfix 7 .clearfix
8 = f.label :name do 8 = f.label :name do
app/views/groups/people.html.haml
  Diff comments   View file @1fdeb9e
@@ -16,5 +16,5 @@ @@ -16,5 +16,5 @@
16 %strong= user.name 16 %strong= user.name
17 %span.cgray= user.email 17 %span.cgray= user.email
18 - if @group.owner == user 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,5 +30,5 @@
30 %li 30 %li
31 %strong= link_to "Public Access", help_public_access_path 31 %strong= link_to "Public Access", help_public_access_path
32 32
33 - .span9.right 33 + .span9.pull-right
34 = yield 34 = yield
app/views/help/index.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 GITLAB 2 GITLAB
3 - .right 3 + .pull-right
4 %span= Gitlab::Version 4 %span= Gitlab::Version
5 %small= Gitlab::Revision 5 %small= Gitlab::Revision
6 %hr 6 %hr
app/views/hooks/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 10
11 = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f| 11 = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
12 -if @hook.errors.any? 12 -if @hook.errors.any?
13 - .alert-message.block-message.error 13 + .alert.alert-error
14 - @hook.errors.full_messages.each do |msg| 14 - @hook.errors.full_messages.each do |msg|
15 %p= msg 15 %p= msg
16 .clearfix 16 .clearfix
@@ -37,6 +37,6 @@ @@ -37,6 +37,6 @@
37 → 37 →
38 %span.monospace= hook.url 38 %span.monospace= hook.url
39 %td 39 %td
40 - .right 40 + .pull-right
41 = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped" 41 = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
42 = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small grouped" 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,5 +16,5 @@
16 16
17 %fieldset 17 %fieldset
18 %hr 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,7 +2,7 @@
2 %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}" 2 %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
3 = form_for [@project, @issue] do |f| 3 = form_for [@project, @issue] do |f|
4 -if @issue.errors.any? 4 -if @issue.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 - @issue.errors.full_messages.each do |msg| 6 - @issue.errors.full_messages.each do |msg|
7 %span= msg 7 %span= msg
8 %br 8 %br
app/views/issues/_head.html.haml
  Diff comments   View file @1fdeb9e
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 = link_to 'Milestones', project_milestones_path(@project), class: "tab" 5 = link_to 'Milestones', project_milestones_path(@project), class: "tab"
6 = nav_link(controller: :labels) do 6 = nav_link(controller: :labels) do
7 = link_to 'Labels', project_labels_path(@project), class: "tab" 7 = link_to 'Labels', project_labels_path(@project), class: "tab"
8 - %li.right 8 + %li.pull-right
9 %span.rss-icon 9 %span.rss-icon
10 = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do 10 = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
11 = image_tag "rss_ui.png", title: "feed" 11 = image_tag "rss_ui.png", title: "feed"
app/views/issues/_issues.html.haml
  Diff comments   View file @1fdeb9e
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 - if @issues.present? 4 - if @issues.present?
5 %li.bottom 5 %li.bottom
6 .left= paginate @issues, remote: true, theme: "gitlab" 6 .left= paginate @issues, remote: true, theme: "gitlab"
7 - .right 7 + .pull-right
8 %span.issue_counter #{@issues.total_count} 8 %span.issue_counter #{@issues.total_count}
9 issues for this filter 9 issues for this filter
10 - else 10 - else
app/views/issues/_show.html.haml
  Diff comments   View file @1fdeb9e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 - if controller.controller_name == 'issues' 2 - if controller.controller_name == 'issues'
3 .issue_check 3 .issue_check
4 = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue) 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 - if issue.notes.any? 6 - if issue.notes.any?
7 %span.btn.btn-small.disabled.grouped 7 %span.btn.btn-small.disabled.grouped
8 %i.icon-comment 8 %i.icon-comment
app/views/issues/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -3,16 +3,16 @@ @@ -3,16 +3,16 @@
3 %h3.page_title 3 %h3.page_title
4 Issues 4 Issues
5 %span (<span class=issue_counter>#{@issues.total_count}</span>) 5 %span (<span class=issue_counter>#{@issues.total_count}</span>)
6 - .right 6 + .pull-right
7 .span5 7 .span5
8 - if can? current_user, :write_issue, @project 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 %i.icon-plus 10 %i.icon-plus
11 New Issue 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 = hidden_field_tag :project_id, @project.id, { id: 'project_id' } 13 = hidden_field_tag :project_id, @project.id, { id: 'project_id' }
14 = hidden_field_tag :status, params[:status] 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 .clearfix 17 .clearfix
18 18
app/views/issues/show.html.haml
  Diff comments   View file @1fdeb9e
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 created at 5 created at
6 = @issue.created_at.stamp("Aug 21, 2011") 6 = @issue.created_at.stamp("Aug 21, 2011")
7 7
8 - %span.right 8 + %span.pull-right
9 - if can?(current_user, :admin_project, @project) || @issue.author == current_user 9 - if can?(current_user, :admin_project, @project) || @issue.author == current_user
10 - if @issue.closed 10 - if @issue.closed
11 = link_to 'Reopen', project_issue_path(@project, @issue, issue: {closed: false }, status_only: true), method: :put, class: "btn grouped reopen_issue" 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,7 +16,7 @@
16 %i.icon-edit 16 %i.icon-edit
17 Edit 17 Edit
18 18
19 -.right 19 +.pull-right
20 .span3#votes= render 'votes/votes_block', votable: @issue 20 .span3#votes= render 'votes/votes_block', votable: @issue
21 21
22 .back_link 22 .back_link
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 %cite.cgray and attached to milestone 42 %cite.cgray and attached to milestone
43 %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone) 43 %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
44 44
45 - .right 45 + .pull-right
46 - @issue.labels.each do |label| 46 - @issue.labels.each do |label|
47 %span.label 47 %span.label
48 %i.icon-tag 48 %i.icon-tag
app/views/kaminari/admin/_paginator.html.haml
  Diff comments   View file @1fdeb9e
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 %ul 10 %ul
11 = prev_page_tag unless current_page.first? 11 = prev_page_tag unless current_page.first?
12 - each_page do |page| 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 = page_tag page 14 = page_tag page
15 - elsif !page.was_truncated? 15 - elsif !page.was_truncated?
16 = gap_tag 16 = gap_tag
app/views/kaminari/gitlab/_paginator.html.haml
  Diff comments   View file @1fdeb9e
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 %nav.gitlab_pagination 9 %nav.gitlab_pagination
10 = prev_page_tag 10 = prev_page_tag
11 - each_page do |page| 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 = page_tag page 13 = page_tag page
14 - elsif !page.was_truncated? 14 - elsif !page.was_truncated?
15 = gap_tag 15 = gap_tag
app/views/keys/_form.html.haml
  Diff comments   View file @1fdeb9e
1 %div 1 %div
2 = form_for @key do |f| 2 = form_for @key do |f|
3 -if @key.errors.any? 3 -if @key.errors.any?
4 - .alert-message.block-message.error 4 + .alert.alert-error
5 %ul 5 %ul
6 - @key.errors.full_messages.each do |msg| 6 - @key.errors.full_messages.each do |msg|
7 %li= msg 7 %li= msg
app/views/keys/_show.html.haml
  Diff comments   View file @1fdeb9e
@@ -8,5 +8,5 @@ @@ -8,5 +8,5 @@
8 = time_ago_in_words(key.created_at) 8 = time_ago_in_words(key.created_at)
9 ago 9 ago
10 %td 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 %h3.page_title 1 %h3.page_title
2 SSH Keys 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 %hr 5 %hr
6 %p.slead 6 %p.slead
app/views/keys/show.html.haml
  Diff comments   View file @1fdeb9e
@@ -10,5 +10,5 @@ @@ -10,5 +10,5 @@
10 %hr 10 %hr
11 11
12 %pre= @key.key 12 %pre= @key.key
13 -.right 13 +.pull-right
14 = link_to 'Remove', @key, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key" 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,7 +2,7 @@
2 %strong 2 %strong
3 %i.icon-tag 3 %i.icon-tag
4 = label.name 4 = label.name
5 - .right 5 + .pull-right
6 = link_to project_issues_path(label_name: label.name) do 6 = link_to project_issues_path(label_name: label.name) do
7 %strong 7 %strong
8 = pluralize(label.count, 'issue') 8 = pluralize(label.count, 'issue')
app/views/merge_requests/_filter.html.haml
  Diff comments   View file @1fdeb9e
@@ -16,5 +16,5 @@ @@ -16,5 +16,5 @@
16 16
17 %fieldset 17 %fieldset
18 %hr 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 = form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f| 1 = form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
2 -if @merge_request.errors.any? 2 -if @merge_request.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @merge_request.errors.full_messages.each do |msg| 5 - @merge_request.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @1fdeb9e
1 %li{ class: mr_css_classes(merge_request) } 1 %li{ class: mr_css_classes(merge_request) }
2 - .right 2 + .pull-right
3 .left 3 .left
4 - if merge_request.merged? 4 - if merge_request.merged?
5 %span.btn.btn-small.disabled.grouped 5 %span.btn.btn-small.disabled.grouped
app/views/merge_requests/index.html.haml
  Diff comments   View file @1fdeb9e
1 - if can? current_user, :write_merge_request, @project 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 %i.icon-plus 3 %i.icon-plus
4 New Merge Request 4 New Merge Request
5 %h3.page_title 5 %h3.page_title
@@ -28,8 +28,8 @@ @@ -28,8 +28,8 @@
28 - if @merge_requests.present? 28 - if @merge_requests.present?
29 %li.bottom 29 %li.bottom
30 .left= paginate @merge_requests, theme: "gitlab" 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 :javascript 34 :javascript
35 $(merge_requestsPage); 35 $(merge_requestsPage);
app/views/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @1fdeb9e
1 - unless can?(current_user, :accept_mr, @project) 1 - unless can?(current_user, :accept_mr, @project)
2 - .alert-message 2 + .alert
3 %strong Only masters can accept MR 3 %strong Only masters can accept MR
4 4
5 5
@@ -29,14 +29,14 @@ @@ -29,14 +29,14 @@
29 %strong This repository does not have satellite. Ask administrator to fix this issue 29 %strong This repository does not have satellite. Ask administrator to fix this issue
30 30
31 .automerge_widget.cannot_be_merged{style: "display:none"} 31 .automerge_widget.cannot_be_merged{style: "display:none"}
32 - .alert.alert-info 32 + .alert.alert-disabled
33 %span 33 %span
34 = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge" 34 = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
35 &nbsp; 35 &nbsp;
36 %strong This request can't be merged with GitLab. You should do it manually 36 %strong This request can't be merged with GitLab. You should do it manually
37 37
38 .automerge_widget.unchecked 38 .automerge_widget.unchecked
39 - .alert-message 39 + .alert
40 %strong 40 %strong
41 %i.icon-refresh 41 %i.icon-refresh
42 Checking for ability to automatically merge… 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,7 +23,7 @@
23 = link_to "Build page", ci_build_details_path(@merge_request) 23 = link_to "Build page", ci_build_details_path(@merge_request)
24 24
25 .ci_widget 25 .ci_widget
26 - .alert-message 26 + .alert
27 %strong 27 %strong
28 %i.icon-refresh 28 %i.icon-refresh
29 Checking for CI status for #{@merge_request.last_commit_short_sha} 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,7 +5,7 @@
5 &rarr; 5 &rarr;
6 %span.label_branch= @merge_request.target_branch 6 %span.label_branch= @merge_request.target_branch
7 7
8 - %span.right 8 + %span.pull-right
9 - if can?(current_user, :modify_merge_request, @merge_request) 9 - if can?(current_user, :modify_merge_request, @merge_request)
10 - if @merge_request.open? 10 - if @merge_request.open?
11 .left.btn-group 11 .left.btn-group
@@ -17,13 +17,13 @@ @@ -17,13 +17,13 @@
17 %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch) 17 %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
18 %li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff) 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 = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do 22 = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
23 %i.icon-edit 23 %i.icon-edit
24 Edit 24 Edit
25 25
26 -.right 26 +.pull-right
27 .span3#votes= render 'votes/votes_block', votable: @merge_request 27 .span3#votes= render 'votes/votes_block', votable: @merge_request
28 28
29 .back_link 29 .back_link
app/views/milestones/_form.html.haml
  Diff comments   View file @1fdeb9e
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 = form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"} do |f| 8 = form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"} do |f|
9 -if @milestone.errors.any? 9 -if @milestone.errors.any?
10 - .alert-message.block-message.error 10 + .alert.alert-error
11 %ul 11 %ul
12 - @milestone.errors.full_messages.each do |msg| 12 - @milestone.errors.full_messages.each do |msg|
13 %li= msg 13 %li= msg
app/views/milestones/_milestone.html.haml
  Diff comments   View file @1fdeb9e
1 %li{class: "milestone milestone-#{milestone.closed ? 'closed' : 'open'}", id: dom_id(milestone) } 1 %li{class: "milestone milestone-#{milestone.closed ? 'closed' : 'open'}", id: dom_id(milestone) }
2 - .right 2 + .pull-right
3 - if can?(current_user, :admin_milestone, milestone.project) and milestone.open? 3 - if can?(current_user, :admin_milestone, milestone.project) and milestone.open?
4 = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do 4 = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
5 %i.icon-edit 5 %i.icon-edit
app/views/milestones/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 %h3.page_title 3 %h3.page_title
4 Milestones 4 Milestones
5 - if can? current_user, :admin_milestone, @project 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 %br 7 %br
8 %div.ui-box 8 %div.ui-box
9 .title 9 .title
app/views/milestones/show.html.haml
  Diff comments   View file @1fdeb9e
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 = link_to project_milestones_path(@project) do 8 = link_to project_milestones_path(@project) do
9 &larr; To milestones list 9 &larr; To milestones list
10 .span6 10 .span6
11 - .right 11 + .pull-right
12 - unless @milestone.closed 12 - unless @milestone.closed
13 = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do 13 = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
14 %i.icon-plus 14 %i.icon-plus
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 #{@milestone.closed_items_count} closed 43 #{@milestone.closed_items_count} closed
44 &ndash; 44 &ndash;
45 #{@milestone.open_items_count} open 45 #{@milestone.open_items_count} open
46 - %span.right= @milestone.expires_at 46 + %span.pull-right= @milestone.expires_at
47 .progress.progress-info 47 .progress.progress-info
48 .bar{style: "width: #{@milestone.percent_complete}%;"} 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,7 +19,7 @@
19 = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button" 19 = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
20 %a.btn.grouped.js-close-discussion-note-form Cancel 20 %a.btn.grouped.js-close-discussion-note-form Cancel
21 .hint 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 .clearfix 23 .clearfix
24 24
25 .note_options 25 .note_options
app/views/notes/_note.html.haml
  Diff comments   View file @1fdeb9e
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 - if note.attachment.url 30 - if note.attachment.url
31 - if note.attachment.image? 31 - if note.attachment.image?
32 = image_tag note.attachment.url, class: 'note-image-attach' 32 = image_tag note.attachment.url, class: 'note-image-attach'
33 - .attachment.right 33 + .attachment.pull-right
34 = link_to note.attachment.url, target: "_blank" do 34 = link_to note.attachment.url, target: "_blank" do
35 %i.icon-attachment 35 %i.icon-attachment
36 = note.attachment_identifier 36 = note.attachment_identifier
app/views/profiles/account.html.haml
  Diff comments   View file @1fdeb9e
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 %fieldset 12 %fieldset
13 %legend 13 %legend
14 Private token 14 Private token
15 - %span.cred.right 15 + %span.cred.pull-right
16 keep it secret! 16 keep it secret!
17 .padded 17 .padded
18 = form_for @user, url: reset_private_token_profile_path, method: :put do |f| 18 = form_for @user, url: reset_private_token_profile_path, method: :put do |f|
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 .padded 35 .padded
36 %p.slead After successful password update you will be redirected to login page where you should login with new password 36 %p.slead After successful password update you will be redirected to login page where you should login with new password
37 -if @user.errors.any? 37 -if @user.errors.any?
38 - .alert-message.block-message.error 38 + .alert.alert-error
39 %ul 39 %ul
40 - @user.errors.full_messages.each do |msg| 40 - @user.errors.full_messages.each do |msg|
41 %li= msg 41 %li= msg
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 %fieldset.update-username 56 %fieldset.update-username
57 %legend 57 %legend
58 Username 58 Username
59 - %small.cred.right 59 + %small.cred.pull-right
60 Changing your username can have unintended side effects! 60 Changing your username can have unintended side effects!
61 = form_for @user, url: update_username_profile_path, method: :put, remote: true do |f| 61 = form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
62 .padded 62 .padded
app/views/profiles/show.html.haml
  Diff comments   View file @1fdeb9e
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 %small 6 %small
7 = @user.email 7 = @user.email
8 8
9 - .right 9 + .pull-right
10 = link_to destroy_user_session_path, class: "logout", method: :delete do 10 = link_to destroy_user_session_path, class: "logout", method: :delete do
11 %small 11 %small
12 %i.icon-signout 12 %i.icon-signout
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 15
16 = form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" } do |f| 16 = form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" } do |f|
17 -if @user.errors.any? 17 -if @user.errors.any?
18 - %div.alert-message.block-message.error 18 + %div.alert.alert-error
19 %ul 19 %ul
20 - @user.errors.full_messages.each do |msg| 20 - @user.errors.full_messages.each do |msg|
21 %li= msg 21 %li= msg
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250 46 = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
47 %span.help-block Tell us about yourself in fewer than 250 characters. 47 %span.help-block Tell us about yourself in fewer than 250 characters.
48 48
49 - .span5.right 49 + .span5.pull-right
50 %fieldset.tips 50 %fieldset.tips
51 %legend Tips: 51 %legend Tips:
52 %ul 52 %ul
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 %fieldset 76 %fieldset
77 %legend 77 %legend
78 Personal projects: 78 Personal projects:
79 - %small.right 79 + %small.pull-right
80 %span= current_user.personal_projects.count 80 %span= current_user.personal_projects.count
81 of 81 of
82 %span= current_user.projects_limit 82 %span= current_user.projects_limit
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 %fieldset 87 %fieldset
88 %legend 88 %legend
89 SSH public keys: 89 SSH public keys:
90 - %span.right 90 + %span.pull-right
91 = link_to pluralize(current_user.keys.count, 'key'), keys_path 91 = link_to pluralize(current_user.keys.count, 'key'), keys_path
92 .padded 92 .padded
93 = link_to "Add Public Key", new_key_path, class: "btn btn-small" 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,8 +2,8 @@
2 .row 2 .row
3 .span7 3 .span7
4 .form-horizontal= render "shared/clone_panel" 4 .form-horizontal= render "shared/clone_panel"
5 - .span4.right  
6 - .right 5 + .span4.pull-right
  6 + .pull-right
7 - unless @project.empty_repo? 7 - unless @project.empty_repo?
8 - if can? current_user, :download_code, @project 8 - if can? current_user, :download_code, @project
9 = link_to archive_project_repository_path(@project), class: "btn-small btn grouped" do 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 = form_for(@project, remote: true) do |f| 1 = form_for(@project, remote: true) do |f|
2 - if @project.errors.any? 2 - if @project.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @project.errors.full_messages.each do |msg| 5 - @project.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
@@ -81,5 +81,5 @@ @@ -81,5 +81,5 @@
81 = link_to 'Cancel', @project, class: "btn" 81 = link_to 'Cancel', @project, class: "btn"
82 - unless @project.new_record? 82 - unless @project.new_record?
83 - if can?(current_user, :remove_project, @project) 83 - if can?(current_user, :remove_project, @project)
84 - .right 84 + .pull-right
85 = link_to 'Remove Project', @project, confirm: 'Removed project can not be restored! Are you sure?', method: :delete, class: "btn btn-remove" 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 = form_for(@project, remote: true) do |f| 1 = form_for(@project, remote: true) do |f|
2 - if @project.errors.any? 2 - if @project.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %span= @project.errors.full_messages.first 4 %span= @project.errors.full_messages.first
5 .clearfix.project_name_holder 5 .clearfix.project_name_holder
6 = f.label :name do 6 = f.label :name do
app/views/projects/_project_head.html.haml
  Diff comments   View file @1fdeb9e
@@ -13,19 +13,19 @@ @@ -13,19 +13,19 @@
13 = link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab" 13 = link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
14 14
15 - if can? current_user, :admin_project, @project 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 = link_to project_deploy_keys_path(@project) do 17 = link_to project_deploy_keys_path(@project) do
18 %span 18 %span
19 Deploy Keys 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 = link_to project_hooks_path(@project) do 21 = link_to project_hooks_path(@project) do
22 %span 22 %span
23 Hooks 23 Hooks
24 - = nav_link(controller: :services, html_options: {class: 'right'}) do 24 + = nav_link(controller: :services, html_options: {class: 'pull-right'}) do
25 = link_to project_services_path(@project) do 25 = link_to project_services_path(@project) do
26 %span 26 %span
27 Services 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 = link_to edit_project_path(@project), class: "stat-tab tab " do 29 = link_to edit_project_path(@project), class: "stat-tab tab " do
30 %i.icon-edit 30 %i.icon-edit
31 Edit 31 Edit
app/views/projects/empty.html.haml
  Diff comments   View file @1fdeb9e
@@ -31,4 +31,4 @@ @@ -31,4 +31,4 @@
31 31
32 - if can? current_user, :remove_project, @project 32 - if can? current_user, :remove_project, @project
33 .prepend-top-20 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,7 +14,7 @@
14 - if can? current_user, :admin_project, @project 14 - if can? current_user, :admin_project, @project
15 = form_for [@project, @protected_branch] do |f| 15 = form_for [@project, @protected_branch] do |f|
16 -if @protected_branch.errors.any? 16 -if @protected_branch.errors.any?
17 - .alert-message.block-message.error 17 + .alert.alert-error
18 %ul 18 %ul
19 - @protected_branch.errors.full_messages.each do |msg| 19 - @protected_branch.errors.full_messages.each do |msg|
20 %li= msg 20 %li= msg
app/views/public/projects/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 %h5 9 %h5
10 %i.icon-share 10 %i.icon-share
11 = project.name_with_namespace 11 = project.name_with_namespace
12 - .right 12 + .pull-right
13 %pre.dark.tiny git clone #{project.http_url_to_repo} 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,6 +15,6 @@
15 = image_tag gravatar_icon(commit.author_email), class: "", width: 16 15 = image_tag gravatar_icon(commit.author_email), class: "", width: 16
16 = gfm escape_once(truncate(commit.title, length: 40)) 16 = gfm escape_once(truncate(commit.title, length: 40))
17 %td 17 %td
18 - %span.right.cgray 18 + %span.pull-right.cgray
19 = time_ago_in_words(commit.committed_date) 19 = time_ago_in_words(commit.committed_date)
20 ago 20 ago
app/views/repositories/stats.html.haml
  Diff comments   View file @1fdeb9e
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 = image_tag gravatar_icon(author.email, 16), class: 'avatar s16' 23 = image_tag gravatar_icon(author.email, 16), class: 'avatar s16'
24 = author.name 24 = author.name
25 %small.light= author.email 25 %small.light= author.email
26 - .right 26 + .pull-right
27 = author.commits 27 = author.commits
28 28
29 29
app/views/services/_gitlab_ci.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 GitLab CI 2 GitLab CI
3 %small Continuous integration server from GitLab 3 %small Continuous integration server from GitLab
4 - .right 4 + .pull-right
5 - if @service.active 5 - if @service.active
6 %small.cgreen Enabled 6 %small.cgreen Enabled
7 - else 7 - else
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 %hr 16 %hr
17 = form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f| 17 = form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f|
18 - if @service.errors.any? 18 - if @service.errors.any?
19 - .alert-message.block-message.error 19 + .alert.alert-error
20 %ul 20 %ul
21 - @service.errors.full_messages.each do |msg| 21 - @service.errors.full_messages.each do |msg|
22 %li= msg 22 %li= msg
app/views/services/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 = link_to edit_project_service_path(@project, :gitlab_ci) do 8 = link_to edit_project_service_path(@project, :gitlab_ci) do
9 GitLab CI 9 GitLab CI
10 %small Continuous integration server from GitLab 10 %small Continuous integration server from GitLab
11 - .right 11 + .pull-right
12 - if @gitlab_ci_service.try(:active) 12 - if @gitlab_ci_service.try(:active)
13 %small.cgreen 13 %small.cgreen
14 %i.icon-ok 14 %i.icon-ok
@@ -21,11 +21,11 @@ @@ -21,11 +21,11 @@
21 %h4 21 %h4
22 Jenkins CI 22 Jenkins CI
23 %small An extendable open source continuous integration server 23 %small An extendable open source continuous integration server
24 - .right 24 + .pull-right
25 %small Not implemented yet 25 %small Not implemented yet
26 %li.disabled 26 %li.disabled
27 %h4 27 %h4
28 Campfire 28 Campfire
29 %small Web-based group chat tool 29 %small Web-based group chat tool
30 - .right 30 + .pull-right
31 %small Not implemented yet 31 %small Not implemented yet
app/views/snippets/_form.html.haml
  Diff comments   View file @1fdeb9e
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 .snippet-form-holder 4 .snippet-form-holder
5 = form_for [@project, @snippet] do |f| 5 = form_for [@project, @snippet] do |f|
6 -if @snippet.errors.any? 6 -if @snippet.errors.any?
7 - .alert-message.block-message.error 7 + .alert.alert-error
8 %ul 8 %ul
9 - @snippet.errors.full_messages.each do |msg| 9 - @snippet.errors.full_messages.each do |msg|
10 %li= msg 10 %li= msg
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 = f.submit 'Save', class: "btn-save btn" 30 = f.submit 'Save', class: "btn-save btn"
31 = link_to "Cancel", project_snippets_path(@project), class: " btn" 31 = link_to "Cancel", project_snippets_path(@project), class: " btn"
32 - unless @snippet.new_record? 32 - unless @snippet.new_record?
33 - .right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}" 33 + .pull-right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
34 34
35 35
36 :javascript 36 :javascript
app/views/snippets/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 %small share code pastes with others out of git repository 5 %small share code pastes with others out of git repository
6 6
7 - if can? current_user, :write_snippet, @project 7 - if can? current_user, :write_snippet, @project
8 - = link_to new_project_snippet_path(@project), class: "btn btn-small add_new right", title: "New Snippet" do 8 + = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
9 Add new snippet 9 Add new snippet
10 %br 10 %br
11 %table 11 %table
app/views/snippets/show.html.haml
  Diff comments   View file @1fdeb9e
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 = @snippet.title 4 = @snippet.title
5 %small= @snippet.file_name 5 %small= @snippet.file_name
6 - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user 6 - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
7 - = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small right" 7 + = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right"
8 8
9 %br 9 %br
10 %div= render 'blob' 10 %div= render 'blob'
app/views/team_members/_form.html.haml
  Diff comments   View file @1fdeb9e
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 %hr 3 %hr
4 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f| 4 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
5 -if @user_project_relation.errors.any? 5 -if @user_project_relation.errors.any?
6 - .alert-message.block-message.error 6 + .alert.alert-error
7 %ul 7 %ul
8 - @user_project_relation.errors.full_messages.each do |msg| 8 - @user_project_relation.errors.full_messages.each do |msg|
9 %li= msg 9 %li= msg
@@ -19,5 +19,5 @@ @@ -19,5 +19,5 @@
19 .input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen" 19 .input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
20 20
21 .actions 21 .actions
22 - = f.submit 'Save', class: "btn btn-save" 22 + = f.submit 'Add users', class: "btn btn-create"
23 = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel" 23 = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
app/views/team_members/_show.html.haml
  Diff comments   View file @1fdeb9e
@@ -10,16 +10,16 @@ @@ -10,16 +10,16 @@
10 %br 10 %br
11 %small.cgray= user.email 11 %small.cgray= user.email
12 12
13 - .span5.right 13 + .span5.pull-right
14 - if allow_admin 14 - if allow_admin
15 .left 15 .left
16 = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f| 16 = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
17 = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2" 17 = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2"
18 - .right 18 + .pull-right
19 - if current_user == user 19 - if current_user == user
20 %span.btn.disabled This is you! 20 %span.btn.disabled This is you!
21 - if @project.namespace_owner == user 21 - if @project.namespace_owner == user
22 - %span.btn.disabled.btn-success Owner 22 + %span.btn.disabled Owner
23 - elsif user.blocked 23 - elsif user.blocked
24 %span.btn.disabled.blocked Blocked 24 %span.btn.disabled.blocked Blocked
25 - elsif allow_admin 25 - elsif allow_admin
app/views/team_members/_show_team.html.haml
  Diff comments   View file @1fdeb9e
@@ -7,8 +7,8 @@ @@ -7,8 +7,8 @@
7 %br 7 %br
8 %small.cgray Members: #{team.members.count} 8 %small.cgray Members: #{team.members.count}
9 9
10 - .span5.right  
11 - .right 10 + .span5.pull-right
  11 + .pull-right
12 - if allow_admin 12 - if allow_admin
13 .left 13 .left
14 = link_to resign_project_team_path(@project, team), method: :delete, confirm: "Are you shure?", class: "btn btn-remove small" do 14 = link_to resign_project_team_path(@project, team), method: :delete, confirm: "Are you shure?", class: "btn btn-remove small" do
app/views/team_members/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 %strong= link_to "here", help_permissions_path, class: "vlink" 7 %strong= link_to "here", help_permissions_path, class: "vlink"
8 8
9 - if can? current_user, :admin_team_member, @project 9 - if can? current_user, :admin_team_member, @project
10 - %span.right 10 + %span.pull-right
11 = link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do 11 = link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
12 Import team from another project 12 Import team from another project
13 = link_to available_project_teams_path(@project), class: "btn btn-small grouped", title: "Assign project to team of users" do 13 = link_to available_project_teams_path(@project), class: "btn btn-small grouped", title: "Assign project to team of users" do
app/views/team_members/show.html.haml
  Diff comments   View file @1fdeb9e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 .team_member_show 3 .team_member_show
4 - if can? current_user, :admin_project, @project 4 - if can? current_user, :admin_project, @project
5 - = link_to 'Remove from team', project_team_member_path(@project, @member), confirm: 'Are you sure?', method: :delete, class: "right btn btn-remove" 5 + = link_to 'Remove from team', project_team_member_path(@project, @member), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove pull-right"
6 .profile_avatar_holder 6 .profile_avatar_holder
7 = image_tag gravatar_icon(@member.email, 60), class: "borders" 7 = image_tag gravatar_icon(@member.email, 60), class: "borders"
8 %h3.page_title 8 %h3.page_title
app/views/teams/_filter.html.haml
  Diff comments   View file @1fdeb9e
@@ -25,9 +25,9 @@ @@ -25,9 +25,9 @@
25 %li{class: ("active" if params[:project_id] == project.id.to_s)} 25 %li{class: ("active" if params[:project_id] == project.id.to_s)}
26 = link_to team_filter_path(entity, project_id: project.id) do 26 = link_to team_filter_path(entity, project_id: project.id) do
27 = project.name_with_namespace 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 %fieldset 30 %fieldset
31 %hr 31 %hr
32 - = link_to "Reset", team_filter_path(entity), class: 'btn right' 32 + = link_to "Reset", team_filter_path(entity), class: 'btn pull-right'
33 33
app/views/teams/_projects.html.haml
  Diff comments   View file @1fdeb9e
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 %small 4 %small
5 (#{projects.count}) 5 (#{projects.count})
6 - if can? current_user, :manage_user_team, @team 6 - if can? current_user, :manage_user_team, @team
7 - %span.right 7 + %span.pull-right
8 = link_to new_team_project_path(@team), class: "btn btn-tiny info" do 8 = link_to new_team_project_path(@team), class: "btn btn-tiny info" do
9 %i.icon-plus 9 %i.icon-plus
10 Assign Project 10 Assign Project
app/views/teams/edit.html.haml
  Diff comments   View file @1fdeb9e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for @team, url: teams_path do |f| 3 = form_for @team, url: teams_path do |f|
4 - if @team.errors.any? 4 - if @team.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @team.errors.full_messages.first 6 %span= @team.errors.full_messages.first
7 .clearfix 7 .clearfix
8 = f.label :name do 8 = f.label :name do
app/views/teams/issues.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 Issues 2 Issues
3 %small (in Team projects assigned to Team members) 3 %small (in Team projects assigned to Team members)
4 - %small.right #{@issues.total_count} issues 4 + %small.pull-right #{@issues.total_count} issues
5 5
6 %hr 6 %hr
7 .row 7 .row
app/views/teams/members/_form.html.haml
  Diff comments   View file @1fdeb9e
1 = form_tag admin_team_member_path(@team, @member), method: :put do 1 = form_tag admin_team_member_path(@team, @member), method: :put do
2 -if @member.errors.any? 2 -if @member.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @member.errors.full_messages.each do |msg| 5 - @member.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/teams/members/_show.html.haml
  Diff comments   View file @1fdeb9e
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 %br 10 %br
11 %small.cgray= user.email 11 %small.cgray= user.email
12 12
13 - .span6.right 13 + .span6.pull-right
14 - if allow_admin 14 - if allow_admin
15 .left.span2 15 .left.span2
16 = form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f| 16 = form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f|
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 %span 19 %span
20 = check_box_tag :group_admin, true, @team.admin?(user) 20 = check_box_tag :group_admin, true, @team.admin?(user)
21 Admin access 21 Admin access
22 - .right 22 + .pull-right
23 - if current_user == user 23 - if current_user == user
24 %span.btn.disabled This is you! 24 %span.btn.disabled This is you!
25 - if @team.owner == user 25 - if @team.owner == user
app/views/teams/members/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 %strong= link_to "here", help_permissions_path, class: "vlink" 6 %strong= link_to "here", help_permissions_path, class: "vlink"
7 7
8 - if can? current_user, :manage_user_team, @team 8 - if can? current_user, :manage_user_team, @team
9 - %span.right 9 + %span.pull-right
10 = link_to new_team_member_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do 10 = link_to new_team_member_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do
11 New Team Member 11 New Team Member
12 %hr 12 %hr
app/views/teams/members/show.html.haml
  Diff comments   View file @1fdeb9e
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 .team_member_show 4 .team_member_show
5 - if can? current_user, :admin_project, @project 5 - if can? current_user, :admin_project, @project
6 - = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "right btn btn-remove" 6 + = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "pull-right btn btn-remove"
7 .profile_avatar_holder 7 .profile_avatar_holder
8 = image_tag gravatar_icon(user.email, 60), class: "borders" 8 = image_tag gravatar_icon(user.email, 60), class: "borders"
9 %h3.page_title 9 %h3.page_title
app/views/teams/merge_requests.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 Merge Requests 2 Merge Requests
3 %small (authored by or assigned to Team members) 3 %small (authored by or assigned to Team members)
4 - %small.right #{@merge_requests.total_count} merge requests 4 + %small.pull-right #{@merge_requests.total_count} merge requests
5 5
6 %hr 6 %hr
7 .row 7 .row
app/views/teams/new.html.haml
  Diff comments   View file @1fdeb9e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for @team, url: teams_path do |f| 3 = form_for @team, url: teams_path do |f|
4 - if @team.errors.any? 4 - if @team.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @team.errors.full_messages.first 6 %span= @team.errors.full_messages.first
7 .clearfix 7 .clearfix
8 = f.label :name do 8 = f.label :name do
app/views/teams/projects/_form.html.haml
  Diff comments   View file @1fdeb9e
1 = form_tag team_project_path(@team, @project), method: :put do 1 = form_tag team_project_path(@team, @project), method: :put do
2 -if @project.errors.any? 2 -if @project.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @project.errors.full_messages.each do |msg| 5 - @project.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/teams/projects/index.html.haml
  Diff comments   View file @1fdeb9e
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 %strong= link_to "here", help_permissions_path, class: "vlink" 5 %strong= link_to "here", help_permissions_path, class: "vlink"
6 6
7 - if current_user.can?(:manage_user_team, @team) && @avaliable_projects.any? 7 - if current_user.can?(:manage_user_team, @team) && @avaliable_projects.any?
8 - %span.right 8 + %span.pull-right
9 = link_to new_team_project_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do 9 = link_to new_team_project_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do
10 Assign project to Team 10 Assign project to Team
11 11
app/views/tree/_head.html.haml
  Diff comments   View file @1fdeb9e
@@ -3,5 +3,5 @@ @@ -3,5 +3,5 @@
3 = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: @path} 3 = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: @path}
4 = nav_link(controller: :tree) do 4 = nav_link(controller: :tree) do
5 = link_to 'Source', project_tree_path(@project, @ref) 5 = link_to 'Source', project_tree_path(@project, @ref)
6 - %li.right 6 + %li.pull-right
7 = render "shared/clone_panel" 7 = render "shared/clone_panel"
app/views/tree/_tree.html.haml
  Diff comments   View file @1fdeb9e
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 %th Name 24 %th Name
25 %th Last Update 25 %th Last Update
26 %th Last Commit 26 %th Last Commit
27 - %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny right" 27 + %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right"
28 28
29 - if tree.up_dir? 29 - if tree.up_dir?
30 %tr.tree-item 30 %tr.tree-item
app/views/users/_profile.html.haml
  Diff comments   View file @1fdeb9e
@@ -4,20 +4,20 @@ @@ -4,20 +4,20 @@
4 %ul.well-list 4 %ul.well-list
5 %li 5 %li
6 %strong Email 6 %strong Email
7 - %span.right= mail_to @user.email 7 + %span.pull-right= mail_to @user.email
8 - unless @user.skype.blank? 8 - unless @user.skype.blank?
9 %li 9 %li
10 %strong Skype 10 %strong Skype
11 - %span.right= @user.skype 11 + %span.pull-right= @user.skype
12 - unless @user.linkedin.blank? 12 - unless @user.linkedin.blank?
13 %li 13 %li
14 %strong LinkedIn 14 %strong LinkedIn
15 - %span.right= @user.linkedin 15 + %span.pull-right= @user.linkedin
16 - unless @user.twitter.blank? 16 - unless @user.twitter.blank?
17 %li 17 %li
18 %strong Twitter 18 %strong Twitter
19 - %span.right= @user.twitter 19 + %span.pull-right= @user.twitter
20 - unless @user.bio.blank? 20 - unless @user.bio.blank?
21 %li 21 %li
22 %strong Bio 22 %strong Bio
23 - %span.right= @user.bio 23 + %span.pull-right= @user.bio
app/views/users/_projects.html.haml
  Diff comments   View file @1fdeb9e
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 \/ 9 \/
10 %strong.well-title 10 %strong.well-title
11 = truncate(project.name, length: 45) 11 = truncate(project.name, length: 45)
12 - %span.right.light 12 + %span.pull-right.light
13 - if project.owner == @user 13 - if project.owner == @user
14 %i.icon-wrench 14 %i.icon-wrench
15 - tm = project.team.get_tm(@user.id) 15 - tm = project.team.get_tm(@user.id)
app/views/users/show.html.haml
  Diff comments   View file @1fdeb9e
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 = image_tag gravatar_icon(@user.email, 90), class: "avatar s90" 4 = image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
5 = @user.name 5 = @user.name
6 - if @user == current_user 6 - if @user == current_user
7 - .right 7 + .pull-right
8 = link_to profile_path, class: 'btn btn-small' do 8 = link_to profile_path, class: 'btn btn-small' do
9 %i.icon-edit 9 %i.icon-edit
10 Edit Profile 10 Edit Profile
app/views/wikis/edit.html.haml
  Diff comments   View file @1fdeb9e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = render 'form' 3 = render 'form'
4 4
5 -.right 5 +.pull-right
6 - if can? current_user, :admin_wiki, @project 6 - if can? current_user, :admin_wiki, @project
7 = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn btn-small btn-remove" do 7 = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn btn-small btn-remove" do
8 Delete this page 8 Delete this page
9 \ No newline at end of file 9 \ No newline at end of file
app/views/wikis/show.html.haml
  Diff comments   View file @1fdeb9e
1 %h3.page_title 1 %h3.page_title
2 = @wiki.title 2 = @wiki.title
3 - %span.right 3 + %span.pull-right
4 = link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do 4 = link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do
5 Pages 5 Pages
6 - if can? current_user, :write_wiki, @project 6 - if can? current_user, :write_wiki, @project
features/steps/project/project_team_management.rb
  Diff comments   View file @1fdeb9e
@@ -24,7 +24,7 @@ class ProjectTeamManagement &lt; Spinach::FeatureSteps @@ -24,7 +24,7 @@ class ProjectTeamManagement &lt; Spinach::FeatureSteps
24 select user.name, :from => "user_ids" 24 select user.name, :from => "user_ids"
25 select "Reporter", :from => "project_access" 25 select "Reporter", :from => "project_access"
26 end 26 end
27 - click_button "Save" 27 + click_button "Add users"
28 end 28 end
29 29
30 Then 'I should see "Mike" in team list as "Reporter"' do 30 Then 'I should see "Mike" in team list as "Reporter"' do