Merge remote-tracking branch 'origin/main'

bbalganjjm · Dec 18, 2023 · 9939f45 · 9939f45
2 parents 186eab1 + c8d679a
commit 9939f45
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/main/resources/static/css/common.material.css b/src/main/resources/static/css/common.material.css
@@ -102,6 +102,7 @@ input[type='radio'], input[type='checkbox'] {
     border: none;
     border-radius: inherit;
 }
+
 table {
     border-spacing: 0;
     border-collapse: collapse;
@@ -112,9 +113,21 @@ table {
 thead, tbody {
     border-bottom: 1px solid rgba(0,0,0,.12) !important;
 }
+
+/* Grid's table */
+.thead_wrap__ {
+    border-bottom: 1px solid rgba(0,0,0,.12) !important;
+}
 .thead_wrap__ thead {
     border-bottom: none !important;
 }
+.tbody_wrap__ thead {
+    border-bottom: none !important;
+}
+.tfoot_wrap__ {
+    border-top: 1px solid rgba(0,0,0,.12) !important;
+}
+
 th, td {
     border: none;
     word-break: break-all;

diff --git a/src/main/resources/static/js/natural_js/css/natural.ui.material.css b/src/main/resources/static/js/natural_js/css/natural.ui.material.css
@@ -722,10 +722,6 @@ a.btn_mouseout__, input[type='button'].btn_mouseout__, button.btn_mouseout__ {
     min-width: 100%;
 }
 
-.tbody_wrap__>table, .tfoot_wrap__>table {
-    border-top: none;
-}
-
 .thead_wrap__ thead th .asc__ {
     color: var(--mdc-theme-primary, #6200ee);
 }
@@ -736,9 +732,12 @@ a.btn_mouseout__, input[type='button'].btn_mouseout__, button.btn_mouseout__ {
 
 .tbody_wrap__ {
     position: relative;
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAIklEQVQIW2NkQAIf7n/4zwjjgzgCigKMYAEYB8RmROaABAAQCg/DqNBm8AAAAABJRU5ErkJggg==") repeat;
+    background: none;
     -webkit-overflow-scrolling: touch;
     overflow-y: auto !important;
+}
+
+.tbody_wrap__, .tfoot_wrap__ {
     margin-left: 0 !important;
 }