From 48b606881b26d89043bda50cc4c19d958540107c Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Mon, 16 Jan 2017 19:33:02 +0100
Subject: [PATCH] Change 'design' to 'ohif:design' in a few more Styl files.
 Fix duplicated declaration

---
 OHIFViewer/client/components/flexboxLayout/flexboxLayout.styl   | 2 +-
 OHIFViewer/client/components/ohifViewer/ohifViewer.styl         | 2 +-
 OHIFViewer/client/components/toolbarSection/toolbarSection.styl | 2 +-
 .../themeSelector/themeSelectorModal/themeSelectorModal.styl    | 2 +-
 .../viewer/imageViewerViewport/imageViewerViewport.js           | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/OHIFViewer/client/components/flexboxLayout/flexboxLayout.styl b/OHIFViewer/client/components/flexboxLayout/flexboxLayout.styl
index 03b0961a6..e313e764b 100644
--- a/OHIFViewer/client/components/flexboxLayout/flexboxLayout.styl
+++ b/OHIFViewer/client/components/flexboxLayout/flexboxLayout.styl
@@ -1,4 +1,4 @@
-@import "{design}/app"
+@import "{ohif:design}/app"
 
 $lesionsSidebarMenuWidth = 450px
 
diff --git a/OHIFViewer/client/components/ohifViewer/ohifViewer.styl b/OHIFViewer/client/components/ohifViewer/ohifViewer.styl
index 7f13ff777..0fd51d190 100644
--- a/OHIFViewer/client/components/ohifViewer/ohifViewer.styl
+++ b/OHIFViewer/client/components/ohifViewer/ohifViewer.styl
@@ -1,4 +1,4 @@
-@import "{design}/app"
+@import "{ohif:design}/app"
 
 $expandedHeight = 160px
 
diff --git a/OHIFViewer/client/components/toolbarSection/toolbarSection.styl b/OHIFViewer/client/components/toolbarSection/toolbarSection.styl
index 0298ee5bc..36672029c 100644
--- a/OHIFViewer/client/components/toolbarSection/toolbarSection.styl
+++ b/OHIFViewer/client/components/toolbarSection/toolbarSection.styl
@@ -1,4 +1,4 @@
-@import "{design}/app"
+@import "{ohif:design}/app"
 
 .toolbarSection
   theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness)
diff --git a/Packages/ohif-study-list/client/components/themeSelector/themeSelectorModal/themeSelectorModal.styl b/Packages/ohif-study-list/client/components/themeSelector/themeSelectorModal/themeSelectorModal.styl
index a37c3f4f1..ce53de456 100644
--- a/Packages/ohif-study-list/client/components/themeSelector/themeSelectorModal/themeSelectorModal.styl
+++ b/Packages/ohif-study-list/client/components/themeSelector/themeSelectorModal/themeSelectorModal.styl
@@ -1,4 +1,4 @@
-@import "{design}/app.styl"
+@import "{ohif:design}/app.styl"
 
 #themeSelectorModal
   .theme-list
diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index f2946679d..5b41ab426 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -593,7 +593,6 @@ Template.imageViewerViewport.onRendered(function() {
     const study = ViewerStudies.findOne({
         studyInstanceUid: this.data.studyInstanceUid
     });
-    var displaySetInstanceUid = this.data.displaySetInstanceUid;
 
     data.study = study;
     setDisplaySet(data, displaySetInstanceUid, templateData);