From e31484ef59a20e564b72d230c619d0088b58b3ee Mon Sep 17 00:00:00 2001 From: Goldman Kim~ Date: Thu, 14 Dec 2023 00:14:05 +0900 Subject: [PATCH 1/2] Style correction --- .../resources/static/css/common.material.css | 16 ++++++++++++++++ .../js/natural_js/css/natural.ui.material.css | 3 +++ 2 files changed, 19 insertions(+) diff --git a/src/main/resources/static/css/common.material.css b/src/main/resources/static/css/common.material.css index 20a049f..2c339d7 100644 --- 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,24 @@ 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; +} +.tbody_wrap__ tbody:last-child { + border-bottom-width: 0 !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 index 9154b4c..88cfa11 100644 --- 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 @@ -739,6 +739,9 @@ a.btn_mouseout__, input[type='button'].btn_mouseout__, button.btn_mouseout__ { background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAIklEQVQIW2NkQAIf7n/4zwjjgzgCigKMYAEYB8RmROaABAAQCg/DqNBm8AAAAABJRU5ErkJggg==") repeat; -webkit-overflow-scrolling: touch; overflow-y: auto !important; +} + +.tbody_wrap__, .tfoot_wrap__ { margin-left: 0 !important; } From c8d679a785c9fcdff8443688d06961d27924bc3f Mon Sep 17 00:00:00 2001 From: Goldman Kim~ Date: Thu, 14 Dec 2023 00:24:13 +0900 Subject: [PATCH 2/2] Style correction --- src/main/resources/static/css/common.material.css | 3 --- .../static/js/natural_js/css/natural.ui.material.css | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/resources/static/css/common.material.css b/src/main/resources/static/css/common.material.css index 2c339d7..9d119b8 100644 --- a/src/main/resources/static/css/common.material.css +++ b/src/main/resources/static/css/common.material.css @@ -124,9 +124,6 @@ thead, tbody { .tbody_wrap__ thead { border-bottom: none !important; } -.tbody_wrap__ tbody:last-child { - border-bottom-width: 0 !important; -} .tfoot_wrap__ { border-top: 1px solid rgba(0,0,0,.12) !important; } 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 index 88cfa11..cce098a 100644 --- 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,7 +732,7 @@ 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; }