diff options
| author | Jacob Carlborg <jacob.carlborg@tretti.se> | 2014-01-09 17:50:27 +0100 |
|---|---|---|
| committer | Jacob Carlborg <doob@me.com> | 2014-02-22 21:21:12 +0100 |
| commit | 2d554f42f07a9bebcb6d43ace2cdeedcc54e8de9 (patch) | |
| tree | 146bda9f4c39dcefe9b18b31b2256c6c66186c36 /app/assets | |
| parent | 138e2a50b7d839bd37c21b2849df422f9dfef6bb (diff) | |
| download | gitlab-ce-2d554f42f07a9bebcb6d43ace2cdeedcc54e8de9.tar.gz | |
Add button for toggling inline comments in diff view.
This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/sections/commits.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/notes.scss | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index ff293bc4a00..537ce921d9c 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -60,6 +60,9 @@ } table { + &.text-file { + border-collapse: separate; + } width: 100%; font-family: $monospace_font; border: none; diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 9f5f1579fbd..52c778aaa85 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -184,13 +184,40 @@ ul.notes { } } } + +.file { + .discussion-actions { + margin-right: 5px; + margin-top: 3px; + + .turn-off { + display: inherit; + } + .turn-on { + display: none; + } + } + + &.open .discussion-actions { + .turn-off { + display: none; + } + .turn-on { + display: inherit; + } + } + + &[id^="diff"] .content { + display: block; + } +} + .file .note .note-actions { right: 0; top: 0; } - /** * Line note button on the side of diffs */ |
