AWV-3: Merging changes from upstream

OHIFViewer/client/components/toolbarSection/toolbarSection.styl

@@ -1,7 +1,7 @@
 @import "{design}/app"
 
 .toolbarSection
-  border-bottom: $uiBorderColor $uiBorderThickness solid
+  theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness)
   flex: 0 0 auto
   height: $toolbarHeight
   overflow: hidden
@@ -11,4 +11,4 @@
   width: 100%
 
   &.expanded
-    height: $toolbarHeight + $toolbarDrawerHeight
+    height: $toolbarHeight + $toolbarDrawerHeight