From d486ebd5515c79cb80f7cd32a9a714502078708e Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Thu, 1 Mar 2018 11:35:19 -0300
Subject: [PATCH] Minor fixes on common components

---
 .../client/components/bootstrap/dialog/form.html          | 2 +-
 .../client/components/bootstrap/dropdown/form.html        | 8 +++++---
 .../client/components/bootstrap/dropdown/form.js          | 8 ++++++++
 Packages/ohif-design/styles/imports/mixins.styl           | 3 +++
 .../client/components/measureFlow/measureFlow.styl        | 2 +-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/form.html b/Packages/ohif-core/client/components/bootstrap/dialog/form.html
index 06d6715de..5ece500d6 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/form.html
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/form.html
@@ -15,7 +15,7 @@
                             {{#if isError}}
                                 {{>pageError (extend this error=this.details)}}
                             {{else}}
-                                {{#let message=(choose this.bodyText this.reason this.message 'An error has ocurred.')}}
+                                {{#let message=(choose this.bodyText this.reason this.message (valueIf UI.contentBlock '' 'An error has ocurred.' ))}}
                                     <div class="message">{{message}}</div>
                                 {{/let}}
                             {{/if}}
diff --git a/Packages/ohif-core/client/components/bootstrap/dropdown/form.html b/Packages/ohif-core/client/components/bootstrap/dropdown/form.html
index 1744f7e6d..99a6bb545 100644
--- a/Packages/ohif-core/client/components/bootstrap/dropdown/form.html
+++ b/Packages/ohif-core/client/components/bootstrap/dropdown/form.html
@@ -24,9 +24,11 @@
                                     <use xlink:href={{absoluteUrl item.iconSvgUse}}></use>
                                 </svg>
                             {{/if}}
-                            {{#if item.text}}
-                                <span>{{item.text}}</span>
-                            {{/if}}
+                            {{#let text=(getText item)}}
+                                {{#if text}}
+                                    <span>{{text}}</span>
+                                {{/if}}
+                            {{/let}}
                         {{/link}}
                     </li>
                     {{#if item.separatorAfter}}
diff --git a/Packages/ohif-core/client/components/bootstrap/dropdown/form.js b/Packages/ohif-core/client/components/bootstrap/dropdown/form.js
index 5c0f6dd48..382295aa3 100644
--- a/Packages/ohif-core/client/components/bootstrap/dropdown/form.js
+++ b/Packages/ohif-core/client/components/bootstrap/dropdown/form.js
@@ -10,5 +10,13 @@ Template.dropdownFormMenu.helpers({
         }
 
         return isVisible;
+    },
+
+    getText(item) {
+        if (typeof item.text === 'function') {
+            return item.text(item.params || {});
+        }
+
+        return item.text || '';
     }
 });
diff --git a/Packages/ohif-design/styles/imports/mixins.styl b/Packages/ohif-design/styles/imports/mixins.styl
index 6827bb6ae..c85aa29ea 100644
--- a/Packages/ohif-design/styles/imports/mixins.styl
+++ b/Packages/ohif-design/styles/imports/mixins.styl
@@ -31,6 +31,9 @@ border-bottom-right-radius(r)
 box-shadow(s)
   vendorize(box-shadow, s)
 
+text-shadow(s)
+  vendorize(text-shadow, s)
+
 transform(t)
   vendorize(transform, t)
 
diff --git a/Packages/ohif-measurements/client/components/measureFlow/measureFlow.styl b/Packages/ohif-measurements/client/components/measureFlow/measureFlow.styl
index 4ecbbbd75..c4920fe5c 100644
--- a/Packages/ohif-measurements/client/components/measureFlow/measureFlow.styl
+++ b/Packages/ohif-measurements/client/components/measureFlow/measureFlow.styl
@@ -100,7 +100,7 @@
         line-height: 20px
         outline: none
         overflow: hidden
-        padding: 0 12px
+        padding: 0 12px 5px
         resize: none
         transition(height 0.3s ease)
         width: 100%