summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-04-12 12:59:24 +0100
committerFilipa Lacerda <filipa@gitlab.com>2019-04-12 16:16:59 +0100
commit6e99ed5d41f752fb8d495bd3297f9897fb9fd52e (patch)
treea32261b2d6a9905094a0fdb359ce9bdea7b2a457
parent7457c1e1229cd1e90e608e8b247e2fbb217f05b6 (diff)
downloadgitlab-ce-59873-page-title.tar.gz
Fixes stylelint for page_title.scss59873-page-title
Replaces CSS with BS4 Utility classes
-rw-r--r--app/assets/stylesheets/framework/page_title.scss3
-rw-r--r--app/views/dashboard/_activity_head.html.haml2
-rw-r--r--app/views/dashboard/_groups_head.html.haml2
-rw-r--r--app/views/dashboard/_projects_head.html.haml2
-rw-r--r--app/views/dashboard/_snippets_head.html.haml2
-rw-r--r--app/views/dashboard/issues.html.haml2
-rw-r--r--app/views/dashboard/merge_requests.html.haml2
-rw-r--r--app/views/dashboard/milestones/index.html.haml2
-rw-r--r--app/views/dashboard/todos/index.html.haml2
-rw-r--r--app/views/groups/new.html.haml2
-rw-r--r--app/views/snippets/new.html.haml2
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