fixing box-shaow style problem, making header fixable, UI: Renewing S…

…tudy page #1802
dcm4che · Mar 8, 2019 · a3e8c7c · a3e8c7c
1 parent 7345878
commit a3e8c7c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/dcm4chee-arc-ui2/src/app/helpers/dicom-studies-table/dicom-studies-table.component.scss b/dcm4chee-arc-ui2/src/app/helpers/dicom-studies-table/dicom-studies-table.component.scss
@@ -1,6 +1,7 @@
 .j4care_dynamic_table{
  float: left;
  width: 100%;
+ margin-bottom: 40px;
  .th{
  width: 100%;
  float: left;
@@ -43,28 +44,34 @@
  border-bottom: 1px solid rgba(0, 0, 0, 0.46);
  margin-bottom: 1px;
  &.patient_block{
- -webkit-box-shadow: 4px 0px 6px rgba(68, 68, 68, 0.57);
- -moz-box-shadow: 4px 0px 6px rgba(68, 68, 68, 0.57);
- box-shadow: 4px 0px 6px rgba(68, 68, 68, 0.57);
+ -webkit-box-shadow: 4px 3px 6px rgba(68, 68, 68, 0.57);
+ -moz-box-shadow: 4px 3px 6px rgba(68, 68, 68, 0.57);
+ box-shadow: 4px 3px 6px rgba(68, 68, 68, 0.57);
+ z-index: 4;
+ position: relative;
  }
  &.study_block{
- -webkit-box-shadow: inset 0px 9px 7px -7px rgba(68, 68, 68, 0.52), 2px 0px 10px 0px rgba(68, 68, 68, 0.7);
- -moz-box-shadow: inset 0px 9px 7px -7px rgba(68, 68, 68, 0.52), 2px 0px 10px 0px rgba(68, 68, 68, 0.7);
- box-shadow: inset 0px 9px 7px -7px rgba(68, 68, 68, 0.52), 2px 0px 10px 0px rgba(68, 68, 68, 0.7);
+ -webkit-box-shadow:  2px 3px 10px 0px rgba(68, 68, 68, 0.7);
+ -moz-box-shadow:  2px 3px 10px 0px rgba(68, 68, 68, 0.7);
+ box-shadow:  2px 3px 10px 0px rgba(68, 68, 68, 0.7);
  margin-left: 2px;
  width: calc(100% - 2px);
  background: rgba(235, 235, 235, 0.9);
  padding-left: 20px;
+ position: relative;
+ z-index: 3;
  }
  &.series_block{
- -webkit-box-shadow: inset 0px 9px 7px -7px rgba(68, 68, 68, 0.52), 1px 0px 8px 0px rgba(68, 68, 68, 0.7);
- -moz-box-shadow: inset 0px 9px 7px -7px rgba(68, 68, 68, 0.52), 1px 0px 8px 0px rgba(68, 68, 68, 0.7);
- box-shadow: inset 0px 9px 7px -7px rgba(68, 68, 68, 0.52), 1px 0px 8px 0px rgba(68, 68, 68, 0.7);
+ -webkit-box-shadow: 1px 0px 8px 0px rgba(68, 68, 68, 0.7);
+ -moz-box-shadow: 1px 0px 8px 0px rgba(68, 68, 68, 0.7);
+ box-shadow: 1px 0px 8px 0px rgba(68, 68, 68, 0.7);
  margin-left: 4px;
  width: calc(100% - 4px);
  background: rgba(215, 215, 215, 0.8);
  padding-left: 40px;
+ position: relative;
+ z-index: 2;
 
  }
  }
-}
+}
diff --git a/dcm4chee-arc-ui2/src/app/study/study/study.component.scss b/dcm4chee-arc-ui2/src/app/study/study/study.component.scss
@@ -19,6 +19,7 @@
  background: white;
  position: fixed;
  top: 0;
+ z-index: 10;
 }
 .tab_content_with_fixed_header{
  margin-top: 226px;

diff --git a/dcm4chee-arc-ui2/src/styles.scss b/dcm4chee-arc-ui2/src/styles.scss
@@ -2624,6 +2624,16 @@ dicom-list{
 .pointer:hover{
  cursor: pointer;
 }
+.tab_content_with_fixed_header{
+ .j4care_dynamic_table{
+ .th{
+ position: fixed;
+ z-index: 10;
+ top: 186px;
+ width: calc(100% - 80px) !important;
+ }
+ }
+}
 
 /* New black and white design*/
 $pink:rgba(82, 36, 88, 0.85);