From a41875d21e9c87f15754c1d23db3a6fb80b7bdcd Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 13 Jul 2013 20:36:21 +0300
Subject: [PATCH] Replace %h5.title with div.title
---
app/assets/stylesheets/gitlab_bootstrap/blocks.scss | 7 ++-----
app/assets/stylesheets/gitlab_bootstrap/mixins.scss | 1 -
app/assets/stylesheets/sections/dashboard.scss | 6 ++----
app/views/admin/dashboard/index.html.haml | 6 +++---
app/views/admin/groups/show.html.haml | 8 ++++----
app/views/admin/projects/index.html.haml | 2 +-
app/views/admin/projects/show.html.haml | 6 +++---
app/views/admin/users/index.html.haml | 2 +-
app/views/admin/users/show.html.haml | 6 +++---
app/views/dashboard/_groups.html.haml | 2 +-
app/views/dashboard/_projects.html.haml | 2 +-
app/views/dashboard/issues.html.haml | 2 +-
app/views/dashboard/projects.html.haml | 2 +-
app/views/groups/_projects.html.haml | 2 +-
app/views/groups/edit.html.haml | 8 ++++----
app/views/groups/issues.html.haml | 2 +-
app/views/groups/members.html.haml | 2 +-
app/views/help/index.html.haml | 6 +++---
app/views/profiles/groups/index.html.haml | 2 +-
app/views/profiles/keys/index.html.haml | 2 +-
app/views/profiles/keys/show.html.haml | 2 +-
app/views/projects/commits/_commits.html.haml | 2 +-
app/views/projects/compare/show.html.haml | 2 +-
app/views/projects/edit.html.haml | 8 ++++----
app/views/projects/hooks/index.html.haml | 2 +-
app/views/projects/merge_requests/show/_commits.html.haml | 2 +-
app/views/projects/milestones/_issues.html.haml | 2 +-
app/views/projects/milestones/show.html.haml | 4 ++--
app/views/projects/team_members/_group_members.html.haml | 2 +-
app/views/projects/team_members/_team.html.haml | 2 +-
app/views/shared/_merge_requests.html.haml | 2 +-
app/views/users/_profile.html.haml | 2 +-
app/views/users/_projects.html.haml | 2 +-
33 files changed, 52 insertions(+), 58 deletions(-)
diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index 5e1d7f758fe..3101dfc097b 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -88,13 +88,10 @@
text-shadow: 0 1px 1px #fff;
padding: 10px;
font-size: 14px;
+ line-height: 20px;
font-weight: normal;
margin: 0;
- h5 {
- margin: 0;
- }
-
> a {
text-shadow: 0 1px 1px #fff;
}
@@ -106,7 +103,7 @@
.btn {
position: relative;
- top: -2px;
+ margin-top: -2px;
}
.nav-pills {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
index eed7cb78e93..71e73b40b44 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
@@ -77,7 +77,6 @@
@mixin md-typography {
code { padding: 0 4px; }
- p { font-size: 14px; }
h1 { margin-top: 30px;}
h2 { margin-top: 25px;}
h3 { margin-top: 20px;}
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index ff78af33967..3a69dde1af4 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -10,8 +10,8 @@
margin: 0px;
box-shadow: none;
- > .title {
- padding: 2px 15px;
+ .title .btn {
+ margin: 0;
}
.nav-projects-tabs li { padding: 0; }
}
@@ -37,8 +37,6 @@
padding: 4px 6px;
width: 202px;
float: left;
- margin-top: 3px;
- margin-left: -2px;
}
}
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 2774ccb85fe..9ed788d0d9d 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -1,7 +1,7 @@
.admin_dash.row
.span4
.ui-box
- %h5.title Projects
+ .title Projects
.data.padded
= link_to admin_projects_path do
%h1= Project.count
@@ -9,7 +9,7 @@
= link_to 'New Project', new_project_path, class: "btn btn-small"
.span4
.ui-box
- %h5.title Users
+ .title Users
.data.padded
= link_to admin_users_path do
%h1= User.count
@@ -17,7 +17,7 @@
= link_to 'New User', new_admin_user_path, class: "btn btn-small"
.span4
.ui-box
- %h5.title Groups
+ .title Groups
.data.padded
= link_to admin_groups_path do
%h1= Group.count
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 13159fdb56d..5509811bae5 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -8,7 +8,7 @@
.row
.span6
.ui-box
- %h5.title
+ .title
Group info:
%ul.well-list
%li
@@ -50,7 +50,7 @@
= @group.created_at.stamp("March 1, 1999")
.ui-box
- %h5.title
+ .title
Projects
%small
(#{@group.projects.count})
@@ -64,7 +64,7 @@
.span6
.ui-box
- %h5.title
+ .title
Add user(s) to the group:
.ui-box-body.form-holder
%p.light
@@ -79,7 +79,7 @@
%hr
= submit_tag 'Add users into group', class: "btn btn-create"
.ui-box
- %h5.title
+ .title
%strong #{@group.name}
Group Members
%small
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 59d8bd7d67a..f8800612b87 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -41,7 +41,7 @@
= link_to "Reset", admin_projects_path, class: "btn"
.span8
.ui-box
- %h5.title
+ .title
Projects (#{@projects.total_count})
%ul.well-list
- @projects.each do |project|
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index d76af14b77b..70f0c193c01 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -7,7 +7,7 @@
.row
.span6
.ui-box
- %h5.title
+ .title
Project info:
%ul.well-list
%li
@@ -76,7 +76,7 @@
.span6
- if @group
.ui-box
- %h5.title
+ .title
%strong #{@group.name} Group
members (#{@group.users_groups.count})
.pull-right
@@ -87,7 +87,7 @@
= render 'users_groups/users_group', member: member, show_controls: false
.ui-box
- %h5.title
+ .title
Team
%small
(#{@project.users.count})
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 2cd095cfe9f..a285eff138d 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -32,7 +32,7 @@
.span9
.ui-box
- %h5.title
+ .title
Users (#{@users.total_count})
%ul.well-list
- @users.each do |user|
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 7b67fb09fca..d48660f0a9e 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -21,7 +21,7 @@
.row
.span6
.ui-box
- %h5.title
+ .title
Account:
.pull-right
= image_tag gravatar_icon(@user.email, 32), class: "avatar s32"
@@ -65,7 +65,7 @@
- if @user.users_groups.present?
.ui-box
- %h5.title Groups:
+ .title Groups:
%ul.well-list
- @user.users_groups.each do |user_group|
- group = user_group.group
@@ -76,7 +76,7 @@
.span6
.ui-box
- %h5.title Projects (#{@projects.count})
+ .title Projects (#{@projects.count})
%ul.well-list
- @projects.sort_by(&:name_with_namespace).each do |project|
- tm = project.team.find_tm(@user.id)
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index 367c0f0c325..9aca7b353f3 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -1,5 +1,5 @@
.ui-box
- %h5.title.clearfix
+ .title.clearfix
= search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter'
- if current_user.can_create_group?
%span.pull-right
diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml
index edf0fd7a4d8..305b83771a1 100644
--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
@@ -1,5 +1,5 @@
.ui-box
- %h5.title.clearfix
+ .title.clearfix
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter'
- if current_user.can_create_project?
%span.pull-right
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 7fdc8b37cac..63003c2859b 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -13,7 +13,7 @@
- @issues.group_by(&:project).each do |group|
%div.ui-box
- project = group[0]
- %h5.title
+ .title
= link_to_project project
%i.icon-angle-right
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index 5c5fa528fab..b66117fc3c5 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -22,7 +22,7 @@
.span9
.ui-box
- %h5.title
+ .title
Projects (#{@projects.total_count})
.pull-right.light
%small Last activity
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index ff6b71b9ec0..cbad2e3e522 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -1,5 +1,5 @@
.ui-box
- %h5.title
+ .title
Projects (#{projects.count})
- if can? current_user, :manage_group, @group
%span.pull-right
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index eeaa4767cf9..ba3333832ea 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -18,7 +18,7 @@
.tab-content
.tab-pane.active#tab-edit
.ui-box
- %h5.title
+ .title
%strong= @group.name
Group Settings:
%div.form-holder
@@ -42,7 +42,7 @@
.tab-pane#tab-projects
.ui-box
- %h5.title
+ .title
%strong= @group.name
Projects:
- if can? current_user, :manage_group, @group
@@ -67,7 +67,7 @@
.tab-pane#tab-transfer
.ui-box.ui-box-danger
- %h5.title Transfer group
+ .title Transfer group
.ui-box-body
%p
Transferring group will cause loss of admin control over group and all child projects
@@ -78,7 +78,7 @@
.tab-pane#tab-remove
.ui-box.ui-box-danger
- %h5.title Remove group
+ .title Remove group
.ui-box-body
%p
Remove of group will cause removing all child projects and resources.
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index 7ecc5f7b630..5c76f1c22ed 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -12,7 +12,7 @@
- @issues.group_by(&:project).each do |group|
%div.ui-box
- project = group[0]
- %h5.title
+ .title
= link_to_project project
%ul.well-list.issues-list
- group[1].each do |issue|
diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml
index bd84a5e7cf9..82a16e53c6e 100644
--- a/app/views/groups/members.html.haml
+++ b/app/views/groups/members.html.haml
@@ -9,7 +9,7 @@
Only group owners can manage group members
.span6
.ui-box
- %h5.title
+ .title
%strong #{@group.name}
Group Members
%small
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index 7cd7790d9cb..e5c3b577f91 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -14,7 +14,7 @@
.span4
.ui-box
.title
- %h5 Quick help
+ Quick help
%ul.well-list
%li
Email your
@@ -38,7 +38,7 @@
.span4
.ui-box
.title
- %h5 User documentation
+ User documentation
%ul.well-list
%li
%strong= link_to "Workflow", help_workflow_path
@@ -67,7 +67,7 @@
.span4
.ui-box
.title
- %h5 Admin documentation
+ Admin documentation
%ul.well-list
%li
diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml
index 892f42124aa..01f73a24f94 100644
--- a/app/views/profiles/groups/index.html.haml
+++ b/app/views/profiles/groups/index.html.haml
@@ -1,5 +1,5 @@
.ui-box
- %h5.title
+ .title
%strong Groups
(#{@groups.count})
- if current_user.can_create_group?
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index caa83d65e95..03413764be4 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -7,7 +7,7 @@
.ui-box
- %h5.title
+ .title
SSH Keys (#{@keys.count})
.pull-right
= link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
diff --git a/app/views/profiles/keys/show.html.haml b/app/views/profiles/keys/show.html.haml
index 735e9d1f936..b736ab17087 100644
--- a/app/views/profiles/keys/show.html.haml
+++ b/app/views/profiles/keys/show.html.haml
@@ -1,7 +1,7 @@
.row
.span4
.ui-box
- %h5.title
+ .title
SSH Key
%ul.well-list
%li
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index 933780e4534..acdb8891344 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -1,6 +1,6 @@
- @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
%div.ui-box
- %h5.title
+ .title
%i.icon-calendar
%span= day.stamp("28 Aug, 2010")
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 2e75f8441e3..5e6b5b71753 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -13,7 +13,7 @@
- if @commits.present?
%div.ui-box
- %h5.title
+ .title
Commits (#{@commits.count})
%ul.well-list= render Commit.decorate(@commits)
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 5d399da661d..2f4eba988e0 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -2,7 +2,7 @@
.project-edit-errors
.project-edit-content
.ui-box.white
- %h5.title
+ .title
%strong= @project.name
Project Settings:
.form-holder
@@ -102,7 +102,7 @@
- if can?(current_user, :change_namespace, @project)
.ui-box.ui-box-danger
- %h5.title Transfer project
+ .title Transfer project
.errors-holder
.form-holder
= form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
@@ -122,7 +122,7 @@
%p.nothing_here_message Only project owner can transfer a project
.ui-box.ui-box-danger
- %h5.title Rename repository
+ .title Rename repository
.errors-holder
.form-holder
= form_for(@project) do |f|
@@ -140,7 +140,7 @@
- if can?(current_user, :remove_project, @project)
.ui-box.ui-box-danger
- %h5.title Remove project
+ .title Remove project
.ui-box-body
%p
Remove of project will cause removing repository and all related resources like issues, merge requests etc.
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index 641ab082d8d..c4b51d09335 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -21,7 +21,7 @@
-if @hooks.any?
.ui-box
- %h5.title
+ .title
Hooks (#{@hooks.count})
%ul.well-list
- @hooks.each do |hook|
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index 8630f02d5d9..40876d16ddd 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -1,6 +1,6 @@
- if @commits.present?
.ui-box
- %h5.title
+ .title
%i.icon-list
Commits (#{@commits.count})
.commits
diff --git a/app/views/projects/milestones/_issues.html.haml b/app/views/projects/milestones/_issues.html.haml
index 67a7bf819fe..983692399ca 100644
--- a/app/views/projects/milestones/_issues.html.haml
+++ b/app/views/projects/milestones/_issues.html.haml
@@ -1,5 +1,5 @@
.ui-box
- %h5.title= title
+ .title= title
%ul.well-list
- issues.each do |issue|
%li
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index b9e5bd9bcc5..7be3ba2f758 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -84,13 +84,13 @@
.row
.span6
.ui-box
- %h5.title Open
+ .title Open
%ul.well-list
- @merge_requests.opened.each do |merge_request|
= render 'merge_request', merge_request: merge_request
.span6
.ui-box
- %h5.title Closed
+ .title Closed
%ul.well-list
- @merge_requests.closed.each do |merge_request|
= render 'merge_request', merge_request: merge_request
diff --git a/app/views/projects/team_members/_group_members.html.haml b/app/views/projects/team_members/_group_members.html.haml
index e01072d99ad..5c3f813bb20 100644
--- a/app/views/projects/team_members/_group_members.html.haml
+++ b/app/views/projects/team_members/_group_members.html.haml
@@ -1,5 +1,5 @@
.ui-box
- %h5.title
+ .title
%strong #{@group.name} Group
members (#{@group.users_groups.count})
.pull-right
diff --git a/app/views/projects/team_members/_team.html.haml b/app/views/projects/team_members/_team.html.haml
index 99231e92152..ee660482f3f 100644
--- a/app/views/projects/team_members/_team.html.haml
+++ b/app/views/projects/team_members/_team.html.haml
@@ -1,7 +1,7 @@
.team-table
- can_admin_project = (can? current_user, :admin_project, @project)
.ui-box
- %h5.title
+ .title
%strong #{@project.name} Project
members (#{members.count})
%ul.well-list
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml
index a7037d5987a..935a7a7f7c0 100644
--- a/app/views/shared/_merge_requests.html.haml
+++ b/app/views/shared/_merge_requests.html.haml
@@ -2,7 +2,7 @@
- @merge_requests.group_by(&:project).each do |group|
.ui-box
- project = group[0]
- %h5.title
+ .title
= link_to_project project
%ul.well-list.mr-list
- group[1].each do |merge_request|
diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml
index fba3660bfd3..4cd1eebdf91 100644
--- a/app/views/users/_profile.html.haml
+++ b/app/views/users/_profile.html.haml
@@ -1,5 +1,5 @@
.ui-box
- %h5.title
+ .title
Profile
%ul.well-list
%li
diff --git a/app/views/users/_projects.html.haml b/app/views/users/_projects.html.haml
index 9f1446c0317..f1b2c8dd7f7 100644
--- a/app/views/users/_projects.html.haml
+++ b/app/views/users/_projects.html.haml
@@ -1,5 +1,5 @@
.ui-box
- %h5.title Projects
+ .title Projects
%ul.well-list
- @projects.each do |project|
%li
--
GitLab