From e12907c9b95a526255034a19631c45dd5e3f0f50 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Thu, 5 Jan 2017 10:52:28 +0100 Subject: [PATCH] Remove original atwho css, apply our own --- app/assets/stylesheets/application.scss | 1 - app/assets/stylesheets/themes/scinote.scss | 69 ++++++++++++++++++++-- 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 166f9fd95..423693c49 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -2,7 +2,6 @@ *= require_self *= require_tree . *= require jquery-ui/draggable - *= require jquery.atwho *= require rails_bootstrap_forms *= require bootstrap-select *= require constants diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index e1e0df8b1..34ffed6e9 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -1706,13 +1706,70 @@ th.custom-field .modal-tooltiptext { } // AtWho (smart annotations) + +// +.atwho-view { + position: absolute; + top: 0; + left: 0; + display: none; + margin-top: 18px; + background: $color-white; + color: $color-black; + border: 1px solid #DDD; + border-radius: 3px; + box-shadow: 0 0 5px rgba(0,0,0,0.1); + min-width: 120px; + max-height: 200px; + overflow: auto; + z-index: 11110 !important; + + small { + font-size: smaller; + color: $color-emperor; + font-weight: normal; + } + + strong { + color: $color-theme-primary; + } + + .cur { + background: $color-theme-primary; + color: $color-white; + + small { + color: $color-white; + } + + strong { + color: $color-white; + font: bold; + } + } + + ul { + list-style: none; + padding: 0; + margin: auto; + + li { + display: block; + padding: 5px 10px; + border-bottom: 1px solid #DDD; + cursor: pointer; + } + } +} +// + .atwho-li-user { - .fa.fa-circle { - font-size: 4px; - } - - &.highlighted { - background-color: #ff0000; + .avatar { + border-radius: 50%; + margin-left: 5px; + margin-right: 10px; + height: 20px; + width: 20px; } } \ No newline at end of file