summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-06-23 08:01:23 +0100
committerPhil Hughes <me@iamphill.com>2017-06-23 08:01:23 +0100
commit661acb7069e1a5b97db9f5aca34a61b461090559 (patch)
treeb3e5d7c9b89a2e9095a7008e313873f5a06be385
parent35a2d84a58ff043853147c59a628846843d12949 (diff)
downloadgitlab-ce-project-readme-limited-width.tar.gz
fixed width when fluid layout is turned onproject-readme-limited-width
-rw-r--r--app/assets/stylesheets/framework/files.scss2
-rw-r--r--app/views/projects/tree/_readme.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 10a4fe23a51..88e2ca93c4b 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -13,7 +13,7 @@
&.readme-holder {
margin: $gl-padding 0;
- .file-content {
+ &.limited-width-container .file-content {
max-width: $limited-layout-width-sm;
margin-left: auto;
margin-right: auto;
diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml
index de57cd4ba00..b028c44236e 100644
--- a/app/views/projects/tree/_readme.html.haml
+++ b/app/views/projects/tree/_readme.html.haml
@@ -1,5 +1,5 @@
- if readme.rich_viewer
- %article.file-holder.readme-holder
+ %article.file-holder.readme-holder{ class: ("limited-width-container" unless fluid_layout)}
.js-file-title.file-title
= blob_icon readme.mode, readme.name
= link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, readme.path)) do