summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-08-01 20:09:50 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-08-01 20:09:50 +0000
commita623446a09e047b73a4fc871bf5de4bb75e100ea (patch)
tree5f8415a0ab33d59b90f604fbc08c74106dde28ed
parent0edf2b0d421144686ee399f44c26a2c4e1b2df05 (diff)
parent5fc985776b10ff3f601a569428d916a7a5a99793 (diff)
downloadgitlab-ce-a623446a09e047b73a4fc871bf5de4bb75e100ea.tar.gz
Merge branch 'winh-markdown-autocomplete-dropdown-style' into 'master'
Make Markdown autocomplete dropdowns style consistent See merge request !13127
-rw-r--r--app/assets/stylesheets/framework/markdown_area.scss25
1 files changed, 25 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index a2de4598167..fcd4c72b430 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -185,3 +185,28 @@
text-overflow: ellipsis;
}
}
+
+// TODO: fallback to global style
+.atwho-view {
+ .atwho-view-ul {
+ padding: 8px 1px;
+
+ li {
+ padding: 8px 16px;
+ border: 0;
+
+ &.cur {
+ background-color: $gray-darker;
+ color: $gl-text-color;
+
+ small {
+ color: inherit;
+ }
+ }
+
+ strong {
+ color: $gl-text-color;
+ }
+ }
+ }
+}