Commit 49b0576d authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '259647-analytics-date-picker-labels-are-not-centre-aligned' into 'master'

Resolve "Analytics date picker labels are not centre aligned"

See merge request gitlab-org/gitlab!44990
parents 0b92a4cd 23f36c9f
...@@ -206,7 +206,7 @@ export default { ...@@ -206,7 +206,7 @@ export default {
> >
<projects-dropdown-filter <projects-dropdown-filter
:key="currentGroup.id" :key="currentGroup.id"
class="js-projects-dropdown-filter project-select" class="js-projects-dropdown-filter project-select gl-mb-2 gl-lg-mb-0"
:group-id="currentGroup.id" :group-id="currentGroup.id"
:group-namespace="currentGroupPath" :group-namespace="currentGroupPath"
:query-params="projectsQueryParams" :query-params="projectsQueryParams"
......
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
<div <div
class="gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-justify-content-space-between gl-bg-gray-10 gl-border-t-solid gl-border-t-1 gl-border-t-gray-100 gl-border-b-solid gl-border-b-1 gl-border-b-gray-100 gl-py-3" class="gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-justify-content-space-between gl-bg-gray-10 gl-border-t-solid gl-border-t-1 gl-border-t-gray-100 gl-border-b-solid gl-border-b-1 gl-border-b-gray-100 gl-py-3"
> >
<filter-bar class="gl-flex-grow-1 gl-lg-ml-3" /> <filter-bar class="gl-flex-grow-1 gl-lg-ml-3 gl-mb-2 gl-lg-mb-0" />
<date-range <date-range
:start-date="startDate" :start-date="startDate"
:end-date="endDate" :end-date="endDate"
......
...@@ -90,8 +90,9 @@ export default { ...@@ -90,8 +90,9 @@ export default {
:default-max-date="maxDate" :default-max-date="maxDate"
:same-day-selection="includeSelectedDate" :same-day-selection="includeSelectedDate"
theme="animate-picker" theme="animate-picker"
start-picker-class="js-daterange-picker-from d-flex flex-column flex-lg-row align-items-lg-center mr-lg-2 mb-2 mb-md-0" start-picker-class="js-daterange-picker-from gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-lg-align-items-center gl-lg-mr-3 gl-mb-2 gl-lg-mb-0"
end-picker-class="js-daterange-picker-to d-flex flex-column flex-lg-row align-items-lg-center" end-picker-class="js-daterange-picker-to d-flex flex-column flex-lg-row align-items-lg-center"
label-class="gl-mb-2 gl-lg-mb-0"
/> />
<div <div
v-if="maxDateRange" v-if="maxDateRange"
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
label { label {
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
margin-bottom: 0;
margin-right: $gl-padding-4; margin-right: $gl-padding-4;
} }
} }
......
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
label { label {
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
margin-bottom: 0;
margin-right: $gl-padding-4; margin-right: $gl-padding-4;
} }
} }
......
---
title: Align Analytics date picker labels
merge_request: 44990
author:
type: fixed
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