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