diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-14 10:55:08 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-14 10:55:08 +0000 |
| commit | b6bdd650a54306c3f56f8332a64a3f5194ee793d (patch) | |
| tree | 85703e0e2d9ca192f88877642b64c9799cb17fce | |
| parent | e8889b154ec726c7b9486ec95560c3a4075a4135 (diff) | |
| parent | 8b9c12901677398e662118f50949c91ecdef20e3 (diff) | |
| download | gitlab-ce-b6bdd650a54306c3f56f8332a64a3f5194ee793d.tar.gz | |
Merge branch 'improve-readability' into 'master'
Set max-width for README, issue and merge request description
It allows easier text reading on big screens
### Problem
Text is hard to read on wide screens:
### Solution
Set max-width to content. Screenshots:
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1161
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/base/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 3 |
4 files changed, 11 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index cd699995f20..f4abb5f5eb5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,7 @@ v 7.14.0 (unreleased) - Add a label for merged branches on branches page (Florent Baldino) - Detect .mkd and .mkdn files as markdown (Ben Boeckel) - Fix: User search feature in admin area does not respect filters + - Set max-width for README, issue and merge request description for easier read on big screens v 7.13.5 - Satellites reverted diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss index 08f153dfbc9..cb439a0e0bf 100644 --- a/app/assets/stylesheets/base/variables.scss +++ b/app/assets/stylesheets/base/variables.scss @@ -13,6 +13,7 @@ $code_line_height: 1.5; $border-color: #E5E5E5; $background-color: #f5f5f5; $header-height: 50px; +$readable-width: 1100px; /* diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 586e7b5f8da..3f617e72b02 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -45,3 +45,9 @@ .btn { font-size: 13px; } } + +.issuable-details { + .description { + max-width: $readable-width; + } +} diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 092918e4de1..5f1a3db4fb6 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -116,6 +116,9 @@ } .readme-holder { + margin: 0 auto; + max-width: $readable-width; + .readme-file-title { font-size: 14px; font-weight: bold; |