diff --git a/LesionTracker/.meteor/packages b/LesionTracker/.meteor/packages index 279a7609b..2362ccf42 100755 --- a/LesionTracker/.meteor/packages +++ b/LesionTracker/.meteor/packages @@ -15,6 +15,15 @@ tracker # Meteor's client-side reactive programming library es5-shim # ECMAScript 5 compatibility for older browsers. ecmascript # Enable ECMAScript2015+ syntax in app code +clinical:router +clinical:extended-api +clinical:active-entry +clinical:error-pages +clinical:theming +clinical:fonts +clinical:hipaa-audit-log +clinical:hipaa-logger + design ohif:core @@ -40,14 +49,6 @@ lesiontracker practicalmeteor:loglevel momentjs:moment -clinical:router -clinical:extended-api -clinical:active-entry -clinical:error-pages -clinical:theming -clinical:fonts -clinical:hipaa-audit-log -clinical:hipaa-logger anti:gagarin@=0.4.11 check aldeed:template-extension@4.0.0 diff --git a/Packages/design/package.js b/Packages/design/package.js index e50709f7b..153cb0298 100644 --- a/Packages/design/package.js +++ b/Packages/design/package.js @@ -32,7 +32,8 @@ Package.onUse(function(api) { // Component styles api.addFiles([ 'styles/components/radio.styl', - 'styles/components/select2.styl' + 'styles/components/select2.styl', + 'styles/components/selectTree.styl' ], 'client'); // Rounded Button Group diff --git a/Packages/design/styles/components/select2.styl b/Packages/design/styles/components/select2.styl index d91a3fef1..a1ef36961 100644 --- a/Packages/design/styles/components/select2.styl +++ b/Packages/design/styles/components/select2.styl @@ -46,6 +46,7 @@ span.select2.select2-container border-color: $uiGray border-radius: $borderRadius color: $gray4 + font-size: 12px line-height: 22px margin-top: 3px diff --git a/Packages/design/styles/components/selectTree.styl b/Packages/design/styles/components/selectTree.styl new file mode 100644 index 000000000..62fbd8bd9 --- /dev/null +++ b/Packages/design/styles/components/selectTree.styl @@ -0,0 +1,72 @@ +@import "{design}/app" + +// TODO: [design] can't we use colors that are already in common pallete? +$gray1 = #A3A3A3 +$gray2 = #A0A0A0 +$gray3 = #C4C4C4 +$gray4 = #C0C0C0 +$gray5 = #9B9B9B +$gray6 = #303030 + +.select-tree-root + background-color: white + border: 1px solid $gray3 + border-radius: 5px + display: table + overflow: hidden + + .tree-search + background-color: $gray4 + border-bottom: 1px solid $gray3 + color: $gray6 + display: block + margin: 0 + padding: 5px + text-align: center + + span + font-weight: bold + line-height: 24px + + input + border-color: $gray5 + font-weight: normal + + .tree-breadcrumb + line-height: 32px + padding: 5px 12px + + .tree-options + overflow: hidden + + .tree-node, .tree-leaf + cursor: pointer + display: block + margin-bottom: 0 + padding: 0 12px + position: relative + z-index: 1 + + &>input + display: none + + .tree-node + height: 41px + border-bottom: 1px solid $gray3 + border-top: 1px solid $gray3 + line-height: 41px + margin-top: -1px + + &:last-child + border-bottom: 0 + + .tree-leaf + line-height: 26px + + label + transition(all 0.3s ease) + + &.collapsed + + &>.tree-breadcrumb, &>label:not(.active) + display: none diff --git a/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.html b/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.html index a878e998b..7956b4902 100644 --- a/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.html +++ b/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.html @@ -1,5 +1,5 @@