diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-15 11:29:34 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-15 11:29:34 +0000 |
commit | b1c1d16d3443d48ad118c7b78aecd6c31e3d1cfd (patch) | |
tree | 1b8ba6c132a769f72f3b213c7250ee95a1f4332a | |
parent | c32b2d3d2b7d4e2ce8b58eee12b31f1f907e57ed (diff) | |
parent | 6e99ed5d41f752fb8d495bd3297f9897fb9fd52e (diff) | |
download | gitlab-ce-b1c1d16d3443d48ad118c7b78aecd6c31e3d1cfd.tar.gz |
Merge branch '59873-page-title' into 'master'
Fixes stylelint for page_title.scss
Closes #59873
See merge request gitlab-org/gitlab-ce!27315
-rw-r--r-- | app/assets/stylesheets/framework/page_title.scss | 3 | ||||
-rw-r--r-- | app/views/dashboard/_activity_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/_groups_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/_snippets_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/issues.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/milestones/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/todos/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/snippets/new.html.haml | 2 |
11 files changed, 10 insertions, 13 deletions
diff --git a/app/assets/stylesheets/framework/page_title.scss b/app/assets/stylesheets/framework/page_title.scss index ad6575761b5..c77e2be8e5a 100644 --- a/app/assets/stylesheets/framework/page_title.scss +++ b/app/assets/stylesheets/framework/page_title.scss @@ -1,7 +1,4 @@ .page-title-holder { - @extend .d-flex; - @extend .align-items-center; - border-bottom: 1px solid $border-color; .page-title { diff --git a/app/views/dashboard/_activity_head.html.haml b/app/views/dashboard/_activity_head.html.haml index ec1a3fef435..3f39555a1d4 100644 --- a/app/views/dashboard/_activity_head.html.haml +++ b/app/views/dashboard/_activity_head.html.haml @@ -1,4 +1,4 @@ -.page-title-holder +.page-title-holder.d-flex.align-items-center %h1.page-title= _('Activity') .top-area diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml index 8ab5dc37f34..b2fadb77418 100644 --- a/app/views/dashboard/_groups_head.html.haml +++ b/app/views/dashboard/_groups_head.html.haml @@ -1,4 +1,4 @@ -.page-title-holder +.page-title-holder.d-flex.align-items-center %h1.page-title= _('Groups') - if current_user.can_create_group? diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index ae67192cbcd..ca2822e2b29 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -1,7 +1,7 @@ = content_for :flash_message do = render 'shared/project_limit' -.page-title-holder +.page-title-holder.d-flex.align-items-center %h1.page-title= _('Projects') - if current_user.can_create_project? diff --git a/app/views/dashboard/_snippets_head.html.haml b/app/views/dashboard/_snippets_head.html.haml index a05d0190efb..34aca40d0d1 100644 --- a/app/views/dashboard/_snippets_head.html.haml +++ b/app/views/dashboard/_snippets_head.html.haml @@ -1,4 +1,4 @@ -.page-title-holder +.page-title-holder.d-flex.align-items-center %h1.page-title= _('Snippets') - if current_user && current_user.snippets.any? || @snippets.any? diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 352ec986ccb..b3ee5034204 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -6,7 +6,7 @@ = render_dashboard_gold_trial(current_user) -.page-title-holder +.page-title-holder.d-flex.align-items-center %h1.page-title= _('Issues') - if current_user diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 659cc254b10..3956f03a3c8 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -4,7 +4,7 @@ = render_dashboard_gold_trial(current_user) -.page-title-holder +.page-title-holder.d-flex.align-items-center %h1.page-title= _('Merge Requests') - if current_user diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml index 13822d36f15..37ba2143eba 100644 --- a/app/views/dashboard/milestones/index.html.haml +++ b/app/views/dashboard/milestones/index.html.haml @@ -2,7 +2,7 @@ - page_title 'Milestones' - header_title 'Milestones', dashboard_milestones_path -.page-title-holder +.page-title-holder.d-flex.align-items-center %h1.page-title= _('Milestones') - if current_user diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index c569bc682a6..214630d245a 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -4,7 +4,7 @@ = render_dashboard_gold_trial(current_user) -.page-title-holder +.page-title-holder.d-flex.align-items-center %h1.page-title= _('Todos') - if current_user.todos.any? diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index 6269678079a..06e05d898d6 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -3,7 +3,7 @@ - page_title _('New Group') - header_title _("Groups"), dashboard_groups_path -.page-title-holder +.page-title-holder.d-flex.align-items-center %h1.page-title= _('New group') .row.prepend-top-default .col-lg-3.profile-settings-sidebar diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml index 114c777bdc2..9d462865471 100644 --- a/app/views/snippets/new.html.haml +++ b/app/views/snippets/new.html.haml @@ -2,7 +2,7 @@ - @hide_breadcrumbs = true - page_title _("New Snippet") -.page-title-holder +.page-title-holder.d-flex.align-items-center %h1.page-title= _('New Snippet') .prepend-top-default |