Commit 36fd4de8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Replace page_title with page-title. Correct margin for some blocks/layouts

parent c54db51150e9
......@@ -23,12 +23,8 @@ body {
.help li { color:$style_color; }
.back_link {
text-decoration: underline;
.back-link {
font-size: 14px;
font-weight: bold;
padding: 10px 0;
padding-bottom: 0;
}
table a code {
......@@ -412,7 +408,7 @@ img.emoji {
}
.navless-container {
margin-top: 30px;
margin-top: 20px;
}
.description-block {
......
......@@ -11,7 +11,7 @@
*/
.ui-box {
background: #F9F9F9;
margin-bottom: 25px;
margin-bottom: 20px;
border: 1px solid #CCC;
word-wrap: break-word;
@include solid-shade;
......
......@@ -7,11 +7,12 @@ h1, h2, h3, h4, h5, h6 { margin: 0; }
h3, h4, h5, h6 { line-height: 36px; }
h5 { font-size: 14px; }
h3.page_title {
h3.page-title {
color: #456;
font-size: 20px;
font-weight: normal;
line-height: 28px;
margin-bottom: 15px;
}
h6 {
......
.main-nav {
background: #f5f5f5;
margin: 30px 0;
margin: 20px 0;
margin-top: 0;
padding-top: 4px;
border-bottom: 1px solid #E1E1E1;
......
......@@ -48,7 +48,7 @@
margin-bottom: 50px;
}
h3 {
@extend .page_title;
@extend .page-title;
}
}
......
......@@ -27,7 +27,7 @@
}
}
.votes-block {
margin: 14px 6px 6px 0;
margin: 6px;
.downvotes {
float: right;
}
......
h3.page_title .edit-wiki-header {
h3.page-title .edit-wiki-header {
width: 780px;
margin-left: auto;
margin-right: auto;
......
%h3.page_title Background Jobs
%h3.page-title Background Jobs
%br
.ui-box
%iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
%h3.page_title Edit Group
%h3.page-title Edit Group
%hr
= form_for [:admin, @group] do |f|
- if @group.errors.any?
......
%h3.page_title
%h3.page-title
Groups (#{@groups.total_count})
%small
allows you to keep projects organized.
......
%h3.page_title New Group
%h3.page-title New Group
%hr
= form_for [:admin, @group] do |f|
- if @group.errors.any?
......
%h3.page_title
%h3.page-title
Group: #{@group.name}
= link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
......
%h3.page_title
%h3.page-title
Projects
= link_to 'New Project', new_project_path, class: "btn btn-small pull-right"
......
%h3.page_title
%h3.page-title
Project: #{@project.name_with_namespace}
= link_to edit_project_path(@project), class: "btn pull-right" do
%i.icon-edit
......
%h3.page_title
%h3.page-title
#{@user.name} →
%i.icon-edit
Edit user
......
%h3.page_title
%h3.page-title
Users
= link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right"
%br
......
%h3.page_title
%h3.page-title
%i.icon-plus
New user
%hr
......
%h3.page_title
%h3.page-title
User:
= @user.name
- if @user.blocked?
......
%h3.page_title
%h3.page-title
Issues
%span.light
–
Assigned to you
%span.pull-right #{@issues.total_count} issues
%br
.row
.span3
= render 'filter', entity: 'issue'
......
%h3.page_title
%h3.page-title
Merge Requests
%span.light
–
Authored by or assigned to you
%span.pull-right #{@merge_requests.total_count} merge requests
%br
.row
.span3
= render 'filter', entity: 'merge_request'
......
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