diff --git a/LesionTracker/client/mobileStyles.css b/LesionTracker/client/mobileStyles.css index a6a6fafe6..08117e848 100644 --- a/LesionTracker/client/mobileStyles.css +++ b/LesionTracker/client/mobileStyles.css @@ -1,7 +1,24 @@ /* Mobile devices */ -@media only screen and (min-device-width : 375px) and (max-device-width : 768px) and (orientation : portrait) { +@media only screen and (min-device-width : 375px) and (max-device-width : 768px){ + + .logoContainer { + width: 15%; + } + + .navbar-brand img { + height: 20px; + margin-top: 10px; + margin-bottom: 10px; + margin-right: 5px; + } + + .navbar-brand h4.name { + padding: 1px; + font-size: 0.3em; + width: 50%;; + } table#tblStudyList { table-layout: fixed; @@ -9,19 +26,26 @@ } #tablist { - width: 84%; + width: 85%; overflow-x: auto; - } + #toolbar .btn-group button { width: 40px; height: 40px; } + + .studyDateList { + margin-top: 5px; + } } + @media (max-device-width: 667px) { + #toolbar .btn-group button { width: 35px; height: 35px; } -} \ No newline at end of file +} + diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.styl b/Packages/lesiontracker/components/lesionTable/lesionTable.styl index 09f3bfc19..9b5a022cd 100644 --- a/Packages/lesiontracker/components/lesionTable/lesionTable.styl +++ b/Packages/lesiontracker/components/lesionTable/lesionTable.styl @@ -1,71 +1,71 @@ #lesionTableContainer - width: 100% - height: 16% - position: absolute - - .lesionTable + width: 100% + height: 16% + position: relative - td, th - border: 1px solid white - border-collapse: collapse - width: 100px + .lesionTable - td.lesionNumber, th#thNumber - width: 70px - - td.location, th#thLocation - width: 250px - - td.target, th#thTarget - width: 70px + td, th + border: 1px solid white + border-collapse: collapse + width: 100px + + td.lesionNumber, th#thNumber + width: 70px + + td.location, th#thLocation + width: 250px + + td.target, th#thTarget + width: 70px - thead + thead + width: 100% + height: 25px + display: block + + tr width: 100% - height: 25px - display: block - - tr - width: 100% - th - border-bottom-width: 0 - font-weight: normal - color:white - line-height: 15px + th + border-bottom-width: 0 + font-weight: normal + color:white + line-height: 15px + text-align: center + margin: 0 + padding: 5px + background-color: #424242 + + + tbody + display: block + position: absolute + top: 25px + left: 0 + right: 0 + bottom: 0 + overflow: auto + width: 100% + + tr.lesionTableRow + width: 100% + + &:nth-child(even) + background: #888 + &:nth-child(odd) + background: #BBB + &:hover + cursor: pointer + background-color: #009BD2 + color: white + + td + border-bottom-width: 0 + margin: 0 + padding: 5px + line-height: 15px + + &.lesionNumber, &.target, &.lesionTableTimepointCell text-align: center - margin: 0 - padding: 5px - background-color: #424242 - - - tbody - display: block - position: absolute - top: 25px - left: 0 - right: 0 - bottom: 0 - overflow: auto - width: 100% - - tr.lesionTableRow - width: 100% - - &:nth-child(even) - background: #888 - &:nth-child(odd) - background: #BBB - &:hover - cursor: pointer - background-color: #009BD2 - color: white - - td - border-bottom-width: 0 - margin: 0 - padding: 5px - line-height: 15px - - &.lesionNumber, &.target, &.lesionTableTimepointCell - text-align: center diff --git a/Packages/lesiontracker/components/studyDateList/studyDateList.styl b/Packages/lesiontracker/components/studyDateList/studyDateList.styl index 176e65ec5..b12a4ecaa 100644 --- a/Packages/lesiontracker/components/studyDateList/studyDateList.styl +++ b/Packages/lesiontracker/components/studyDateList/studyDateList.styl @@ -1,13 +1,14 @@ .studyDateList - margin: 0px auto + margin: 0 auto 15px text-align: left width: 100% border-top: 2px solid #777 - padding: 10px label font-weight: normal color: white + padding-top: 5px + padding-left: 5px .loading display: none diff --git a/Packages/worklist/components/worklistResult/worklistResult.html b/Packages/worklist/components/worklistResult/worklistResult.html index 65de4d6bb..42d655718 100644 --- a/Packages/worklist/components/worklistResult/worklistResult.html +++ b/Packages/worklist/components/worklistResult/worklistResult.html @@ -18,14 +18,18 @@ - -
- Accession # -
-
- -
- + + {{#unless isTouchDevice}} + +
+ Accession # +
+
+ +
+ + {{/unless}} +
Study Date @@ -34,14 +38,17 @@
- -
- Modality -
-
- -
- + + {{#unless isTouchDevice}} + +
+ Modality +
+
+ +
+ + {{/unless}}
StudyDescription @@ -50,14 +57,17 @@
- -
- # Images -
-
- -
- + + {{#unless isTouchDevice}} + +
+ # Images +
+
+ +
+ + {{/unless}} diff --git a/Packages/worklist/components/worklistResult/worklistResult.js b/Packages/worklist/components/worklistResult/worklistResult.js index e64e12114..d355533e6 100644 --- a/Packages/worklist/components/worklistResult/worklistResult.js +++ b/Packages/worklist/components/worklistResult/worklistResult.js @@ -9,6 +9,10 @@ Template.worklistResult.helpers({ */ studies : function() { return WorklistStudies.find({}, {sort: {patientName : 1, studyDate : 1}}); + }, + + isTouchDevice: function() { + return isTouchDevice(); } });