From 83516c6aa6e3323526b8fe8bf3b758358087998d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sun, 24 Jan 2021 09:08:57 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/assets/stylesheets/framework/files.scss | 14 ++++++++------ .../jdb-fix-project-index-file-no-longer-fluid.yml | 5 +++++ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 changelogs/unreleased/jdb-fix-project-index-file-no-longer-fluid.yml diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index fe8c27ae9b6..27a439651e6 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -2,6 +2,14 @@ * File content holder * */ +.container-fluid.container-limited.limit-container-width { + .file-holder.readme-holder.limited-width-container .file-content { + max-width: $limited-layout-width; + margin-left: auto; + margin-right: auto; + } +} + .file-holder { border: 1px solid $border-color; border-top: 0; @@ -17,12 +25,6 @@ &.readme-holder { margin: $gl-padding 0; - - &.limited-width-container .file-content { - max-width: $limited-layout-width; - margin-left: auto; - margin-right: auto; - } } .file-title { diff --git a/changelogs/unreleased/jdb-fix-project-index-file-no-longer-fluid.yml b/changelogs/unreleased/jdb-fix-project-index-file-no-longer-fluid.yml new file mode 100644 index 00000000000..5c7d5fd7cc4 --- /dev/null +++ b/changelogs/unreleased/jdb-fix-project-index-file-no-longer-fluid.yml @@ -0,0 +1,5 @@ +--- +title: Add css to fix fluid layout for index file +merge_request: 50626 +author: +type: fixed