diff --git a/LesionTracker/client/components/layout/layout.html b/LesionTracker/client/components/layout/layout.html
index 2b5e238ff..4bddb7db1 100644
--- a/LesionTracker/client/components/layout/layout.html
+++ b/LesionTracker/client/components/layout/layout.html
@@ -8,12 +8,15 @@
- Lesion Tracker
+
+
+ OHIF Lesion Tracker
+
diff --git a/LesionTracker/client/components/layout/layout.styl b/LesionTracker/client/components/layout/layout.styl
index fad80a700..dbe02362d 100644
--- a/LesionTracker/client/components/layout/layout.styl
+++ b/LesionTracker/client/components/layout/layout.styl
@@ -4,11 +4,30 @@
color: #888888
background-color: #060606
border: none
+ font-family: "Sanchez"
+ color: #C1C1C1
+
+.navbar-form, .navbar-default .navbar-nav > li > a
+ color: #C1C1C1
+ font-weight: bold
+ font-size: 12pt
.navbar-form
margin: 0
padding: 15px 3px
+.navbar-brand
+ img
+ float: left
+ margin-right: 10px
+ margin-top: -8px
+
+ h4.name
+ float: left
+ margin: 0
+ font-family: "Sanchez"
+ color: #C1C1C1
+
@media (min-width: 768px)
.navbar
border-radius: 0px
\ No newline at end of file
diff --git a/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl b/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl
index 5cf65bb5d..5985f2192 100644
--- a/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl
+++ b/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl
@@ -1,7 +1,7 @@
.lesionTableContainer
- background-color: pink
height: 25%
max-height: 200px
- background-color: white
- border: 8px solid pink
+ color: #A0A0A0
+ background-color: #2F2F2F
+ border: 8px solid #484848
\ No newline at end of file
diff --git a/LesionTracker/client/head.html b/LesionTracker/client/head.html
index ed329b9b0..a9819d223 100644
--- a/LesionTracker/client/head.html
+++ b/LesionTracker/client/head.html
@@ -9,4 +9,5 @@
+
\ No newline at end of file
diff --git a/LesionTracker/client/images/logo.png b/LesionTracker/public/images/logo.png
similarity index 100%
rename from LesionTracker/client/images/logo.png
rename to LesionTracker/public/images/logo.png
diff --git a/OHIFViewer/client/head.html b/OHIFViewer/client/head.html
index b6c23bd67..979732482 100644
--- a/OHIFViewer/client/head.html
+++ b/OHIFViewer/client/head.html
@@ -8,4 +8,5 @@
+
\ No newline at end of file
diff --git a/OHIFViewer/images/logo.png b/OHIFViewer/images/logo.png
deleted file mode 100644
index da8c2746f..000000000
Binary files a/OHIFViewer/images/logo.png and /dev/null differ
diff --git a/OHIFViewer/public/images/logo.png b/OHIFViewer/public/images/logo.png
new file mode 100644
index 000000000..fc83b1354
Binary files /dev/null and b/OHIFViewer/public/images/logo.png differ
diff --git a/Packages/viewerbase/components/basic/layout/layout.html b/Packages/viewerbase/components/basic/layout/layout.html
index 228930a27..e7eb311eb 100644
--- a/Packages/viewerbase/components/basic/layout/layout.html
+++ b/Packages/viewerbase/components/basic/layout/layout.html
@@ -8,7 +8,10 @@
- OHIF Viewer
+
+
+ Open Health Imaging Foundation
+
diff --git a/Packages/viewerbase/components/basic/layout/layout.styl b/Packages/viewerbase/components/basic/layout/layout.styl
index fad80a700..8134afcb3 100644
--- a/Packages/viewerbase/components/basic/layout/layout.styl
+++ b/Packages/viewerbase/components/basic/layout/layout.styl
@@ -4,10 +4,35 @@
color: #888888
background-color: #060606
border: none
+ font-family: "Sanchez"
+ color: #C1C1C1
+
+.navbar-default .navbar-nav > li > a
+ color: #C1C1C1
+ font-weight: bold
+ font-size: 12pt
.navbar-form
+ height: 50px
margin: 0
padding: 15px 3px
+ font-weight: bold
+ font-size: 12pt
+ line-height: 20px
+
+.navbar-brand
+ display: inline-block
+
+ img
+ float: left
+ margin-right: 10px
+ margin-top: -5px
+
+ h4.name
+ float: left
+ margin: 0
+ font-family: "Sanchez"
+ color: #C1C1C1
@media (min-width: 768px)
.navbar
diff --git a/Packages/viewerbase/components/studyBrowser/studyBrowser/studyBrowser.styl b/Packages/viewerbase/components/studyBrowser/studyBrowser/studyBrowser.styl
index 1ed31828d..1135a00fa 100644
--- a/Packages/viewerbase/components/studyBrowser/studyBrowser/studyBrowser.styl
+++ b/Packages/viewerbase/components/studyBrowser/studyBrowser/studyBrowser.styl
@@ -3,6 +3,7 @@
height: 100%
width: 100%
min-width: 120px
- overflow: auto
+ overflow-y: auto
+ overflow-x: hidden
background-color: black
padding-bottom: 20px
\ No newline at end of file
diff --git a/Packages/viewerbase/components/studyBrowser/thumbnailEntry/thumbnailEntry.styl b/Packages/viewerbase/components/studyBrowser/thumbnailEntry/thumbnailEntry.styl
index c001f0937..e5d4d5fad 100644
--- a/Packages/viewerbase/components/studyBrowser/thumbnailEntry/thumbnailEntry.styl
+++ b/Packages/viewerbase/components/studyBrowser/thumbnailEntry/thumbnailEntry.styl
@@ -4,6 +4,9 @@
background-color: black
border: 1px solid #424242
margin: 0 auto
+ cursor: copy
+ cursor: -webkit-grab
+ cursor: -moz-grab
.seriesDescription
text-align: center
diff --git a/Packages/worklist/components/tabTitle/tabTitle.html b/Packages/worklist/components/tabTitle/tabTitle.html
index 2b6ee2009..ac0026ac9 100644
--- a/Packages/worklist/components/tabTitle/tabTitle.html
+++ b/Packages/worklist/components/tabTitle/tabTitle.html
@@ -2,7 +2,7 @@
-
{{title}}
+
- x
\ No newline at end of file
diff --git a/Packages/worklist/components/tabTitle/tabTitle.js b/Packages/worklist/components/tabTitle/tabTitle.js
index aec5179d1..c788b176d 100644
--- a/Packages/worklist/components/tabTitle/tabTitle.js
+++ b/Packages/worklist/components/tabTitle/tabTitle.js
@@ -1,21 +1,17 @@
Template.tabTitle.events({
'click .close': function(e) {
- var tab = $(e.currentTarget).siblings('a[data-toggle="tab"]').eq(0);
+ var tab = $(e.currentTarget).parents('a[data-toggle="tab"]').eq(0);
var contentId = tab.data("target").replace("#", "");
- var tabObjectId = tabs.find({contentid: contentId}).fetch()[0]._id;
- tabs.remove(tabObjectId);
var tabIndex = tab.parent('li').index();
var newActiveTabIndex = Math.max(tabIndex - 1, 0);
var newActiveTab = $(".tabTitle").eq(newActiveTabIndex);
var newActiveTabLink = newActiveTab.find("a[data-toggle=tab]");
var newContentId = newActiveTabLink.data("target");
- switchToTab(newContentId);
- }
-});
-Template.tabTitle.helpers({
- 'active': function() {
- return this.active ? "active" : "";
+ switchToTab(newContentId);
+
+ var tabObjectId = tabs.find({contentid: contentId}).fetch()[0]._id;
+ tabs.remove(tabObjectId);
}
});
\ No newline at end of file
diff --git a/Packages/worklist/components/worklist.html b/Packages/worklist/components/worklist.html
index 04638ecb8..c8805a60c 100644
--- a/Packages/worklist/components/worklist.html
+++ b/Packages/worklist/components/worklist.html
@@ -1,5 +1,5 @@
-
+
-
Study List
diff --git a/Packages/worklist/components/worklist.styl b/Packages/worklist/components/worklist.styl
index ba18f046b..b25daa73b 100644
--- a/Packages/worklist/components/worklist.styl
+++ b/Packages/worklist/components/worklist.styl
@@ -10,38 +10,60 @@ body
#tabs
width: 100%
-
-.nav-tabs
+
+#tablist
border-bottom: 1px solid #424242;
background-color: #202020
-
-.tabTitle
- background-color: #202020
- border-color: #424242
- padding: 3px 10px
+ height: 41px
- &:hover
- color: black
-
- &.active
+ a:hover
+ background-color: transparent
+
+ .tabTitle
background-color: #202020
- color: white
-
- a
- color: #424242
- padding: 0 5px
- cursor: pointer
+ border-color: #424242
float: left
+ line-height:30px
- &.close
- font-size: 16pt
- padding: 0 5px
- font-weight: normal
- float: left
+ &:hover
+ color: black
+ background-color: white
+
+ button.close
+ color: black
+
+ &.active
+ background-color: #424242
+ border-color: #424242
+
+ &:hover
+ background-color: #424242
+
+ a
+ color: white
+
+ button.close
+ color: white
+
+ a
+ padding: 5px 15px
+ cursor: pointer
+ color: #424242
+ text-decoration: none
+
+ button.close
+ margin: 4px 0 4px 8px
+ text-shadow: none
+ color: white
+ text-decoration: none
+
+ &:hover
+ color: red
+
.tab-content
width: 100%
- height: calc(100% - 100px)
+ height: calc(100% - 91px)
.tab-pane
width: 100%
diff --git a/Packages/worklist/components/worklistResult/worklistResult.styl b/Packages/worklist/components/worklistResult/worklistResult.styl
index 9619554bd..63e307146 100644
--- a/Packages/worklist/components/worklistResult/worklistResult.styl
+++ b/Packages/worklist/components/worklistResult/worklistResult.styl
@@ -1,15 +1,22 @@
table#tblStudyList
color: #888888
- border-collapse: collapse;
- border-color: gray;
+ border-collapse: collapse
+ border-color: gray
+
+ thead
+ background-color: black
+
+ &:hover
+ color: #888888
- tr
+ tbody > tr
padding: 4px
- border: 1px solid #282828
+ border: 1px solid #282828
+ background-color: black
&:nth-of-type(odd)
background-color: #202020
-
+
&:hover
background-color: #009BD2
color: white
diff --git a/Packages/worklist/components/worklistSearch/worklistSearch.html b/Packages/worklist/components/worklistSearch/worklistSearch.html
index 9d5944b34..6fac78fe0 100644
--- a/Packages/worklist/components/worklistSearch/worklistSearch.html
+++ b/Packages/worklist/components/worklistSearch/worklistSearch.html
@@ -1,83 +1,89 @@