Commit da120cce authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'pipeline-editor-fluid-layout' into 'master'

Default to fluid layout for the pipeline editor

See merge request gitlab-org/gitlab!78038
parents 6f09c2fa b3cad6c6
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
</script> </script>
<template> <template>
<div class="gl-pr-9 gl-transition-medium gl-w-full"> <div class="gl-pr-10 gl-transition-medium gl-w-full">
<gl-modal <gl-modal
v-if="showSwitchBranchModal" v-if="showSwitchBranchModal"
visible visible
......
...@@ -311,3 +311,8 @@ $gl-line-height-42: px-to-rem(42px); ...@@ -311,3 +311,8 @@ $gl-line-height-42: px-to-rem(42px);
padding-right: $gl-spacing-scale-5; padding-right: $gl-spacing-scale-5;
} }
} }
// Will be moved to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2600
.gl-pr-10 {
padding-right: $gl-spacing-scale-10;
}
...@@ -125,7 +125,7 @@ module PageLayoutHelper ...@@ -125,7 +125,7 @@ module PageLayoutHelper
end end
def fluid_layout def fluid_layout
current_user && current_user.layout == "fluid" @force_fluid_layout == true || (current_user && current_user.layout == "fluid")
end end
def blank_container(enabled = false) def blank_container(enabled = false)
......
- @force_fluid_layout = true
- add_page_specific_style 'page_bundles/pipelines' - add_page_specific_style 'page_bundles/pipelines'
- page_title s_('Pipelines|Pipeline Editor') - page_title s_('Pipelines|Pipeline Editor')
......
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