diff --git a/src/cljs/ulysses/components/basic.cljs b/src/cljs/ulysses/components/basic.cljs index 0ee2074..31b3364 100644 --- a/src/cljs/ulysses/components/basic.cljs +++ b/src/cljs/ulysses/components/basic.cljs @@ -32,7 +32,7 @@ (defn label "bootstrap label" [contextual & rest] - (let [classes ["label" (str "label-" (name contextual))] + (let [classes ["label" (str "label-" (name contextual)) "has-tooltip"] cname (string/join "." (into ["span"] classes))] (into [(keyword cname)] rest))) @@ -53,6 +53,12 @@ [:option {:value v} (or n v)]) options)]) +(defn tooltip + [text] + [:div.tooltip.tooltip-top {:role "tooltip"} + [:div.tooltip-arrow] + [:div.tooltip-inner text]]) + ;; ---------------------------------------------------------------------------- ;; css transition group ;; ---------------------------------------------------------------------------- diff --git a/src/cljs/ulysses/components/misc.cljs b/src/cljs/ulysses/components/misc.cljs index b3704ec..525f60b 100644 --- a/src/cljs/ulysses/components/misc.cljs +++ b/src/cljs/ulysses/components/misc.cljs @@ -1,6 +1,6 @@ (ns ulysses.components.misc (:require [ulysses.utils :refer [mechanism-to-contextual]] - [ulysses.components.basic :refer [label]] + [ulysses.components.basic :refer [label tooltip]] [ulysses.lib.moment :as m])) ;; ---------------------------------------------------------------------------- @@ -11,7 +11,8 @@ (when (m/is-valid mi) [label :default "ends " - (-> mi (m/from-now false))])) + (-> mi (m/from-now false)) + [tooltip (-> mi (m/format "L"))]])) (defn grant-op-fm-label [{:keys [name]}] [label (-> name keyword mechanism-to-contextual) name]) diff --git a/src/cljs/ulysses/lib/moment.cljs b/src/cljs/ulysses/lib/moment.cljs index 6a05810..aeacf13 100644 --- a/src/cljs/ulysses/lib/moment.cljs +++ b/src/cljs/ulysses/lib/moment.cljs @@ -12,3 +12,4 @@ (forward-jsobj-fn to-iso-string toISOString) (forward-jsobj-fn add add) (forward-jsobj-fn is-valid isValid) +(forward-jsobj-fn format format) diff --git a/src/sass/_common.scss b/src/sass/_common.scss index 0df9fe0..40c6940 100644 --- a/src/sass/_common.scss +++ b/src/sass/_common.scss @@ -130,3 +130,20 @@ a.fancy-switch { } } } + +.has-tooltip { + position: relative; + + .tooltip { + display: none; + opacity: 0; + top: -38px; + } + + &:hover { + .tooltip { + display: block; + opacity: 1; + } + } +}