diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-22 10:56:43 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-22 10:56:43 +0000 |
| commit | 93106e150d4810459d0fc82b8c552309db4431fc (patch) | |
| tree | 6fa9323746105c5469cb6923ce33c73fff8f6be1 | |
| parent | 79a9cfa375e8d6825d97ed68743d43322ba03a0d (diff) | |
| parent | 9a5b2e94d65774edda9bb0e8bf6df22347d48ed7 (diff) | |
| download | gitlab-ce-93106e150d4810459d0fc82b8c552309db4431fc.tar.gz | |
Merge branch '18855-wrap-code-in-activities-and-todos' into 'master'
Wrap code blocks on Activies and Todos page
## What does this MR do?
wrap code blocks on Activities and Todos page
## Are there points in the code the reviewer needs to double check?
Can `white-space: pre-wrap` be used for code blocks everywhere?
## Why was this MR needed?
Content of code blocks is cut on small screen sizes.
## What are the relevant issue numbers?
closes #18855
## Screenshots
See merge request !4783
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/events.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/todos.scss | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 72679b89d82..222563d355c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -37,6 +37,7 @@ v 8.9.0 (unreleased) - Implement a fair usage of shared runners - Remove project notification settings associated with deleted projects - Fix 404 page when viewing TODOs that contain milestones or labels in different projects + - Wrap code blocks on Activies and Todos page !4783 (winniehell) - Add a metric for the number of new Redis connections created by a transaction - Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark - Redesign navigation for project pages diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index 6c36f603daf..a2145956eb5 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -54,6 +54,10 @@ } } + code { + white-space: pre-wrap; + } + pre { border: none; background: #f9f9f9; diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss index afc00a68572..cf16d070cfe 100644 --- a/app/assets/stylesheets/pages/todos.scss +++ b/app/assets/stylesheets/pages/todos.scss @@ -62,6 +62,10 @@ } } + code { + white-space: pre-wrap; + } + pre { border: none; background: #f9f9f9; |