Merge branch 'master' of github.com:OHIF/Viewers

LesionTracker/client/components/viewer.styl

@@ -18,3 +18,12 @@
     &:hover, &:hover.active
       border: 2px solid white
 
+#btnCollapse
+  background-color: #333
+  border-color: black
+
+  &.active
+    border-color: #333
+
+.btnCollapseIcon
+  color: white

LesionTracker/client/components/viewerMain/viewerMain.js

@@ -4,6 +4,13 @@ Template.viewerMain.helpers({
 
         var buttonData = [];
 
+        buttonData.push({
+            id: 'resetViewport',
+            title: 'Reset Viewport',
+            classes: 'imageViewerCommand',
+            iconClasses: 'fa fa-undo'
+        });
+
         buttonData.push({
             id: 'wwwc',
             title: 'WW/WC',
@@ -46,13 +53,6 @@ Template.viewerMain.helpers({
             iconClasses: 'fa fa-arrows-alt'
         });
 
-        buttonData.push({
-            id: 'resetViewport',
-            title: 'Reset Viewport',
-            classes: 'imageViewerCommand',
-            iconClasses: 'fa fa-undo'
-        });
-
         toolbarOptions.buttonData = buttonData;
         toolbarOptions.includePlayClipButton = false;
         toolbarOptions.includeLayoutButton = false;