Download as
Browse Code »

Commit a41875d21e9c87f15754c1d23db3a6fb80b7bdcd

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

Replace %h5.title with div.title

Showing 33 changed files with 52 additions and 58 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @a41875d
@@ -88,13 +88,10 @@ @@ -88,13 +88,10 @@
88 text-shadow: 0 1px 1px #fff; 88 text-shadow: 0 1px 1px #fff;
89 padding: 10px; 89 padding: 10px;
90 font-size: 14px; 90 font-size: 14px;
  91 + line-height: 20px;
91 font-weight: normal; 92 font-weight: normal;
92 margin: 0; 93 margin: 0;
93 94
94 - h5 {  
95 - margin: 0;  
96 - }  
97 -  
98 > a { 95 > a {
99 text-shadow: 0 1px 1px #fff; 96 text-shadow: 0 1px 1px #fff;
100 } 97 }
@@ -106,7 +103,7 @@ @@ -106,7 +103,7 @@
106 103
107 .btn { 104 .btn {
108 position: relative; 105 position: relative;
109 - top: -2px; 106 + margin-top: -2px;
110 } 107 }
111 108
112 .nav-pills { 109 .nav-pills {
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
  Diff comments   View file @a41875d
@@ -77,7 +77,6 @@ @@ -77,7 +77,6 @@
77 77
78 @mixin md-typography { 78 @mixin md-typography {
79 code { padding: 0 4px; } 79 code { padding: 0 4px; }
80 - p { font-size: 14px; }  
81 h1 { margin-top: 30px;} 80 h1 { margin-top: 30px;}
82 h2 { margin-top: 25px;} 81 h2 { margin-top: 25px;}
83 h3 { margin-top: 20px;} 82 h3 { margin-top: 20px;}
app/assets/stylesheets/sections/dashboard.scss
  Diff comments   View file @a41875d
@@ -10,8 +10,8 @@ @@ -10,8 +10,8 @@
10 margin: 0px; 10 margin: 0px;
11 box-shadow: none; 11 box-shadow: none;
12 12
13 - > .title {  
14 - padding: 2px 15px; 13 + .title .btn {
  14 + margin: 0;
15 } 15 }
16 .nav-projects-tabs li { padding: 0; } 16 .nav-projects-tabs li { padding: 0; }
17 } 17 }
@@ -37,8 +37,6 @@ @@ -37,8 +37,6 @@
37 padding: 4px 6px; 37 padding: 4px 6px;
38 width: 202px; 38 width: 202px;
39 float: left; 39 float: left;
40 - margin-top: 3px;  
41 - margin-left: -2px;  
42 } 40 }
43 } 41 }
44 42
app/views/admin/dashboard/index.html.haml
  Diff comments   View file @a41875d
1 .admin_dash.row 1 .admin_dash.row
2 .span4 2 .span4
3 .ui-box 3 .ui-box
4 - %h5.title Projects 4 + .title Projects
5 .data.padded 5 .data.padded
6 = link_to admin_projects_path do 6 = link_to admin_projects_path do
7 %h1= Project.count 7 %h1= Project.count
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 = link_to 'New Project', new_project_path, class: "btn btn-small" 9 = link_to 'New Project', new_project_path, class: "btn btn-small"
10 .span4 10 .span4
11 .ui-box 11 .ui-box
12 - %h5.title Users 12 + .title Users
13 .data.padded 13 .data.padded
14 = link_to admin_users_path do 14 = link_to admin_users_path do
15 %h1= User.count 15 %h1= User.count
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 = link_to 'New User', new_admin_user_path, class: "btn btn-small" 17 = link_to 'New User', new_admin_user_path, class: "btn btn-small"
18 .span4 18 .span4
19 .ui-box 19 .ui-box
20 - %h5.title Groups 20 + .title Groups
21 .data.padded 21 .data.padded
22 = link_to admin_groups_path do 22 = link_to admin_groups_path do
23 %h1= Group.count 23 %h1= Group.count
app/views/admin/groups/show.html.haml
  Diff comments   View file @a41875d
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 .row 8 .row
9 .span6 9 .span6
10 .ui-box 10 .ui-box
11 - %h5.title 11 + .title
12 Group info: 12 Group info:
13 %ul.well-list 13 %ul.well-list
14 %li 14 %li
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 = @group.created_at.stamp("March 1, 1999") 50 = @group.created_at.stamp("March 1, 1999")
51 51
52 .ui-box 52 .ui-box
53 - %h5.title 53 + .title
54 Projects 54 Projects
55 %small 55 %small
56 (#{@group.projects.count}) 56 (#{@group.projects.count})
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 64
65 .span6 65 .span6
66 .ui-box 66 .ui-box
67 - %h5.title 67 + .title
68 Add user(s) to the group: 68 Add user(s) to the group:
69 .ui-box-body.form-holder 69 .ui-box-body.form-holder
70 %p.light 70 %p.light
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 %hr 79 %hr
80 = submit_tag 'Add users into group', class: "btn btn-create" 80 = submit_tag 'Add users into group', class: "btn btn-create"
81 .ui-box 81 .ui-box
82 - %h5.title 82 + .title
83 %strong #{@group.name} 83 %strong #{@group.name}
84 Group Members 84 Group Members
85 %small 85 %small
app/views/admin/projects/index.html.haml
  Diff comments   View file @a41875d
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 = link_to "Reset", admin_projects_path, class: "btn" 41 = link_to "Reset", admin_projects_path, class: "btn"
42 .span8 42 .span8
43 .ui-box 43 .ui-box
44 - %h5.title 44 + .title
45 Projects (#{@projects.total_count}) 45 Projects (#{@projects.total_count})
46 %ul.well-list 46 %ul.well-list
47 - @projects.each do |project| 47 - @projects.each do |project|
app/views/admin/projects/show.html.haml
  Diff comments   View file @a41875d
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 .row 7 .row
8 .span6 8 .span6
9 .ui-box 9 .ui-box
10 - %h5.title 10 + .title
11 Project info: 11 Project info:
12 %ul.well-list 12 %ul.well-list
13 %li 13 %li
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 .span6 76 .span6
77 - if @group 77 - if @group
78 .ui-box 78 .ui-box
79 - %h5.title 79 + .title
80 %strong #{@group.name} Group 80 %strong #{@group.name} Group
81 members (#{@group.users_groups.count}) 81 members (#{@group.users_groups.count})
82 .pull-right 82 .pull-right
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 = render 'users_groups/users_group', member: member, show_controls: false 87 = render 'users_groups/users_group', member: member, show_controls: false
88 88
89 .ui-box 89 .ui-box
90 - %h5.title 90 + .title
91 Team 91 Team
92 %small 92 %small
93 (#{@project.users.count}) 93 (#{@project.users.count})
app/views/admin/users/index.html.haml
  Diff comments   View file @a41875d
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 32
33 .span9 33 .span9
34 .ui-box 34 .ui-box
35 - %h5.title 35 + .title
36 Users (#{@users.total_count}) 36 Users (#{@users.total_count})
37 %ul.well-list 37 %ul.well-list
38 - @users.each do |user| 38 - @users.each do |user|
app/views/admin/users/show.html.haml
  Diff comments   View file @a41875d
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 .row 21 .row
22 .span6 22 .span6
23 .ui-box 23 .ui-box
24 - %h5.title 24 + .title
25 Account: 25 Account:
26 .pull-right 26 .pull-right
27 = image_tag gravatar_icon(@user.email, 32), class: "avatar s32" 27 = image_tag gravatar_icon(@user.email, 32), class: "avatar s32"
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 65
66 - if @user.users_groups.present? 66 - if @user.users_groups.present?
67 .ui-box 67 .ui-box
68 - %h5.title Groups: 68 + .title Groups:
69 %ul.well-list 69 %ul.well-list
70 - @user.users_groups.each do |user_group| 70 - @user.users_groups.each do |user_group|
71 - group = user_group.group 71 - group = user_group.group
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 76
77 .span6 77 .span6
78 .ui-box 78 .ui-box
79 - %h5.title Projects (#{@projects.count}) 79 + .title Projects (#{@projects.count})
80 %ul.well-list 80 %ul.well-list
81 - @projects.sort_by(&:name_with_namespace).each do |project| 81 - @projects.sort_by(&:name_with_namespace).each do |project|
82 - tm = project.team.find_tm(@user.id) 82 - tm = project.team.find_tm(@user.id)
app/views/dashboard/_groups.html.haml
  Diff comments   View file @a41875d
1 .ui-box 1 .ui-box
2 - %h5.title.clearfix 2 + .title.clearfix
3 = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter' 3 = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter'
4 - if current_user.can_create_group? 4 - if current_user.can_create_group?
5 %span.pull-right 5 %span.pull-right
app/views/dashboard/_projects.html.haml
  Diff comments   View file @a41875d
1 .ui-box 1 .ui-box
2 - %h5.title.clearfix 2 + .title.clearfix
3 = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter' 3 = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter'
4 - if current_user.can_create_project? 4 - if current_user.can_create_project?
5 %span.pull-right 5 %span.pull-right
app/views/dashboard/issues.html.haml
  Diff comments   View file @a41875d
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 - @issues.group_by(&:project).each do |group| 13 - @issues.group_by(&:project).each do |group|
14 %div.ui-box 14 %div.ui-box
15 - project = group[0] 15 - project = group[0]
16 - %h5.title 16 + .title
17 = link_to_project project 17 = link_to_project project
18   18  
19 %i.icon-angle-right 19 %i.icon-angle-right
app/views/dashboard/projects.html.haml
  Diff comments   View file @a41875d
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 22
23 .span9 23 .span9
24 .ui-box 24 .ui-box
25 - %h5.title 25 + .title
26 Projects (#{@projects.total_count}) 26 Projects (#{@projects.total_count})
27 .pull-right.light 27 .pull-right.light
28 %small Last activity 28 %small Last activity
app/views/groups/_projects.html.haml
  Diff comments   View file @a41875d
1 .ui-box 1 .ui-box
2 - %h5.title 2 + .title
3 Projects (#{projects.count}) 3 Projects (#{projects.count})
4 - if can? current_user, :manage_group, @group 4 - if can? current_user, :manage_group, @group
5 %span.pull-right 5 %span.pull-right
app/views/groups/edit.html.haml
  Diff comments   View file @a41875d
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 .tab-content 18 .tab-content
19 .tab-pane.active#tab-edit 19 .tab-pane.active#tab-edit
20 .ui-box 20 .ui-box
21 - %h5.title 21 + .title
22 %strong= @group.name 22 %strong= @group.name
23 Group Settings: 23 Group Settings:
24 %div.form-holder 24 %div.form-holder
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 42
43 .tab-pane#tab-projects 43 .tab-pane#tab-projects
44 .ui-box 44 .ui-box
45 - %h5.title 45 + .title
46 %strong= @group.name 46 %strong= @group.name
47 Projects: 47 Projects:
48 - if can? current_user, :manage_group, @group 48 - if can? current_user, :manage_group, @group
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 67
68 .tab-pane#tab-transfer 68 .tab-pane#tab-transfer
69 .ui-box.ui-box-danger 69 .ui-box.ui-box-danger
70 - %h5.title Transfer group 70 + .title Transfer group
71 .ui-box-body 71 .ui-box-body
72 %p 72 %p
73 Transferring group will cause loss of admin control over group and all child projects 73 Transferring group will cause loss of admin control over group and all child projects
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 78
79 .tab-pane#tab-remove 79 .tab-pane#tab-remove
80 .ui-box.ui-box-danger 80 .ui-box.ui-box-danger
81 - %h5.title Remove group 81 + .title Remove group
82 .ui-box-body 82 .ui-box-body
83 %p 83 %p
84 Remove of group will cause removing all child projects and resources. 84 Remove of group will cause removing all child projects and resources.
app/views/groups/issues.html.haml
  Diff comments   View file @a41875d
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 - @issues.group_by(&:project).each do |group| 12 - @issues.group_by(&:project).each do |group|
13 %div.ui-box 13 %div.ui-box
14 - project = group[0] 14 - project = group[0]
15 - %h5.title 15 + .title
16 = link_to_project project 16 = link_to_project project
17 %ul.well-list.issues-list 17 %ul.well-list.issues-list
18 - group[1].each do |issue| 18 - group[1].each do |issue|
app/views/groups/members.html.haml
  Diff comments   View file @a41875d
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 Only group owners can manage group members 9 Only group owners can manage group members
10 .span6 10 .span6
11 .ui-box 11 .ui-box
12 - %h5.title 12 + .title
13 %strong #{@group.name} 13 %strong #{@group.name}
14 Group Members 14 Group Members
15 %small 15 %small
app/views/help/index.html.haml
  Diff comments   View file @a41875d
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 .span4 14 .span4
15 .ui-box 15 .ui-box
16 .title 16 .title
17 - %h5 Quick help 17 + Quick help
18 %ul.well-list 18 %ul.well-list
19 %li 19 %li
20 Email your 20 Email your
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 .span4 38 .span4
39 .ui-box 39 .ui-box
40 .title 40 .title
41 - %h5 User documentation 41 + User documentation
42 %ul.well-list 42 %ul.well-list
43 %li 43 %li
44 %strong= link_to "Workflow", help_workflow_path 44 %strong= link_to "Workflow", help_workflow_path
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 .span4 67 .span4
68 .ui-box 68 .ui-box
69 .title 69 .title
70 - %h5 Admin documentation 70 + Admin documentation
71 %ul.well-list 71 %ul.well-list
72 72
73 %li 73 %li
app/views/profiles/groups/index.html.haml
  Diff comments   View file @a41875d
1 .ui-box 1 .ui-box
2 - %h5.title 2 + .title
3 %strong Groups 3 %strong Groups
4 (#{@groups.count}) 4 (#{@groups.count})
5 - if current_user.can_create_group? 5 - if current_user.can_create_group?
app/views/profiles/keys/index.html.haml
  Diff comments   View file @a41875d
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 8
9 .ui-box 9 .ui-box
10 - %h5.title 10 + .title
11 SSH Keys (#{@keys.count}) 11 SSH Keys (#{@keys.count})
12 .pull-right 12 .pull-right
13 = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary" 13 = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
app/views/profiles/keys/show.html.haml
  Diff comments   View file @a41875d
1 .row 1 .row
2 .span4 2 .span4
3 .ui-box 3 .ui-box
4 - %h5.title 4 + .title
5 SSH Key 5 SSH Key
6 %ul.well-list 6 %ul.well-list
7 %li 7 %li
app/views/projects/commits/_commits.html.haml
  Diff comments   View file @a41875d
1 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits| 1 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
2 %div.ui-box 2 %div.ui-box
3 - %h5.title 3 + .title
4 %i.icon-calendar 4 %i.icon-calendar
5 %span= day.stamp("28 Aug, 2010") 5 %span= day.stamp("28 Aug, 2010")
6 6
app/views/projects/compare/show.html.haml
  Diff comments   View file @a41875d
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 13
14 - if @commits.present? 14 - if @commits.present?
15 %div.ui-box 15 %div.ui-box
16 - %h5.title 16 + .title
17 Commits (#{@commits.count}) 17 Commits (#{@commits.count})
18 %ul.well-list= render Commit.decorate(@commits) 18 %ul.well-list= render Commit.decorate(@commits)
19 19
app/views/projects/edit.html.haml
  Diff comments   View file @a41875d
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 .project-edit-errors 2 .project-edit-errors
3 .project-edit-content 3 .project-edit-content
4 .ui-box.white 4 .ui-box.white
5 - %h5.title 5 + .title
6 %strong= @project.name 6 %strong= @project.name
7 Project Settings: 7 Project Settings:
8 .form-holder 8 .form-holder
@@ -102,7 +102,7 @@ @@ -102,7 +102,7 @@
102 102
103 - if can?(current_user, :change_namespace, @project) 103 - if can?(current_user, :change_namespace, @project)
104 .ui-box.ui-box-danger 104 .ui-box.ui-box-danger
105 - %h5.title Transfer project 105 + .title Transfer project
106 .errors-holder 106 .errors-holder
107 .form-holder 107 .form-holder
108 = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f| 108 = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
122 %p.nothing_here_message Only project owner can transfer a project 122 %p.nothing_here_message Only project owner can transfer a project
123 123
124 .ui-box.ui-box-danger 124 .ui-box.ui-box-danger
125 - %h5.title Rename repository 125 + .title Rename repository
126 .errors-holder 126 .errors-holder
127 .form-holder 127 .form-holder
128 = form_for(@project) do |f| 128 = form_for(@project) do |f|
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
140 140
141 - if can?(current_user, :remove_project, @project) 141 - if can?(current_user, :remove_project, @project)
142 .ui-box.ui-box-danger 142 .ui-box.ui-box-danger
143 - %h5.title Remove project 143 + .title Remove project
144 .ui-box-body 144 .ui-box-body
145 %p 145 %p
146 Remove of project will cause removing repository and all related resources like issues, merge requests etc. 146 Remove of project will cause removing repository and all related resources like issues, merge requests etc.
app/views/projects/hooks/index.html.haml
  Diff comments   View file @a41875d
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 21
22 -if @hooks.any? 22 -if @hooks.any?
23 .ui-box 23 .ui-box
24 - %h5.title 24 + .title
25 Hooks (#{@hooks.count}) 25 Hooks (#{@hooks.count})
26 %ul.well-list 26 %ul.well-list
27 - @hooks.each do |hook| 27 - @hooks.each do |hook|
app/views/projects/merge_requests/show/_commits.html.haml
  Diff comments   View file @a41875d
1 - if @commits.present? 1 - if @commits.present?
2 .ui-box 2 .ui-box
3 - %h5.title 3 + .title
4 %i.icon-list 4 %i.icon-list
5 Commits (#{@commits.count}) 5 Commits (#{@commits.count})
6 .commits 6 .commits
app/views/projects/milestones/_issues.html.haml
  Diff comments   View file @a41875d
1 .ui-box 1 .ui-box
2 - %h5.title= title 2 + .title= title
3 %ul.well-list 3 %ul.well-list
4 - issues.each do |issue| 4 - issues.each do |issue|
5 %li 5 %li
app/views/projects/milestones/show.html.haml
  Diff comments   View file @a41875d
@@ -84,13 +84,13 @@ @@ -84,13 +84,13 @@
84 .row 84 .row
85 .span6 85 .span6
86 .ui-box 86 .ui-box
87 - %h5.title Open 87 + .title Open
88 %ul.well-list 88 %ul.well-list
89 - @merge_requests.opened.each do |merge_request| 89 - @merge_requests.opened.each do |merge_request|
90 = render 'merge_request', merge_request: merge_request 90 = render 'merge_request', merge_request: merge_request
91 .span6 91 .span6
92 .ui-box 92 .ui-box
93 - %h5.title Closed 93 + .title Closed
94 %ul.well-list 94 %ul.well-list
95 - @merge_requests.closed.each do |merge_request| 95 - @merge_requests.closed.each do |merge_request|
96 = render 'merge_request', merge_request: merge_request 96 = render 'merge_request', merge_request: merge_request
app/views/projects/team_members/_group_members.html.haml
  Diff comments   View file @a41875d
1 .ui-box 1 .ui-box
2 - %h5.title 2 + .title
3 %strong #{@group.name} Group 3 %strong #{@group.name} Group
4 members (#{@group.users_groups.count}) 4 members (#{@group.users_groups.count})
5 .pull-right 5 .pull-right
app/views/projects/team_members/_team.html.haml
  Diff comments   View file @a41875d
1 .team-table 1 .team-table
2 - can_admin_project = (can? current_user, :admin_project, @project) 2 - can_admin_project = (can? current_user, :admin_project, @project)
3 .ui-box 3 .ui-box
4 - %h5.title 4 + .title
5 %strong #{@project.name} Project 5 %strong #{@project.name} Project
6 members (#{members.count}) 6 members (#{members.count})
7 %ul.well-list 7 %ul.well-list
app/views/shared/_merge_requests.html.haml
  Diff comments   View file @a41875d
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 - @merge_requests.group_by(&:project).each do |group| 2 - @merge_requests.group_by(&:project).each do |group|
3 .ui-box 3 .ui-box
4 - project = group[0] 4 - project = group[0]
5 - %h5.title 5 + .title
6 = link_to_project project 6 = link_to_project project
7 %ul.well-list.mr-list 7 %ul.well-list.mr-list
8 - group[1].each do |merge_request| 8 - group[1].each do |merge_request|
app/views/users/_profile.html.haml
  Diff comments   View file @a41875d
1 .ui-box 1 .ui-box
2 - %h5.title 2 + .title
3 Profile 3 Profile
4 %ul.well-list 4 %ul.well-list
5 %li 5 %li
app/views/users/_projects.html.haml
  Diff comments   View file @a41875d
1 .ui-box 1 .ui-box
2 - %h5.title Projects 2 + .title Projects
3 %ul.well-list 3 %ul.well-list
4 - @projects.each do |project| 4 - @projects.each do |project|
5 %li 5 %li