diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 13:03:24 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 13:03:24 +0000 |
commit | 4d5d61945770378d6c0edbdfe0e88d43c5129b03 (patch) | |
tree | 101a3b089150b9e93b155690caa9f93b6b581c60 /app/assets/stylesheets/pages/notes.scss | |
parent | 06952aaf24633550f57fd54b70d27732509935c2 (diff) | |
parent | 038e623042af614fb739f49a9302ec42cab9812a (diff) | |
download | gitlab-ce-4d5d61945770378d6c0edbdfe0e88d43c5129b03.tar.gz |
Merge branch 'discussion-notes' into 'master'
Discussion notes update
- At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues
- Moved the dates to be in the header like other notes
- Fixed overlapping issue on mobile
See merge request !3720
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index ce44f5aa13b..a0fbf7d67c5 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -198,6 +198,12 @@ ul.notes { color: $notes-light-color; } +.discussion-headline-light { + a { + color: $gl-link-color; + } +} + /** * Actions for Discussions/Notes */ @@ -209,6 +215,17 @@ ul.notes { color: $notes-action-color; } +.discussion-actions { + @media (max-width: $screen-sm-max) { + float: none; + margin-left: 0; + + .note-action-button { + margin-left: 0; + } + } +} + .note-action-button, .discussion-action-button { display: inline-block; |