summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-15 20:28:08 +0000
committerRobert Speicher <rspeicher@gmail.com>2016-06-15 20:59:00 -0400
commit34a0300ba3727cad1d205616cfc137004b898c68 (patch)
treedaca90a773948c379b3ab185e9dfc9e56aed3633
parent260c5edacba10dcbd510d7f84da30f17400d6c01 (diff)
downloadgitlab-ce-34a0300ba3727cad1d205616cfc137004b898c68.tar.gz
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
-rw-r--r--app/assets/stylesheets/pages/notes.scss12
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 0c084118753..35d728aec83 100644
--- 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;
}