AWV-3: Merging changes from upstream

Packages/viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.styl

@@ -1,15 +1,15 @@
 @import "{design}/app"
 
 .thumbnailEntry.active .imageThumbnail
-  border-color: $activeColor
+  theme('border-color', '$activeColor')
   box-shadow: none
   transition($sidebarTransition)
 
 .imageThumbnail
-  background-color: $primaryBackgroundColor
+  theme('box-shadow', 'inset 0 0 0 1px $uiBorderColorDark')
+  theme('background-color', '$primaryBackgroundColor')
   border: 5px solid transparent
   border-radius: 12px
-  box-shadow: inset 0 0 0 1px $uiBorderColorDark
   height: 135px
   margin: 0 auto
   padding 1px 7px
@@ -25,7 +25,7 @@
   margin: 0 !important
 
   &:hover
-    border-color: $hoverColor
+    theme('border-color', '$hoverColor')
     box-shadow: none
 
 .imageThumbnailCanvas
@@ -35,7 +35,7 @@
 .thumbnailLoadingIndicator
   display: none
   pointer-events: none
-  color: $textSecondaryColor
+  theme('color', '$textSecondaryColor')
   height: 20px
   width: 100%
   top: 0

Packages/viewerbase/client/components/studyBrowser/thumbnailEntry/thumbnailEntry.styl

@@ -13,7 +13,7 @@ $seriesCountBackgroundColor = #678696
     cursor: -moz-grab
 
   .seriesDetails
-    color: $textPrimaryColor
+    theme('color', '$textPrimaryColor')
     font-size: 14px
     line-height: 1.3em
     margin-top: 5px
@@ -61,7 +61,7 @@ $seriesCountBackgroundColor = #678696
       height: 18px
 
     .value
-      color: $textSecondaryColor
+      theme('color', '$textSecondaryColor')
       display: inline-block
       float: right
       font-size: 12px
@@ -69,7 +69,7 @@ $seriesCountBackgroundColor = #678696
       width: calc(100% - 15px)
 
     .icon
-      color: $activeColor
+      theme('color', '$activeColor')
       display: inline-block
       float: left
       font-size: 10px
@@ -83,7 +83,7 @@ $seriesCountBackgroundColor = #678696
         position: relative
 
         &:after
-          background-color: $activeColor
+          theme('background-color', '$activeColor')
           box-shadow: 1px 1px rgba(0, 0, 0, .115)
           left: -5px
           position: absolute
@@ -91,7 +91,7 @@ $seriesCountBackgroundColor = #678696
 
         &
         &:after
-          border: 1px solid $primaryBackgroundColor
+          theme('border', '1px solid $primaryBackgroundColor')
           content: ''
           display: inline-block
           height: 11px