From 92f57721e393f0c10d14e1a1beb3c6393f18f991 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Mon, 16 Jan 2017 19:26:12 +0100 Subject: [PATCH] Change 'design' to 'ohif:design' in package.js for each package --- LesionTracker/client/components/app/app.styl | 2 +- .../client/components/toolbarSection/toolbarSection.styl | 2 +- LesionTracker/client/components/viewer/viewer.styl | 2 +- .../client/components/viewerSection/viewerSection.styl | 2 +- OHIFViewer/.meteor/versions | 6 +++++- OHIFViewer/client/components/viewer/viewer.styl | 2 +- .../studyAssociationTable/studyAssociationTable.styl | 2 +- .../client/components/caseProgress/caseProgress.styl | 2 +- .../caseProgress/radialProgressBar/radialProgressBar.styl | 2 +- .../client/components/measureFlow/measureFlow.styl | 2 +- .../components/measureFlow/selectTree/selectTree.styl | 2 +- .../components/measurementTable/measurementTable.styl | 2 +- .../measurementTableHUD/measurementTableHUD.styl | 2 +- .../measurementTableHeaderRow.styl | 2 +- .../measurementTableRow/measurementTableRow.styl | 2 +- .../measurementTableTimepointCell.styl | 2 +- .../measurementTableTimepointHeader.styl | 2 +- .../measurementTableView/measurementTableView.styl | 2 +- .../seriesDetailsTable/seriesDetailsTable.styl | 2 +- .../client/components/studylist/studylist.styl | 2 +- .../studylist/studylistPagination/studylistPagination.styl | 2 +- .../studylist/studylistResult/studylistResult.styl | 2 +- .../studylist/studylistToolbar/studylistToolbar.styl | 2 +- .../client/components/userAccountMenu/userAccountMenu.styl | 2 +- .../client/components/flexboxLayout/flexboxLayout.styl | 2 +- .../components/standaloneViewer/standaloneViewer.styl | 2 +- .../standaloneViewerMain/standaloneViewerMain.styl | 2 +- .../client/components/toolbarSection/toolbarSection.styl | 2 +- .../StandaloneViewer/client/components/viewer/viewer.styl | 2 +- 29 files changed, 33 insertions(+), 29 deletions(-) diff --git a/LesionTracker/client/components/app/app.styl b/LesionTracker/client/components/app/app.styl index fe728b5b1..1788a6498 100644 --- a/LesionTracker/client/components/app/app.styl +++ b/LesionTracker/client/components/app/app.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" $expandedHeight = 160px diff --git a/LesionTracker/client/components/toolbarSection/toolbarSection.styl b/LesionTracker/client/components/toolbarSection/toolbarSection.styl index 1c58610e2..f68e4a56d 100644 --- a/LesionTracker/client/components/toolbarSection/toolbarSection.styl +++ b/LesionTracker/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/LesionTracker/client/components/viewer/viewer.styl b/LesionTracker/client/components/viewer/viewer.styl index 4dbc39157..16c49a404 100644 --- a/LesionTracker/client/components/viewer/viewer.styl +++ b/LesionTracker/client/components/viewer/viewer.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" #viewer background-color: black diff --git a/LesionTracker/client/components/viewerSection/viewerSection.styl b/LesionTracker/client/components/viewerSection/viewerSection.styl index fce5df131..7f79ee397 100644 --- a/LesionTracker/client/components/viewerSection/viewerSection.styl +++ b/LesionTracker/client/components/viewerSection/viewerSection.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .viewerSection display: flex diff --git a/OHIFViewer/.meteor/versions b/OHIFViewer/.meteor/versions index 1318d3a0b..fbb6a1e54 100644 --- a/OHIFViewer/.meteor/versions +++ b/OHIFViewer/.meteor/versions @@ -31,7 +31,6 @@ ddp-common@1.2.8 ddp-rate-limiter@1.0.6 ddp-server@1.3.12 deps@1.0.12 -design@0.0.1 diff-sequence@1.0.7 ecmascript@0.6.1 ecmascript-runtime@0.3.15 @@ -49,6 +48,10 @@ iron:controller@1.0.12 iron:core@1.0.11 iron:dynamic-template@1.0.12 iron:layout@1.0.12 +iron:location@1.0.11 +iron:middleware-stack@1.1.0 +iron:router@1.0.13 +iron:url@1.0.11 johdirr:meteor-git-rev@0.0.4 jquery@1.11.10 launch-screen@1.1.0 @@ -74,6 +77,7 @@ npm-mongo@2.2.11_2 observe-sequence@1.0.14 ohif:core@0.0.1 ohif:cornerstone@0.0.1 +ohif:design@0.0.1 ohif:dicom-services@0.0.1 ohif:hanging-protocols@0.0.1 ohif:log@0.0.1 diff --git a/OHIFViewer/client/components/viewer/viewer.styl b/OHIFViewer/client/components/viewer/viewer.styl index 761c86b80..7d3c9946f 100644 --- a/OHIFViewer/client/components/viewer/viewer.styl +++ b/OHIFViewer/client/components/viewer/viewer.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" body background-color: black diff --git a/Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.styl b/Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.styl index 0bf79f887..cd074b85a 100644 --- a/Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.styl +++ b/Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" $tableHoverColor = #2c363f $tableTextPrimaryColor = white diff --git a/Packages/ohif-measurements/client/components/caseProgress/caseProgress.styl b/Packages/ohif-measurements/client/components/caseProgress/caseProgress.styl index 9fc5594c4..409c7bbc9 100644 --- a/Packages/ohif-measurements/client/components/caseProgress/caseProgress.styl +++ b/Packages/ohif-measurements/client/components/caseProgress/caseProgress.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .caseProgress transition(all 0.3 ease) diff --git a/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.styl b/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.styl index 465ef4aef..f20d72606 100644 --- a/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.styl +++ b/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" $circleSize = 46px diff --git a/Packages/ohif-measurements/client/components/measureFlow/measureFlow.styl b/Packages/ohif-measurements/client/components/measureFlow/measureFlow.styl index 57aea8fbd..d2f9cbe44 100644 --- a/Packages/ohif-measurements/client/components/measureFlow/measureFlow.styl +++ b/Packages/ohif-measurements/client/components/measureFlow/measureFlow.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .measure-flow outline: none diff --git a/Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTree.styl b/Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTree.styl index 946c4ebc5..bc57268d4 100644 --- a/Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTree.styl +++ b/Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTree.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" // TODO: [design] can't we use colors that are already in common pallete? $gray1 = #A3A3A3 diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTable.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTable.styl index dd516d699..046b30c96 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTable.styl +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTable.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" #measurementTableContainer theme('background-color', '$primaryBackgroundColor') diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.styl index 4e36458d4..40167442b 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.styl +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" $borderColor = rgba(77, 99, 110, 0.81) diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl index 36bc1b7a0..bf867f96c 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" $headerRowHeight = 63px diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.styl index 9efed01bf..d7342c795 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.styl +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .measurementTableRow display: flex diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointCell/measurementTableTimepointCell.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointCell/measurementTableTimepointCell.styl index a59331991..2c2631b76 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointCell/measurementTableTimepointCell.styl +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointCell/measurementTableTimepointCell.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .measurementTableTimepointCell theme('border-left', '%s solid $uiBorderColor' % $uiBorderThickness) diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointHeader/measurementTableTimepointHeader.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointHeader/measurementTableTimepointHeader.styl index 86eb7f3a3..149f9210b 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointHeader/measurementTableTimepointHeader.styl +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointHeader/measurementTableTimepointHeader.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .measurementTableTimepointHeader flex: 1 diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl index edf39f53e..8cb26f98b 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .measurementTableView.scrollArea width: 100% diff --git a/Packages/ohif-study-list/client/components/seriesDetailsModal/seriesDetailsTable/seriesDetailsTable.styl b/Packages/ohif-study-list/client/components/seriesDetailsModal/seriesDetailsTable/seriesDetailsTable.styl index 4fc3a14fe..d3319077c 100644 --- a/Packages/ohif-study-list/client/components/seriesDetailsModal/seriesDetailsTable/seriesDetailsTable.styl +++ b/Packages/ohif-study-list/client/components/seriesDetailsModal/seriesDetailsTable/seriesDetailsTable.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .selectedStudyContainer margin-bottom: 15px; diff --git a/Packages/ohif-study-list/client/components/studylist/studylist.styl b/Packages/ohif-study-list/client/components/studylist/studylist.styl index 8c4e55859..8e870b9a2 100644 --- a/Packages/ohif-study-list/client/components/studylist/studylist.styl +++ b/Packages/ohif-study-list/client/components/studylist/studylist.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" body theme('background-color', '$primaryBackgroundColor') diff --git a/Packages/ohif-study-list/client/components/studylist/studylistPagination/studylistPagination.styl b/Packages/ohif-study-list/client/components/studylist/studylistPagination/studylistPagination.styl index 3adcef944..2378f22a3 100644 --- a/Packages/ohif-study-list/client/components/studylist/studylistPagination/studylistPagination.styl +++ b/Packages/ohif-study-list/client/components/studylist/studylistPagination/studylistPagination.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .studylistPagination font-size: 13px diff --git a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.styl b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.styl index 9136d8bca..9b9ff71e5 100644 --- a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.styl +++ b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" $tableHoverColor = #2c363f $tableTextPrimaryColor = white diff --git a/Packages/ohif-study-list/client/components/studylist/studylistToolbar/studylistToolbar.styl b/Packages/ohif-study-list/client/components/studylist/studylistToolbar/studylistToolbar.styl index d8d3ede34..23944cbad 100644 --- a/Packages/ohif-study-list/client/components/studylist/studylistToolbar/studylistToolbar.styl +++ b/Packages/ohif-study-list/client/components/studylist/studylistToolbar/studylistToolbar.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .studylistToolbar .addNewStudy diff --git a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.styl b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.styl index 619fc573d..4f4aca158 100644 --- a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.styl +++ b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" $iconMargin = 5px $iconWidth = 16px diff --git a/StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.styl b/StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.styl index bc608d9b9..5147f428c 100644 --- a/StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.styl +++ b/StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" $lesionsSidebarMenuWidth = 450px diff --git a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.styl b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.styl index 7f13ff777..0fd51d190 100644 --- a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.styl +++ b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" $expandedHeight = 160px diff --git a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.styl b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.styl index 5136c2f14..4b308c602 100644 --- a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.styl +++ b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" .viewerMain width: 100% diff --git a/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.styl b/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.styl index e6ac4b683..a2bf0c37b 100644 --- a/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.styl +++ b/StandaloneViewer/StandaloneViewer/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/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.styl b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.styl index 5aff6a069..16bf01215 100644 --- a/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.styl +++ b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.styl @@ -1,4 +1,4 @@ -@import "{design}/app" +@import "{ohif:design}/app" #viewer background-color: black