From 2cde0fea76b06ddd0f5b8541c11bb03031690953 Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Wed, 29 Mar 2017 17:14:57 -0300
Subject: [PATCH] Fixing minor issues on OHIF Viewer

---
 .../components/toolbarSection/toolbarSection.js  |  4 ++--
 .../toolbarSection/toolbarSection.styl           |  2 +-
 OHIFViewer/client/config.js                      | 16 ++++++++--------
 .../roundedButtonGroup/roundedButtonGroup.styl   |  5 ++++-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/OHIFViewer/client/components/toolbarSection/toolbarSection.js b/OHIFViewer/client/components/toolbarSection/toolbarSection.js
index ba4acb87e..f807f53db 100644
--- a/OHIFViewer/client/components/toolbarSection/toolbarSection.js
+++ b/OHIFViewer/client/components/toolbarSection/toolbarSection.js
@@ -233,7 +233,7 @@ Template.toolbarSection.onRendered(function() {
     instance.$('#layout').dropdown();
 
     if (OHIF.uiSettings.displayEchoUltrasoundWorkflow) {
-        toggleCineDialog();
+        OHIF.viewerbase.viewportUtils.toggleCineDialog();
     }
 
     // Set disabled/enabled tool buttons that are set in toolManager
@@ -241,7 +241,7 @@ Template.toolbarSection.onRendered(function() {
     const disabledToolButtons = states.disabledToolButtons;
     const allToolbarButtons = $('#toolbar').find('button');
     if (disabledToolButtons && disabledToolButtons.length > 0) {
-        for (var i = 0; i < allToolbarButtons.length; i++) {
+        for (let i = 0; i < allToolbarButtons.length; i++) {
             const toolbarButton = allToolbarButtons[i];
             $(toolbarButton).prop('disabled', false);
 
diff --git a/OHIFViewer/client/components/toolbarSection/toolbarSection.styl b/OHIFViewer/client/components/toolbarSection/toolbarSection.styl
index 36672029c..46043423b 100644
--- a/OHIFViewer/client/components/toolbarSection/toolbarSection.styl
+++ b/OHIFViewer/client/components/toolbarSection/toolbarSection.styl
@@ -1,4 +1,4 @@
-@import "{ohif:design}/app"
+@require '{ohif:design}/app'
 
 .toolbarSection
   theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness)
diff --git a/OHIFViewer/client/config.js b/OHIFViewer/client/config.js
index dba72a935..0b1d9e0b5 100644
--- a/OHIFViewer/client/config.js
+++ b/OHIFViewer/client/config.js
@@ -3,15 +3,15 @@ import { OHIF } from 'meteor/ohif:core';
 import { cornerstoneWADOImageLoader } from 'meteor/ohif:cornerstone';
 
 Meteor.startup(function() {
-	const maxWebWorkers = Math.max(navigator.hardwareConcurrency - 1, 1);
+    const maxWebWorkers = Math.max(navigator.hardwareConcurrency - 1, 1);
     const config = {
-	    maxWebWorkers: maxWebWorkers,	
-    	startWebWorkersOnDemand: true,
-        webWorkerPath : OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js'),
+        maxWebWorkers: maxWebWorkers,
+        startWebWorkersOnDemand: true,
+        webWorkerPath: OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js'),
         taskConfiguration: {
-            'decodeTask' : {
-		        loadCodecsOnStartup : true,
-		        initializeCodecsOnStartup: false,
+            decodeTask: {
+                loadCodecsOnStartup: true,
+                initializeCodecsOnStartup: false,
                 codecsPath: OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js'),
                 usePDFJS: false
             }
@@ -19,4 +19,4 @@ Meteor.startup(function() {
     };
 
     cornerstoneWADOImageLoader.webWorkerManager.initialize(config);
-});
\ No newline at end of file
+});
diff --git a/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.styl b/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.styl
index 794103318..2542be309 100644
--- a/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.styl
+++ b/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.styl
@@ -8,7 +8,7 @@ $height = 25px
     cursor: pointer
     display: inline-block
     float: left
-    margin-left: -1px
+    margin-left: -2px
     text-decoration: none
     text-align: center
 
@@ -28,8 +28,10 @@ $height = 25px
       height: $height
       line-height: $height
       padding: 0 22px
+      position: relative
       text-transform: uppercase
       transition: transition($sidebarTransition)
+      z-index: 1
 
       svg
         theme('fill', '$defaultColor')
@@ -68,6 +70,7 @@ $height = 25px
       theme('background-color', '$activeColor')
       theme('border-color', '$uiBorderColorActive')
       theme('color', '$uiGrayDark')
+      z-index: 2
 
     &:hover .roundedButton
     &.active .roundedButton