Commit a41875d2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Replace %h5.title with div.title

parent e97abfce
...@@ -88,13 +88,10 @@ ...@@ -88,13 +88,10 @@
text-shadow: 0 1px 1px #fff; text-shadow: 0 1px 1px #fff;
padding: 10px; padding: 10px;
font-size: 14px; font-size: 14px;
line-height: 20px;
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
h5 {
margin: 0;
}
> a { > a {
text-shadow: 0 1px 1px #fff; text-shadow: 0 1px 1px #fff;
} }
...@@ -106,7 +103,7 @@ ...@@ -106,7 +103,7 @@
.btn { .btn {
position: relative; position: relative;
top: -2px; margin-top: -2px;
} }
.nav-pills { .nav-pills {
......
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
@mixin md-typography { @mixin md-typography {
code { padding: 0 4px; } code { padding: 0 4px; }
p { font-size: 14px; }
h1 { margin-top: 30px;} h1 { margin-top: 30px;}
h2 { margin-top: 25px;} h2 { margin-top: 25px;}
h3 { margin-top: 20px;} h3 { margin-top: 20px;}
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
margin: 0px; margin: 0px;
box-shadow: none; box-shadow: none;
> .title { .title .btn {
padding: 2px 15px; margin: 0;
} }
.nav-projects-tabs li { padding: 0; } .nav-projects-tabs li { padding: 0; }
} }
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
padding: 4px 6px; padding: 4px 6px;
width: 202px; width: 202px;
float: left; float: left;
margin-top: 3px;
margin-left: -2px;
} }
} }
......
.admin_dash.row .admin_dash.row
.span4 .span4
.ui-box .ui-box
%h5.title Projects .title Projects
.data.padded .data.padded
= link_to admin_projects_path do = link_to admin_projects_path do
%h1= Project.count %h1= Project.count
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= link_to 'New Project', new_project_path, class: "btn btn-small" = link_to 'New Project', new_project_path, class: "btn btn-small"
.span4 .span4
.ui-box .ui-box
%h5.title Users .title Users
.data.padded .data.padded
= link_to admin_users_path do = link_to admin_users_path do
%h1= User.count %h1= User.count
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= link_to 'New User', new_admin_user_path, class: "btn btn-small" = link_to 'New User', new_admin_user_path, class: "btn btn-small"
.span4 .span4
.ui-box .ui-box
%h5.title Groups .title Groups
.data.padded .data.padded
= link_to admin_groups_path do = link_to admin_groups_path do
%h1= Group.count %h1= Group.count
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.row .row
.span6 .span6
.ui-box .ui-box
%h5.title .title
Group info: Group info:
%ul.well-list %ul.well-list
%li %li
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
= @group.created_at.stamp("March 1, 1999") = @group.created_at.stamp("March 1, 1999")
.ui-box .ui-box
%h5.title .title
Projects Projects
%small %small
(#{@group.projects.count}) (#{@group.projects.count})
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
.span6 .span6
.ui-box .ui-box
%h5.title .title
Add user(s) to the group: Add user(s) to the group:
.ui-box-body.form-holder .ui-box-body.form-holder
%p.light %p.light
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
%hr %hr
= submit_tag 'Add users into group', class: "btn btn-create" = submit_tag 'Add users into group', class: "btn btn-create"
.ui-box .ui-box
%h5.title .title
%strong #{@group.name} %strong #{@group.name}
Group Members Group Members
%small %small
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
= link_to "Reset", admin_projects_path, class: "btn" = link_to "Reset", admin_projects_path, class: "btn"
.span8 .span8
.ui-box .ui-box
%h5.title .title
Projects (#{@projects.total_count}) Projects (#{@projects.total_count})
%ul.well-list %ul.well-list
- @projects.each do |project| - @projects.each do |project|
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.row .row
.span6 .span6
.ui-box .ui-box
%h5.title .title
Project info: Project info:
%ul.well-list %ul.well-list
%li %li
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
.span6 .span6
- if @group - if @group
.ui-box .ui-box
%h5.title .title
%strong #{@group.name} Group %strong #{@group.name} Group
members (#{@group.users_groups.count}) members (#{@group.users_groups.count})
.pull-right .pull-right
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
= render 'users_groups/users_group', member: member, show_controls: false = render 'users_groups/users_group', member: member, show_controls: false
.ui-box .ui-box
%h5.title .title
Team Team
%small %small
(#{@project.users.count}) (#{@project.users.count})
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
.span9 .span9
.ui-box .ui-box
%h5.title .title
Users (#{@users.total_count}) Users (#{@users.total_count})
%ul.well-list %ul.well-list
- @users.each do |user| - @users.each do |user|
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
.row .row
.span6 .span6
.ui-box .ui-box
%h5.title .title
Account: Account:
.pull-right .pull-right
= image_tag gravatar_icon(@user.email, 32), class: "avatar s32" = image_tag gravatar_icon(@user.email, 32), class: "avatar s32"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
- if @user.users_groups.present? - if @user.users_groups.present?
.ui-box .ui-box
%h5.title Groups: .title Groups:
%ul.well-list %ul.well-list
- @user.users_groups.each do |user_group| - @user.users_groups.each do |user_group|
- group = user_group.group - group = user_group.group
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
.span6 .span6
.ui-box .ui-box
%h5.title Projects (#{@projects.count}) .title Projects (#{@projects.count})
%ul.well-list %ul.well-list
- @projects.sort_by(&:name_with_namespace).each do |project| - @projects.sort_by(&:name_with_namespace).each do |project|
- tm = project.team.find_tm(@user.id) - tm = project.team.find_tm(@user.id)
......
.ui-box .ui-box
%h5.title.clearfix .title.clearfix
= search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter' = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter'
- if current_user.can_create_group? - if current_user.can_create_group?
%span.pull-right %span.pull-right
......
.ui-box .ui-box
%h5.title.clearfix .title.clearfix
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter' = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter'
- if current_user.can_create_project? - if current_user.can_create_project?
%span.pull-right %span.pull-right
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
- @issues.group_by(&:project).each do |group| - @issues.group_by(&:project).each do |group|
%div.ui-box %div.ui-box
- project = group[0] - project = group[0]
%h5.title .title
= link_to_project project = link_to_project project
   
%i.icon-angle-right %i.icon-angle-right
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.span9 .span9
.ui-box .ui-box
%h5.title .title
Projects (#{@projects.total_count}) Projects (#{@projects.total_count})
.pull-right.light .pull-right.light
%small Last activity %small Last activity
......
.ui-box .ui-box
%h5.title .title
Projects (#{projects.count}) Projects (#{projects.count})
- if can? current_user, :manage_group, @group - if can? current_user, :manage_group, @group
%span.pull-right %span.pull-right
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
.tab-content .tab-content
.tab-pane.active#tab-edit .tab-pane.active#tab-edit
.ui-box .ui-box
%h5.title .title
%strong= @group.name %strong= @group.name
Group Settings: Group Settings:
%div.form-holder %div.form-holder
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
.tab-pane#tab-projects .tab-pane#tab-projects
.ui-box .ui-box
%h5.title .title
%strong= @group.name %strong= @group.name
Projects: Projects:
- if can? current_user, :manage_group, @group - if can? current_user, :manage_group, @group
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
.tab-pane#tab-transfer .tab-pane#tab-transfer
.ui-box.ui-box-danger .ui-box.ui-box-danger
%h5.title Transfer group .title Transfer group
.ui-box-body .ui-box-body
%p %p
Transferring group will cause loss of admin control over group and all child projects Transferring group will cause loss of admin control over group and all child projects
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
.tab-pane#tab-remove .tab-pane#tab-remove
.ui-box.ui-box-danger .ui-box.ui-box-danger
%h5.title Remove group .title Remove group
.ui-box-body .ui-box-body
%p %p
Remove of group will cause removing all child projects and resources. Remove of group will cause removing all child projects and resources.
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
- @issues.group_by(&:project).each do |group| - @issues.group_by(&:project).each do |group|
%div.ui-box %div.ui-box
- project = group[0] - project = group[0]
%h5.title .title
= link_to_project project = link_to_project project
%ul.well-list.issues-list %ul.well-list.issues-list
- group[1].each do |issue| - group[1].each do |issue|
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
Only group owners can manage group members Only group owners can manage group members
.span6 .span6
.ui-box .ui-box
%h5.title .title
%strong #{@group.name} %strong #{@group.name}
Group Members Group Members
%small %small
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.span4 .span4
.ui-box .ui-box
.title .title
%h5 Quick help Quick help
%ul.well-list %ul.well-list
%li %li
Email your Email your
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
.span4 .span4
.ui-box .ui-box
.title .title
%h5 User documentation User documentation
%ul.well-list %ul.well-list
%li %li
%strong= link_to "Workflow", help_workflow_path %strong= link_to "Workflow", help_workflow_path
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
.span4 .span4
.ui-box .ui-box
.title .title
%h5 Admin documentation Admin documentation
%ul.well-list %ul.well-list
%li %li
......
.ui-box .ui-box
%h5.title .title
%strong Groups %strong Groups
(#{@groups.count}) (#{@groups.count})
- if current_user.can_create_group? - if current_user.can_create_group?
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.ui-box .ui-box
%h5.title .title
SSH Keys (#{@keys.count}) SSH Keys (#{@keys.count})
.pull-right .pull-right
= link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary" = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
......
.row .row
.span4 .span4
.ui-box .ui-box
%h5.title .title
SSH Key SSH Key
%ul.well-list %ul.well-list
%li %li
......
- @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits| - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
%div.ui-box %div.ui-box
%h5.title .title
%i.icon-calendar %i.icon-calendar
%span= day.stamp("28 Aug, 2010") %span= day.stamp("28 Aug, 2010")
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
- if @commits.present? - if @commits.present?
%div.ui-box %div.ui-box
%h5.title .title
Commits (#{@commits.count}) Commits (#{@commits.count})
%ul.well-list= render Commit.decorate(@commits) %ul.well-list= render Commit.decorate(@commits)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.project-edit-errors .project-edit-errors
.project-edit-content .project-edit-content
.ui-box.white .ui-box.white
%h5.title .title
%strong= @project.name %strong= @project.name
Project Settings: Project Settings:
.form-holder .form-holder
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
- if can?(current_user, :change_namespace, @project) - if can?(current_user, :change_namespace, @project)
.ui-box.ui-box-danger .ui-box.ui-box-danger
%h5.title Transfer project .title Transfer project
.errors-holder .errors-holder
.form-holder .form-holder
= form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f| = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
%p.nothing_here_message Only project owner can transfer a project %p.nothing_here_message Only project owner can transfer a project
.ui-box.ui-box-danger .ui-box.ui-box-danger
%h5.title Rename repository .title Rename repository
.errors-holder .errors-holder
.form-holder .form-holder
= form_for(@project) do |f| = form_for(@project) do |f|
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
- if can?(current_user, :remove_project, @project) - if can?(current_user, :remove_project, @project)
.ui-box.ui-box-danger .ui-box.ui-box-danger
%h5.title Remove project .title Remove project
.ui-box-body .ui-box-body
%p %p
Remove of project will cause removing repository and all related resources like issues, merge requests etc. Remove of project will cause removing repository and all related resources like issues, merge requests etc.
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
-if @hooks.any? -if @hooks.any?
.ui-box .ui-box
%h5.title .title
Hooks (#{@hooks.count}) Hooks (#{@hooks.count})
%ul.well-list %ul.well-list
- @hooks.each do |hook| - @hooks.each do |hook|
......
- if @commits.present? - if @commits.present?
.ui-box .ui-box
%h5.title .title
%i.icon-list %i.icon-list
Commits (#{@commits.count}) Commits (#{@commits.count})
.commits .commits
......
.ui-box .ui-box
%h5.title= title .title= title
%ul.well-list %ul.well-list
- issues.each do |issue| - issues.each do |issue|
%li %li
......
...@@ -84,13 +84,13 @@ ...@@ -84,13 +84,13 @@
.row .row
.span6 .span6
.ui-box .ui-box
%h5.title Open .title Open
%ul.well-list %ul.well-list
- @merge_requests.opened.each do |merge_request| - @merge_requests.opened.each do |merge_request|
= render 'merge_request', merge_request: merge_request = render 'merge_request', merge_request: merge_request
.span6 .span6
.ui-box .ui-box
%h5.title Closed .title Closed
%ul.well-list %ul.well-list
- @merge_requests.closed.each do |merge_request| - @merge_requests.closed.each do |merge_request|
= render 'merge_request', merge_request: merge_request = render 'merge_request', merge_request: merge_request
......
.ui-box .ui-box
%h5.title .title
%strong #{@group.name} Group %strong #{@group.name} Group
members (#{@group.users_groups.count}) members (#{@group.users_groups.count})
.pull-right .pull-right
......
.team-table .team-table
- can_admin_project = (can? current_user, :admin_project, @project) - can_admin_project = (can? current_user, :admin_project, @project)
.ui-box .ui-box
%h5.title .title
%strong #{@project.name} Project %strong #{@project.name} Project
members (#{members.count}) members (#{members.count})
%ul.well-list %ul.well-list
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- @merge_requests.group_by(&:project).each do |group| - @merge_requests.group_by(&:project).each do |group|
.ui-box .ui-box
- project = group[0] - project = group[0]
%h5.title .title
= link_to_project project = link_to_project project
%ul.well-list.mr-list %ul.well-list.mr-list
- group[1].each do |merge_request| - group[1].each do |merge_request|
......
.ui-box .ui-box
%h5.title .title
Profile Profile
%ul.well-list %ul.well-list
%li %li
......
.ui-box .ui-box
%h5.title Projects .title Projects
%ul.well-list %ul.well-list
- @projects.each do |project| - @projects.each do |project|
%li %li
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment