diff --git a/LesionTracker/client/body.styl b/LesionTracker/client/body.styl index 74a876044..6d1022c16 100644 --- a/LesionTracker/client/body.styl +++ b/LesionTracker/client/body.styl @@ -1,6 +1,10 @@ body background-color: #202020 +.tab-content { + height: calc(100% - 40px); +} + table#tblStudyList thead > tr { background-color: #424242; color: white; diff --git a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html index 08ff6cf46..2fbf5c42d 100644 --- a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html +++ b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html @@ -1,16 +1,9 @@ \ No newline at end of file diff --git a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl index 2629a51f8..d50323ea2 100644 --- a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl +++ b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl @@ -1,18 +1,23 @@ -.navbar - margin-bottom: 0 - border-radius: 0px +.logoContainer + position: absolute; + height: 40px; + top: 0; + right: 0; + color: white; -.navbar-form - margin: 0 - padding: 15px 3px +.navbar-brand + display: inline-block + padding: 0; + margin-right: 5px; -.navbar-default - -webkit-transition: background-color 200ms linear - -moz-transition: background-color 200ms linear - -o-transition: background-color 200ms linear - -ms-transition: background-color 200ms linear - transition: background-color 200ms linear - -@media (min-width: 768px) - .navbar - border-radius: 0px \ No newline at end of file + img + height: 30px + float: left + margin-right: 10px + margin-top: 5px; + + h4.name + float: left + margin: 10px 0; + font-family: "Sanchez" + color: #C1C1C1 diff --git a/LesionTracker/client/routes.js b/LesionTracker/client/routes.js index 422eeb95c..09a53ef6d 100644 --- a/LesionTracker/client/routes.js +++ b/LesionTracker/client/routes.js @@ -12,8 +12,8 @@ Object.keys(ViewerData).forEach(function(contentId) { }); Router.configure({ - layoutTemplate: 'layout', - loadingTemplate: 'layout', + layoutTemplate: 'layoutLesionTracker', + loadingTemplate: 'layoutLesionTracker', notFoundTemplate: 'notFound' }); @@ -25,7 +25,7 @@ Router.route('/', function () { Router.route('/viewer/:_id', { - layoutTemplate: 'layout', + layoutTemplate: 'layoutLesionTracker', name: 'viewer', onBeforeAction: function() { log.info('Router GetStudyMetadata'); diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.js b/Packages/lesiontracker/components/lesionTable/lesionTable.js index b6001b70c..1d8e19fd6 100644 --- a/Packages/lesiontracker/components/lesionTable/lesionTable.js +++ b/Packages/lesiontracker/components/lesionTable/lesionTable.js @@ -61,7 +61,7 @@ Template.lesionTable.onRendered(function() { }); // Activate selected lesions when lesion table row is clicked -function activateLesions (e) { +function updateLesions (e) { // lesionNumber of measurement = id of row var lesionNumber = parseInt($(e.currentTarget).attr("id")); @@ -97,7 +97,7 @@ function activateLesions (e) { Template.lesionTable.events({ 'click table#tblLesion tbody tr': function(e) { - activateLesions(e); + updateLesions(e); } }); diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.styl b/Packages/lesiontracker/components/lesionTable/lesionTable.styl index cf74b0144..e00caedd8 100644 --- a/Packages/lesiontracker/components/lesionTable/lesionTable.styl +++ b/Packages/lesiontracker/components/lesionTable/lesionTable.styl @@ -1,83 +1,44 @@ -#lesionTableContainer +#lesionTableContainer { width: 100% height: 25% - overflow: auto - -table.lesionTable - thead - th - background-color: #424242 - font-style: italic - color:white - text-align: center - height: 15px - width: 20px + overflow: auto; +} table.lesionTable > thead > tr > th { - padding: 4px; + font-style: italic; + color:white; + height: 20px; + line-height: 20px; + text-align: center margin: 0; - height: 25px; - line-height: 15px; + padding: 5px; + background-color: #424242; } - table.lesionTable > tbody > tr > td { - padding: 4px; + height: 15px; + line-height: 15px; margin: 0; - height: 25px; - line-height: 10px; -} - -table.lesionTable tbody tr{ - background-color: #b3b3b3; - color: #424242; - line-height: 14px; + padding: 5px; } table.lesionTable tbody tr.lesionTableRow:nth-child(even) {background: #CCC} table.lesionTable tbody tr.lesionTableRow:nth-child(odd) {background: #DDD} +table.lesionTable tbody tr.lesionTableRow:hover{ background-color: #009BD2; color: white; } -table.lesionTable tbody tr.lesionTableRow:hover{ - background-color: #009BD2 - color: white +#thTarget { + width: 1%; } - -th#thNumber { - width: 4%; -} - -th#thTarget { - width: 4%; -} - -th#thLocation { +#thLocation { + text-align: left; width: 15%; - text-align: left; } -th#thSpacer { - width: 50%; + +#thSpacer { + width: 61%; } -td.location { - text-align: left; -} - -td.lesionNumber { +td.lesionNumber, .target,.lesionTableTimepointCell { text-align: center; -} - -td.target { - text-align: center; -} - -td.lesionTableTimepointCell { - width: 4%; - text-align: center; -} - -.btnRemove{ - border: none; - outline:none; - background-color: transparent; -} +} \ No newline at end of file