diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2018-04-19 13:57:12 +0300 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-05-01 21:13:39 +0300 |
| commit | d014775d13add961624db1b59a5e582b0c58b29a (patch) | |
| tree | 6d9392e49498cabe2b7c28b20545f7cc1a9b8d6f | |
| parent | b8a848304edc50ec4d4dfbb895dc3c16896c8e10 (diff) | |
| download | gitlab-ce-d014775d13add961624db1b59a5e582b0c58b29a.tar.gz | |
Move discussion actions to the right for small viewports
| -rw-r--r-- | app/assets/javascripts/notes/components/note_header.vue | 30 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/move-disussion-actions-to-the-right.yml | 5 |
3 files changed, 20 insertions, 20 deletions
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index c3d1ef1fcc6..fbfd6f92c85 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -62,6 +62,21 @@ export default { <template> <div class="note-header-info"> + <div + v-if="includeToggle" + class="discussion-actions"> + <button + @click="handleToggle" + class="note-action-button discussion-toggle-button js-vue-toggle-button" + type="button"> + <i + :class="toggleChevronClass" + class="fa" + aria-hidden="true"> + </i> + Toggle discussion + </button> + </div> <a :href="author.path"> <span class="note-header-author-name">{{ author.name }}</span> <span class="note-headline-light"> @@ -95,20 +110,5 @@ export default { </i> </span> </span> - <div - v-if="includeToggle" - class="discussion-actions"> - <button - @click="handleToggle" - class="note-action-button discussion-toggle-button js-vue-toggle-button" - type="button"> - <i - :class="toggleChevronClass" - class="fa" - aria-hidden="true"> - </i> - Toggle discussion - </button> - </div> </div> </template> diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 6d5c6cb136f..817c956da31 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -473,11 +473,6 @@ ul.notes { margin-left: 10px; color: $gray-darkest; - @include notes-media('max', $screen-md-max) { - float: none; - margin-left: 0; - } - .btn-group > .discussion-next-btn { margin-left: -1px; } diff --git a/changelogs/unreleased/move-disussion-actions-to-the-right.yml b/changelogs/unreleased/move-disussion-actions-to-the-right.yml new file mode 100644 index 00000000000..b79c6f36585 --- /dev/null +++ b/changelogs/unreleased/move-disussion-actions-to-the-right.yml @@ -0,0 +1,5 @@ +--- +title: Move discussion actions to the right for small viewports +merge_request: 18476 +author: George Tsiolis +type: changed |