From 53e8dc6e9cf786008976a5bfa5504e16f65bac52 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Wed, 11 May 2016 15:23:24 -0400 Subject: Initial CSS change to move buttons to correct position. --- app/assets/stylesheets/pages/note_form.scss | 10 +++++++++- app/views/projects/notes/_hints.html.haml | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 7fa13e66b43..7289812ab7a 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -150,9 +150,17 @@ } .comment-toolbar { - padding-top: $gl-padding-top; + padding-top: 11px; color: $note-toolbar-color; border-top: 1px solid $border-color; + + .toolbar-button { + float: right; + } + + .toolbar-text { + float: right; + } } .toolbar-button { diff --git a/app/views/projects/notes/_hints.html.haml b/app/views/projects/notes/_hints.html.haml index 0b002043408..02343b7a3cd 100644 --- a/app/views/projects/notes/_hints.html.haml +++ b/app/views/projects/notes/_hints.html.haml @@ -1,8 +1,8 @@ .comment-toolbar.clearfix + %button.toolbar-button.markdown-selector{ type: 'button', tabindex: '-1' } + = icon('file-image-o', class: 'toolbar-button-icon') + Attach a file .toolbar-text Styling with = link_to 'Markdown', help_page_path('markdown', 'markdown'), target: '_blank', tabindex: -1 is supported - %button.toolbar-button.markdown-selector{ type: 'button', tabindex: '-1' } - = icon('file-image-o', class: 'toolbar-button-icon') - Attach a file -- cgit v1.2.1