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

Dmitriy Zaporozhets
1 parent 8b1d44f7
Showing 87 changed files with 96 additions and 110 deletions Show diff stats
app/assets/stylesheets/common.scss
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
app/assets/stylesheets/gitlab_bootstrap/typography.scss
app/assets/stylesheets/sections/nav.scss
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/votes.scss
app/assets/stylesheets/sections/wiki.scss
app/views/admin/background_jobs/show.html.haml
app/views/admin/groups/edit.html.haml
app/views/admin/groups/index.html.haml
app/views/admin/groups/new.html.haml
app/views/admin/groups/show.html.haml
app/views/admin/projects/index.html.haml
app/views/admin/projects/show.html.haml
app/views/admin/users/edit.html.haml
app/views/admin/users/index.html.haml
app/views/admin/users/new.html.haml
app/views/admin/users/show.html.haml
app/views/dashboard/issues.html.haml
app/views/dashboard/merge_requests.html.haml
@@ -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} &rarr;
   %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
     &ndash;
     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
     &ndash;
     Authored by or assigned to you
   %span.pull-right #{@merge_requests.total_count} merge requests
-%br
 .row
   .span3
     = render 'filter', entity: 'merge_request'
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
-  %h3.page_title Reset password
+  %h3.page-title Reset password
   %br
   = devise_error_messages!
   = f.email_field :email, placeholder: "Email",  class: "text"
 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
-  %h3.page_title Sign Up
+  %h3.page-title Sign Up
   %br
   = devise_error_messages!
   %div
 .login-box
-  %h3.page_title Sign in
+  %h3.page-title Sign in
   %br
   - if ldap_enabled?
     %ul.nav.nav-tabs
 %h1.http_status_code 403
-%h3.page_title Access Denied
+%h3.page-title Access Denied
 %hr
 %p You are not allowed to access this page.
 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
 %h1.http_status_code 500
-%h3.page_title Encoding Error
+%h3.page-title Encoding Error
 %hr
 %p Page can't be loaded because of an encoding error.
 %h1.http_status_code 404
-%h3.page_title Git Resource Not found
+%h3.page-title Git Resource Not found
 %hr
 %p
   Application can't get access to some branch or commit in your repository. It
 %h1.http_status_code 404
-%h3.page_title The resource you were looking for doesn't exist.
+%h3.page-title The resource you were looking for doesn't exist.
 %hr
 %p You may have mistyped the address or the page may have moved.
 = form_tag group_filter_path(entity), method: 'get' do
-  %fieldset.dashboard-search-filter
-    = search_field_tag "search", params[:search], { placeholder: 'Search', class: 'search-text-input' }
-    = button_tag type: 'submit', class: 'btn' do
-      %i.icon-search
-
   %fieldset
-    %legend Status:
     %ul.nav.nav-pills.nav-stacked
       %li{class: ("active" if !params[:status])}
         = link_to group_filter_path(entity, status: nil) do
-%h3.page_title
+%h3.page-title
   Issues
   %small (assigned to you)
   %small.pull-right #{@issues.total_count} issues
-%h3.page_title
+%h3.page-title
   Merge Requests
   %small (authored by or assigned to you)
   %small.pull-right #{@merge_requests.total_count} merge requests
 = render layout: 'help/api_layout' do
-  %h3.page_title
+  %h3.page-title
     %span.light API
     %span
       \/
-%h3.page_title
+%h3.page-title
   GITLAB
   .pull-right
     %span= Gitlab::VERSION
 = render layout: 'help/layout' do
-  %h3.page_title GitLab Flavored Markdown
+  %h3.page-title GitLab Flavored Markdown
   %br
   .help_body
 = render layout: 'help/layout' do
-  %h3.page_title Permissions
+  %h3.page-title Permissions
   %br
   %fieldset
 = render layout: 'help/layout' do
-  %h3.page_title Public Access
+  %h3.page-title Public Access
   %br
   %p
 = render layout: 'help/layout' do
-  %h3.page_title GitLab Rake Tasks
+  %h3.page-title GitLab Rake Tasks
   %br
   %p.slead
 = render layout: 'help/layout' do
-  %h3.page_title SSH Keys
+  %h3.page-title SSH Keys
   %br
   %p.slead
 = render layout: 'help/layout' do
-  %h3.page_title System hooks
+  %h3.page-title System hooks
   %br
   %p.slead
 = render layout: 'help/layout' do
-  %h3.page_title Web hooks
+  %h3.page-title Web hooks
   %br
   %p.slead
 = render layout: 'help/layout' do
-  %h3.page_title Workflow
+  %h3.page-title Workflow
   %br
   %ol.help
-- if content_for?(:page_title)
-  = yield :page_title
+- if content_for?(:page-title)
+  = yield :page-title
-%h3.page_title
+%h3.page-title
   SSH Keys
   = link_to "Add SSH Key", new_profile_key_path, class: "btn pull-right btn-primary"
-%h3.page_title Add an SSH Key
+%h3.page-title Add an SSH Key
 %hr
 = render 'form'
-%h3.page_title Setup your notification level
+%h3.page-title Setup your notification level
 %br
 .profile_avatar_holder
   = image_tag gravatar_icon(@user.email, 90), alt: ''
-%h3.page_title
+%h3.page-title
   = @user.name
   %br
   %small
@@ -15,7 +15,7 @@
           %li= link_to "Plain Diff",    project_commit_path(@project, @commit, format: :diff)
       = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
         %span Browse Code »
-    %h3.commit-title.page_title
+    %h3.commit-title.page-title
       = gfm escape_once(@commit.title)
     - if @commit.description.present?
       %pre.commit-description
 = render "projects/commits/head"
-%h3.page_title
+%h3.page-title
   Compare View
 %hr
 = render "projects/commits/head"
-%h3.page_title
+%h3.page-title
   Compare View
 %hr
-%h3.page_title New Deploy key
+%h3.page-title New Deploy key
 %hr
 = render 'form'
-%h3.page_title
+%h3.page-title
   Deploy key:
   = @key.title
   %small
     created at
     = @key.created_at.stamp("Aug 21, 2011")
-.back_link
+.back-link
   = link_to project_deploy_keys_path(@project) do
     &larr; To keys list
 %hr
 .loading-graph
   %center
     .loading
-    %h3.page_title Building repository graph. Please wait a moment.
+    %h3.page-title Building repository graph. Please wait a moment.
 .stat-graph
   .header.clearfix
@@ -10,7 +10,7 @@
         %option{:value => "commits"} Commits
         %option{:value => "additions"} Additions
         %option{:value => "deletions"} Deletions
-    %h3#date_header.page_title
+    %h3#date_header.page-title
     %input#brush_change{:type => "hidden"}
   .graphs
     #contributors-master
 %div.issue-form-holder
-  %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
+  %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
   = form_for [@project, @issue] do |f|
     -if @issue.errors.any?
       .alert.alert-error
 = render "head"
 .issues_content
-  %h3.page_title
+  %h3.page-title
     Issues
     %span (<span class=issue_counter>#{@issues.total_count}</span>)
     .pull-right
@@ -16,8 +16,6 @@
           = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
           = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
-  .clearfix
-
 .row
   .span3
     = render 'filter', entity: 'issue'
-%h3.page_title
+%h3.page-title
   Issue ##{@issue.id}
   %small
@@ -22,7 +22,7 @@
 .pull-right
   .span3#votes= render 'votes/votes_block', votable: @issue
-.back_link
+.back-link
   = link_to project_issues_path(@project) do
     &larr; To issues list
 = render "projects/issues/head"
-%h3.page_title
+%h3.page-title
   Labels
 %br
-%h3.page_title
+%h3.page-title
   = "Edit merge request #{@merge_request.id}"
 %hr
 = render 'form'
@@ -2,7 +2,7 @@
   = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
     %i.icon-plus
     New Merge Request
-%h3.page_title
+%h3.page-title
   Merge Requests
 %br
-%h3.page_title New Merge Request
+%h3.page-title New Merge Request
 %hr
 = render 'form'
-%h3.page_title
+%h3.page-title
   = "Merge Request ##{@merge_request.id}:"
   &nbsp;
   %span.label-branch= @merge_request.source_branch
@@ -26,6 +26,6 @@
 .pull-right
   .span3#votes= render 'votes/votes_block', votable: @merge_request
-.back_link
+.back-link
   = link_to project_merge_requests_path(@project) do
     &larr; To merge requests
-%h3.page_title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
-.back_link
+%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
+.back-link
   = link_to project_milestones_path(@project) do
     &larr; To milestones
 = render "projects/issues/head"
 .milestones_content
-  %h3.page_title
+  %h3.page-title
     Milestones
     - if can? current_user, :admin_milestone, @project
       = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do
 = render "projects/issues/head"
 .row
   .span6
-    %h3.page_title
+    %h3.page-title
       Milestone ##{@milestone.id}
       %small
         = @milestone.expires_at
-    .back_link
+    .back-link
       = link_to project_milestones_path(@project) do
         &larr; To milestones list
   .span6
-%h3.page_title Project Network Graph
+%h3.page-title Project Network Graph
 %hr
 .clearfix
-%h3.page_title
+%h3.page-title
   - if @service.activated?
     %span.cgreen
       %i.icon-circle
@@ -9,7 +9,7 @@
 %p= @service.description
-.back_link
+.back-link
   = link_to project_services_path(@project) do
     &larr; to services
-%h3.page_title Services
+%h3.page-title Services
 %br
 %ul.bordered-list
@@ -7,7 +7,7 @@
     .loading.hide
   .span3
     .light-well
-      %h3.page_title
+      %h3.page-title
         = @project.name
       - if @project.description.present?
         %p.light= @project.description
-%h3.page_title
+%h3.page-title
   = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
 %hr
 .snippet-form-holder
-%h3.page_title
+%h3.page-title
   Snippets
   %small share code pastes with others out of git repository
-%h3.page_title
+%h3.page-title
   %i.icon-lock.cgreen
   = @snippet.title
-%h3.page_title
+%h3.page-title
   = "New Team member(s)"
 %hr
 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
-%h3.page_title
+%h3.page-title
   = "Import team from another project"
 %hr
 %p.slead
-%h3.page_title
+%h3.page-title
   Users with access to this project
   - if can? current_user, :admin_team_member, @project
@@ -8,7 +8,7 @@
   .ui-box.ui-box-show
     .ui-box-head
-      %h3.page_title
+      %h3.page-title
         .edit-wiki-header
           = @wiki.title.titleize
           = f.hidden_field :title, value: @wiki.title
 %div#modal-new-wiki.modal.hide
   .modal-header
     %a.close{href: "#"} ×
-    %h3.page_title New Wiki Page
+    %h3.page-title New Wiki Page
   .modal-body
     = label_tag :new_wiki_path do
       %span Page slug
 = render 'nav'
-%h3.page_title
+%h3.page-title
   Editing page
   = render 'main_links'
 = render 'form'
-%h3.page_title Empty page
+%h3.page-title Empty page
 %hr
 .error_message
   You are not allowed to create wiki pages
 = render 'nav'
-%h3.page_title
+%h3.page-title
   Git Access
   %strong= @gollum_wiki.path_with_namespace
   = render 'main_links'
 = render 'nav'
-%h3.page_title
+%h3.page-title
   %span.light History for
   = @wiki.title.titleize
   = render 'main_links'
 = render 'nav'
-%h3.page_title
+%h3.page-title
   All Pages
   = render 'main_links'
 %br
 = render 'nav'
-%h3.page_title
+%h3.page-title
   = @wiki.title.titleize
   = render 'main_links'
 %br
 .row
   .span6
-    %h3.page_title
+    %h3.page-title
       Projects (#{@projects.total_count})
       %small with read-only access
   .span6
-%h3.page_title
+%h3.page-title
   = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
 %hr
 .snippet-form-holder
-%h3.page_title
+%h3.page-title
   My Snippets
   %small share code pastes with others out of git repository
   .pull-right
-%h3.page_title
+%h3.page-title
   Public snippets
   %small share code pastes with others out of git repository
-%h3.page_title
+%h3.page-title
   - if @snippet.private?
     %i{:class => "icon-lock cgreen has_bottom_tooltip", "data-original-title" => "Private snippet"}
   - else
-%h3.page_title
+%h3.page-title
   = image_tag gravatar_icon(@user.email), class: "avatar s24"
   = @user.name
   %span
 .row
   .span8
-    %h3.page_title
+    %h3.page-title
       = image_tag gravatar_icon(@user.email, 90), class: "avatar s90", alt: ''
       = @user.name
       - if @user == current_user
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	*/	11	*/
12	.ui-box {	12	.ui-box {
13	background: #F9F9F9;	13	background: #F9F9F9;
14	- margin-bottom: 25px;	14	+ margin-bottom: 20px;
15	border: 1px solid #CCC;	15	border: 1px solid #CCC;
16	word-wrap: break-word;	16	word-wrap: break-word;
17	@include solid-shade;	17	@include solid-shade;
1	.main-nav {	1	.main-nav {
2	background: #f5f5f5;	2	background: #f5f5f5;
3	- margin: 30px 0;	3	+ margin: 20px 0;
4	margin-top: 0;	4	margin-top: 0;
5	padding-top: 4px;	5	padding-top: 4px;
6	border-bottom: 1px solid #E1E1E1;	6	border-bottom: 1px solid #E1E1E1;
	@@ -48,7 +48,7 @@		@@ -48,7 +48,7 @@
48	margin-bottom: 50px;	48	margin-bottom: 50px;
49	}	49	}
50	h3 {	50	h3 {
51	- @extend .page_title;	51	+ @extend .page-title;
52	}	52	}
53		53
54	}	54	}
	@@ -27,7 +27,7 @@		@@ -27,7 +27,7 @@
27	}	27	}
28	}	28	}
29	.votes-block {	29	.votes-block {
30	- margin: 14px 6px 6px 0;	30	+ margin: 6px;
31	.downvotes {	31	.downvotes {
32	float: right;	32	float: right;
33	}	33	}
1	-h3.page_title .edit-wiki-header {	1	+h3.page-title .edit-wiki-header {
2	width: 780px;	2	width: 780px;
3	margin-left: auto;	3	margin-left: auto;
4	margin-right: auto;	4	margin-right: auto;
1	-%h3.page_title Background Jobs	1	+%h3.page-title Background Jobs
2	%br	2	%br
3	.ui-box	3	.ui-box
4	%iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}	4	%iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
1	-%h3.page_title Edit Group	1	+%h3.page-title Edit Group
2	%hr	2	%hr
3	= form_for [:admin, @group] do \|f\|	3	= form_for [:admin, @group] do \|f\|
4	- if @group.errors.any?	4	- if @group.errors.any?
1	-%h3.page_title	1	+%h3.page-title
2	Groups (#{@groups.total_count})	2	Groups (#{@groups.total_count})
3	%small	3	%small
4	allows you to keep projects organized.	4	allows you to keep projects organized.
1	-%h3.page_title New Group	1	+%h3.page-title New Group
2	%hr	2	%hr
3	= form_for [:admin, @group] do \|f\|	3	= form_for [:admin, @group] do \|f\|
4	- if @group.errors.any?	4	- if @group.errors.any?
1	-%h3.page_title	1	+%h3.page-title
2	Group: #{@group.name}	2	Group: #{@group.name}
3		3
4	= link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do	4	= link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do