PWV-1: Fixing merging issues

Packages/ohif-study-list/client/components/studylist/studylist.styl

@@ -12,11 +12,10 @@ body
 
 .studylistContainer
   theme('background-color', '$primaryBackgroundColor')
-  margin: 0 auto
+  margin: 2px auto 0
   color: white
-  float: left;
   width: 100%;
-        
+
 .tab-content
   width: 100%
   height: calc(100% - 91px)
@@ -31,4 +30,4 @@ body
 
     .viewerContainer
       height: 100%
-      width: 100%
+      width: 100%

Packages/ohif-study-list/client/components/studylist/studylistPagination/studylistPagination.styl

@@ -4,9 +4,6 @@
     font-size: 13px
     font-weight: normal !important
 
-  .rows-per-page
-    padding-top: 20px
-
     label
       font-weight: normal
 
@@ -15,18 +12,23 @@
       color: white
 
   .page-number
+    margin: 0
     text-align: right
 
     label
       font-weight: normal
 
       ul#pagination
+        margin: 0
 
         li
           a
             padding: 4px 8px
             theme('background-color', '$primaryBackgroundColor')
+            theme('border-color', '$uiGray')
+            theme('background-color', '$uiGrayDarkest')
             color: white
+            padding: 4px 8px
 
             &:hover
               theme('color', '$activeColor')
@@ -41,3 +43,13 @@
           a:hover
             color: inherit
 
+          &:not(.disabled):hover a
+            theme('background-color', '$uiGrayDark')
+            theme('color', '$activeColor')
+
+          &.active a
+            theme('background-color', '$uiGrayDark')
+            theme('color', '$activeColor')
+
+          &.disabled a
+            theme('color', '$uiGrayLight')

Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.html

@@ -1,6 +1,6 @@
 <template name="studylistResult">
-    <div class="studyListToolbar">
-        <div class="header">
+    <div class="studyListToolbar clearfix">
+        <div class="header pull-left">
             Study list
         </div>
         <div class="studyCount pull-right">
@@ -104,4 +104,4 @@
             {{/unless}}
         {{/if}}
     </div>
-</template>
+</template>

Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.styl

@@ -8,23 +8,21 @@ $inputBackgroundColor = #2c363f
 $inputPlaceholderColor = lightgray
 
 $studyListToolbarHeight = 75px
-$tablePadding = 8%
 $bodyCellHeight = 40px
 
 .studyListToolbar
   theme('background', '$uiGrayDarker')
   height: $studyListToolbarHeight
-  border-bottom: 2px solid black
-  padding: 0 30px
+  margin-bottom: 2px
+  padding: 0 $studyListPadding
 
-  div
+  &>div
     display: inline-block
 
   .header
     font-size: 22px
     font-weight: 300
     color: $tableTextSecondaryColor
-    padding: 0 10px
     line-height: $studyListToolbarHeight
 
   .studylistToolbar
@@ -35,20 +33,35 @@ $bodyCellHeight = 40px
     theme('color', '$uiSkyBlue')
     font-size: 40px
     font-weight: 100
-    padding: 0 10px
     line-height: $studyListToolbarHeight
 
 .theadBackground
-  theme('background-color', '$uiGrayDarker')
-  width: 100%
-  height: 122px
+  height: 121px
   position: absolute
-  z-index: 1
+  width: 100%
+
+  &:before, &:after
+    content: ''
+    display: block
+    left: 0
+    position: absolute
+    width: 100%
+
+  &:before
+    theme('background-color', '$uiGrayDarker')
+    height: 100%
+    top: 0
+    z-index: 1
+
+  &:after
+    theme('background-color', '$uiSkyBlue')
+    bottom: -1px
+    height: 1px
+    z-index: 3
 
 #studyListContainer
-  background: black
   width: 100%
-  padding: 0 $tablePadding
+  padding: 0 $studyListPadding
   position: absolute
   z-index: 2
 
@@ -64,7 +77,6 @@ $bodyCellHeight = 40px
 
   table#tblStudyList
     thead
-      theme('background-color', '$uiGrayDarker')
       white-space: nowrap
 
       tr
@@ -144,15 +156,10 @@ $bodyCellHeight = 40px
           color: $tableTextPrimaryColor
           font-weight: 300
           border-top: 1px solid #436270
+          border-bottom: 1px solid #436270
           white-space: nowrap
           transition(all 0.1s ease)
 
-          &:first-child
-            padding-left: $tablePadding
-
-          &:last-child
-            padding-right: $tablePadding
-
         &:hover, &:active, &.active
           background-color: $tableHoverColor
           color: white
@@ -163,7 +170,6 @@ $bodyCellHeight = 40px
             border-bottom: 1px solid #436270
             background-color: $tableHoverColor
 
-
 @media only screen and (max-width: 1362px)
   $tablePadding = 5%
   
@@ -238,4 +244,4 @@ $bodyCellHeight = 40px
     .worklistPagination
       .row
         margin-left: 0
-        margin-right: 0
+        margin-right: 0

Packages/ohif-study-list/client/components/studylist/studylistToolbar/studylistToolbar.styl

@@ -24,4 +24,4 @@
       opacity: 0
       overflow: hidden
       position: absolute
-      z-index: -1
+      z-index: -1