diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-09-28 19:11:50 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-28 19:11:50 +0300 |
| commit | c51e8f0679d231b4b3b99b53a0239f72733351ca (patch) | |
| tree | ab0b403fd08bf7b112dfeb54fd5c8e16fbddbba1 | |
| parent | 6bca3a3ed94c1d98a9cfac8b115614c2b8943096 (diff) | |
| download | gitlab-ce-c51e8f0679d231b4b3b99b53a0239f72733351ca.tar.gz | |
Added CHANGELOG entry.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/editor.scss | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index f92fcff951a..098aa1ca61c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ v 8.13.0 (unreleased) - Revoke button in Applications Settings underlines on hover. - Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe) - Add organization field to user profile + - Added soft wrap option to editor - Optimize GitHub importing for speed and memory v 8.12.2 (unreleased) diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss index e1304335271..5ea6ce85019 100644 --- a/app/assets/stylesheets/pages/editor.scss +++ b/app/assets/stylesheets/pages/editor.scss @@ -70,12 +70,14 @@ .soft-wrap-toggle { margin: 0 $btn-side-margin; + .soft-wrap { display: block; } .no-wrap { display: none; } + &.soft-wrap-active { .soft-wrap { display: none; |