diff --git a/Packages/design/styles/global.styl b/Packages/design/styles/global.styl index 554aefe23..28ba095be 100644 --- a/Packages/design/styles/global.styl +++ b/Packages/design/styles/global.styl @@ -1,10 +1,19 @@ html * - font-family: 'Roboto', sans-serif; + font-family: 'Roboto', sans-serif hr - border-top: 1px solid $uiBorderColor; + border-top: 1px solid $uiBorderColor .center-table display: table margin-left: auto margin-right: auto + +.caret-down + display: inline-block + width: 0 + height: 0 + margin-top: .5rem + border-top: 5px solid + border-right: 5px solid transparent + border-left: 5px solid transparent diff --git a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl index a6b2ddec0..a21b6b93f 100644 --- a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl +++ b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl @@ -39,9 +39,6 @@ $expandedHeight = 160px &:active color: $activeColor - .userAccountSection - margin: 0 10px - &.studyList background-color: rgba(21, 25, 30, 0.7) height: $expandedHeight diff --git a/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.html b/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.html index e9d854c6d..2e73f0791 100644 --- a/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.html +++ b/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.html @@ -8,19 +8,19 @@ xmlns="http://www.w3.org/2000/svg"> - @@ -40,4 +40,4 @@ {{ /if }} - \ No newline at end of file + diff --git a/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.js b/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.js index 4f7e97a99..02bf0a186 100644 --- a/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.js +++ b/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.js @@ -5,7 +5,7 @@ Template.radialProgressBar.helpers({ }, progressRadius() { - var radius = 13 * 2 * Math.PI; + var radius = 21 * 2 * Math.PI; const instance = Template.instance(); var percentLeft = (100 - instance.data.progressPercent) / 100; return percentLeft * radius; diff --git a/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.styl b/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.styl index caacf3d54..24bbe4f95 100644 --- a/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.styl +++ b/Packages/lesiontracker/client/components/radialProgressBar/radialProgressBar.styl @@ -18,23 +18,24 @@ $progressTextColor = #6fbde2 #svg #bar stroke: $activeColor - -ms-transform: rotate(270deg); /* IE 9 */ - -ms-transform-origin: center center; /* IE 9 */ - -webkit-transform: rotate(270deg); /* Chrome, Safari, Opera */ - -webkit-transform-origin: center center; /* Chrome, Safari, Opera */ - transform: rotate(270deg); - transform-origin: center center; + -ms-transform: rotate(270deg) /* IE 9 */ + -ms-transform-origin: center center /* IE 9 */ + -webkit-transform: rotate(270deg) /* Chrome, Safari, Opera */ + -webkit-transform-origin: center center /* Chrome, Safari, Opera */ + transform: rotate(270deg) + transform-origin: center center .progressText - position: absolute; - width: $circleSize; - height: $circleSize; - line-height: $circleSize; - font-family: Roboto-Bold; - font-size: 17px; - text-align: center; - color: $progressTextColor; - top: 0; + position: absolute + width: $circleSize + height: $circleSize + line-height: $circleSize + font-family: Roboto + font-weight: 700 + font-size: 17px + text-align: center + color: $progressTextColor + top: 0 svg width: 17px diff --git a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html index 0182d9724..2819f34c5 100644 --- a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html +++ b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html @@ -1,10 +1,10 @@ - - + + {{>roundedButtonGroup leftSidebarToggleButtonData}} - + {{ #each toolbarButtons }} {{ >toolbarSectionButton }} {{ /each }} @@ -24,10 +24,10 @@ {{ >studySeriesQuickSwitch side="left" viewportIndex=0}} {{ >studySeriesQuickSwitch side="right" viewportIndex=1}} - + {{ >caseProgress }} - + {{>roundedButtonGroup rightSidebarToggleButtonData}} - + @@ -62,7 +62,7 @@ HUD - + diff --git a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.styl b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.styl index bd17f0cc6..a2d23e7fb 100644 --- a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.styl +++ b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.styl @@ -51,14 +51,13 @@ stroke: $hoverColor .toolbarSectionEntry - display: inline-block color: $defaultColor - fill: $defaultColor - stroke: $defaultColor - padding: 0 10px - height: $toolbarHeight - min-width: 30px cursor: pointer + display: inline-block + fill: $defaultColor + margin-top: 3px + min-width: 30px + stroke: $defaultColor text-align: center .quickSwitch diff --git a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html index 2b5352a87..e4dac92f6 100644 --- a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html +++ b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html @@ -1,10 +1,10 @@ {{#if currentUser}} - - {{name}} {{currentPath}} - - + + {{name}} {{currentPath}} + + @@ -41,4 +41,4 @@ {{/if}} - \ No newline at end of file + diff --git a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.styl b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.styl index c21955f4b..84dc6fe41 100644 --- a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.styl +++ b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.styl @@ -1,27 +1,31 @@ @import "{design}/app" #userAccountMenu - padding: 5px + padding: 4px 0 height: 100% .dropdown-toggle - cursor: pointer - line-height: 20px - font-weight: 400 - font-size: 13px - text-decoration: none background-color: $primaryBackgroundColor color: $textSecondaryColor + cursor: pointer + font-size: 13px + font-weight: 400 + line-height: 18px + text-decoration: none .menuButton - display: inline-block - padding-left: 5px border-left: solid 1px #516873 + display: inline-block + height: 18px + padding: 0 8px .fa color: #94a8b3 + font-size: 17px + line-height: 18px - .caret + .caret-down + margin: 0 4px 4px 2px color: #516873 ul.dropdown-menu