summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/markdown_area.scss
diff options
context:
space:
mode:
authorNur Rony <pro.nmrony@gmail.com>2016-10-13 23:40:06 +0600
committerNur Rony <pro.nmrony@gmail.com>2016-11-16 00:03:24 +0600
commiteaef94533d8de1747631269f085ba58d6316a899 (patch)
tree8985ebbc1ff0c7c15b6f241ff356c95ed41278fd /app/assets/stylesheets/framework/markdown_area.scss
parent4a4c57f7b8b1fdf5957ad1f2d78d96231eec8ff8 (diff)
downloadgitlab-ce-eaef94533d8de1747631269f085ba58d6316a899.tar.gz
shows user avatar in mention autocomplete in editor22790-mention-autocomplete-avatar
adds entry in CHANGELOG no uninitialized variable and unnecessary if statement formatting issue in CHANGELOG resolves scss lint warings cleanup: unnecessary css classes adds css class that cleaned up by mistake replaces snake_case variables name with camelCase removes unnecessary css class and adds white color border for avatar moves changelog entry from 8.13 to 8.14 remove bottom margin from avatar-inline resolves lint warnings rebased and moves changelog entry to 8.14 fixes avatar shifting on hover adds entry at top of 8.14 section in CHANGELOG.md calls sanitization for gl.utils syncing changelog with master and created changelog files using cli changes changelog title
Diffstat (limited to 'app/assets/stylesheets/framework/markdown_area.scss')
-rw-r--r--app/assets/stylesheets/framework/markdown_area.scss20
1 files changed, 16 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index 6d28d98b283..8a93eac1b6d 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -148,7 +148,19 @@
}
}
-.atwho-view small.description {
- float: right;
- padding: 3px 5px;
-}
+.atwho-view {
+ small.description {
+ float: right;
+ padding: 3px 5px;
+ }
+
+ .avatar-inline {
+ margin-bottom: 0;
+ }
+
+ .cur {
+ .avatar {
+ border: 1px solid $white-light;
+ }
+ }
+} \ No newline at end of file