diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 9299c34..493ff17 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -43,19 +43,20 @@ html [lang] { } /* input element styles */ -input[type='text'], input[type='number'], input[type='tel'], input[type='password'], select, textarea { +input:not([type='radio'], [type='checkbox']), select, textarea { color: var(--md-sys-color-on-surface); vertical-align: middle; box-sizing: border-box; width: 100%; padding: 3px; border: 1px solid var(--md-sys-color-outline-variant); + border-radius: var(--njs-border-radius-m); line-height: 19px; margin: 2px 0; } -input[type='text']:hover, input[type='number']:hover, input[type='tel']:hover, input[type='password']:hover, select:hover, textarea:hover, -input[type='text']:focus, input[type='number']:focus, input[type='tel']:focus, input[type='password']:focus, select:focus, textarea:focus { +input:not([type='radio'], [type='checkbox']):hover, select:hover, textarea:hover, +input:not([type='radio'], [type='checkbox']):focus, select:focus, textarea:focus { border: 1px solid var(--md-sys-color-outline-variant); } @@ -98,7 +99,6 @@ textarea[disabled]:focus { input[type='radio'], input[type='checkbox'] { vertical-align: middle; - border: none; } .select_input_label__ input[type='radio'], .select_input_label__ input[type='checkbox'] { @@ -171,6 +171,14 @@ th, tfoot td { list-style: none; } +.list__>li:first-child { + border-radius: var(--njs-border-radius-l) var(--njs-border-radius-l) 0 0; +} + +.list__>li:last-child { + border-radius: 0 0 var(--njs-border-radius-l) var(--njs-border-radius-l); +} + .list__>li { margin: 0; padding: 0px 5px; @@ -342,10 +350,6 @@ th, tfoot td { margin: 0 0 10px 0; } -.view_context__ *:last-child { - /*margin: 0;*/ -} - .view_context__ .pagination-box { margin-top: 16px; } diff --git a/src/main/resources/static/css/common.pub.css b/src/main/resources/static/css/common.pub.css index 76327cf..c1bbf48 100644 --- a/src/main/resources/static/css/common.pub.css +++ b/src/main/resources/static/css/common.pub.css @@ -1,11 +1,16 @@ @charset "utf-8"; +/* search-panel */ +.view_context__ form:not(.select_input_container__) label { + white-space: nowrap; +} .view_context__ .search-panel>ul { display: flex; flex-wrap: wrap; padding: 5px; margin: 0 0 10px 0; border: 1px solid var(--md-sys-color-outline-variant); + border-radius: var(--njs-border-radius-l); } .view_context__ .search-panel>ul>li { list-style: none; @@ -16,24 +21,28 @@ } .view_context__ .search-panel>ul>li>label>span { display: block; + color: var(--md-sys-color-on-surface-variant); border-bottom: 1px solid var(--md-sys-color-outline-variant); padding-bottom: 2px; margin-bottom: 5px; font-size: 90%; } +/* button-panel */ .view_context__ .button-panel { text-align: right; margin-bottom: 10px; line-height: 40px; } +/* N.form */ .view_context__ ul.form__ { display: flex; flex-wrap: wrap; padding: 5px; margin: 0; border: 1px solid var(--md-sys-color-outline-variant); + border-radius: var(--njs-border-radius-l); } .view_context__ ul.form__>li { flex: 22%; @@ -45,8 +54,49 @@ } .view_context__ ul.form__>li>label>span { display: block; + color: var(--md-sys-color-on-surface-variant); border-bottom: 1px solid var(--md-sys-color-outline-variant); padding-bottom: 2px; margin-bottom: 5px; font-size: 90%; +} + +/* N.grid */ +.grid_wrap__ { + border-radius: var(--njs-border-radius-l) var(--njs-border-radius-l) 0 0; +} +.grid_wrap__ > .thead_wrap__ table { + border-collapse: separate; + border-spacing: 0; + border-top-left-radius: var(--njs-border-radius-l); + border-top-right-radius: var(--njs-border-radius-l); + border: 1px solid var(--md-sys-color-outline-variant); + border-bottom: none; +} +.grid_wrap__ > .thead_wrap__ table thead tr:first-child th:first-child { + border-top-left-radius: var(--njs-border-radius-l); +} +.grid_wrap__ > .thead_wrap__ table thead tr:first-child th:last-child { + border-top-right-radius: var(--njs-border-radius-l); +} +.grid_wrap__ > .thead_wrap__ table thead tr th { + border-top-style: hidden; +} +.grid_wrap__ > .tbody_wrap__ table { + border-collapse: separate; + border-spacing: 0; + border: 1px solid var(--md-sys-color-outline-variant); + border-top: none; +} +.tbody_wrap__>.grid__>tbody td.empty__ { + border-bottom: none; +} +.grid_container__ .grid_wrap__ { + border-top-left-radius: 0; +} +thead:first-child tr:first-child th:first-child { + border-top-left-radius: var(--njs-border-radius-l); +} +thead:first-child tr:first-child th:last-child { + border-top-right-radius: var(--njs-border-radius-l); } \ No newline at end of file diff --git a/src/main/resources/static/html/com/app/sample/type0101.html b/src/main/resources/static/html/com/app/sample/type0101.html index c2c90fc..a321bf6 100644 --- a/src/main/resources/static/html/com/app/sample/type0101.html +++ b/src/main/resources/static/html/com/app/sample/type0101.html @@ -9,7 +9,7 @@
diff --git a/src/main/resources/static/html/com/app/sample/type0201.html b/src/main/resources/static/html/com/app/sample/type0201.html index 86c30df..cabef88 100644 --- a/src/main/resources/static/html/com/app/sample/type0201.html +++ b/src/main/resources/static/html/com/app/sample/type0201.html @@ -9,7 +9,7 @@ diff --git a/src/main/resources/static/html/com/app/sample/type0401.html b/src/main/resources/static/html/com/app/sample/type0401.html index 35de9d8..349ca4a 100644 --- a/src/main/resources/static/html/com/app/sample/type0401.html +++ b/src/main/resources/static/html/com/app/sample/type0401.html @@ -13,7 +13,7 @@