Skip to content
Snippets Groups Projects
Commit 71028a74 authored by Scott de Jonge's avatar Scott de Jonge
Browse files

Merge branch...

Merge branch '410711-drawer-is-appearing-below-the-breadcrumb-bar-when-using-report-abuse' into 'master'

Update top spacing for layout page and content wrapper

See merge request !120553



Merged-by: default avatarScott de Jonge <sdejonge@gitlab.com>
Approved-by: default avatarMiranda Fluharty <mfluharty@gitlab.com>
Approved-by: default avatarSascha Eggenberger <seggenberger@gitlab.com>
parents b7027a74 8129b4c7
No related branches found
No related tags found
No related merge requests found
Pipeline #872392905 passed
Pipeline: GitLab

#872409344

    Pipeline: GitLab

    #872402138

      <script>
      import { GlDrawer } from '@gitlab/ui';
      import { DRAWER_Z_INDEX } from '~/lib/utils/constants';
      import { getContentWrapperHeight } from '~/lib/utils/dom_utils';
      import { __ } from '~/locale';
      import { DRAWER_CONTAINER_CLASS } from '../job_assistant_drawer/constants';
      ......@@ -31,7 +32,7 @@ export default {
      zIndex: {
      type: Number,
      required: false,
      default: 200,
      default: DRAWER_Z_INDEX,
      },
      },
      computed: {
      ......
      ......@@ -2,6 +2,7 @@
      import { GlDrawer, GlAccordion, GlButton } from '@gitlab/ui';
      import { stringify, parse } from 'yaml';
      import { get, omit, toPath } from 'lodash';
      import { DRAWER_Z_INDEX } from '~/lib/utils/constants';
      import { getContentWrapperHeight } from '~/lib/utils/dom_utils';
      import eventHub, { SCROLL_EDITOR_TO_BOTTOM } from '~/ci/pipeline_editor/event_hub';
      import getRunnerTags from '../../graphql/queries/runner_tags.query.graphql';
      ......@@ -34,7 +35,7 @@ export default {
      zIndex: {
      type: Number,
      required: false,
      default: 200,
      default: DRAWER_Z_INDEX,
      },
      ciConfigData: {
      type: Object,
      ......
      <script>
      import { GlModal } from '@gitlab/ui';
      import { __ } from '~/locale';
      import { DRAWER_Z_INDEX } from '~/lib/utils/constants';
      import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
      import CommitSection from './components/commit/commit_section.vue';
      import PipelineEditorDrawer from './components/drawer/pipeline_editor_drawer.vue';
      ......@@ -73,9 +74,9 @@ export default {
      showDrawer: false,
      showJobAssistantDrawer: false,
      showAiAssistantDrawer: false,
      drawerIndex: 200,
      jobAssistantIndex: 200,
      aiAssistantIndex: 200,
      drawerIndex: DRAWER_Z_INDEX,
      jobAssistantIndex: DRAWER_Z_INDEX,
      aiAssistantIndex: DRAWER_Z_INDEX,
      showFileTree: false,
      showSwitchBranchModal: false,
      };
      ......
      ......@@ -36,11 +36,12 @@ body {
      }
      .layout-page {
      padding-top: $calc-application-header-height;
      padding-top: calc(#{$header-height} + #{$calc-application-bars-height});
      padding-bottom: $calc-application-footer-height;
      }
      .content-wrapper {
      padding-top: var(--top-bar-height);
      padding-bottom: 100px;
      }
      ......
      ......@@ -581,8 +581,7 @@ html {
      .layout-page {
      padding-top: calc(
      var(--header-height, 48px) +
      calc(var(--system-header-height) + var(--performance-bar-height)) +
      var(--top-bar-height)
      calc(var(--system-header-height) + var(--performance-bar-height))
      );
      padding-bottom: var(--system-footer-height);
      }
      ......
      ......@@ -581,8 +581,7 @@ html {
      .layout-page {
      padding-top: calc(
      var(--header-height, 48px) +
      calc(var(--system-header-height) + var(--performance-bar-height)) +
      var(--top-bar-height)
      calc(var(--system-header-height) + var(--performance-bar-height))
      );
      padding-bottom: var(--system-footer-height);
      }
      ......
      ......@@ -581,8 +581,7 @@ html {
      .layout-page {
      padding-top: calc(
      var(--header-height, 48px) +
      calc(var(--system-header-height) + var(--performance-bar-height)) +
      var(--top-bar-height)
      calc(var(--system-header-height) + var(--performance-bar-height))
      );
      padding-bottom: var(--system-footer-height);
      }
      ......
      ......@@ -581,8 +581,7 @@ html {
      .layout-page {
      padding-top: calc(
      var(--header-height, 48px) +
      calc(var(--system-header-height) + var(--performance-bar-height)) +
      var(--top-bar-height)
      calc(var(--system-header-height) + var(--performance-bar-height))
      );
      padding-bottom: var(--system-footer-height);
      }
      ......
      0% Loading or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment