Merge branch '18434-emoji-icon-styling' into 'master'

Fixed notes action buttons on mobile ## What does this MR do? Fixes the mobile screen size styling for notes action buttons. It ensures there is space between icons and forces parts of the notes header to stack ## Are there points in the code the reviewer needs to double check? Stacking? ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18434. ## Screenshots (if relevant) ![Screen_Shot_2016-06-13_at_17.52.09](/uploads/18849fdfc4fcbf7b67fc66633bbac129/Screen_Shot_2016-06-13_at_17.52.09.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4631

Merge branch '18434-emoji-icon-styling' into 'master'
3e4d740d · Jacob Schatz · 2bd9bf25 · f866af76 · 3e4d740d
Commit 3e4d740d authored Jun 15, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

notes.scss app/assets/stylesheets/pages/notes.scss +11 -1

No files found.
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -139,6 +139,12 @@ ul.notes {
      @media (min-width: $screen-sm-min) {
        padding-right: 0;
      }
+
+      @media (max-width: $screen-xs-min) {
+        .inline {
+          display: block;
+        }
+      }
    }

    .note-emoji-button {
@@ -258,7 +264,11 @@ ul.notes {
  position: absolute;
  right: 0;
  top: 0;
-  
+
+  .note-action-button {
+    margin-left: 10px;
+  }
+
  @media (min-width: $screen-sm-min) {
    position: relative;
  }