From 0908d2900533157a2209def581a23b0570d96e3a Mon Sep 17 00:00:00 2001 From: Goldman Kim Date: Tue, 21 May 2024 16:33:56 +0900 Subject: [PATCH] . --- .../static/js/natural_js/css/natural.ui.css | 18 ++++++++++++------ .../static/js/natural_js/natural.js.min.js | 16 ++++++++-------- .../static/js/natural_js/natural.js.min.map | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/main/resources/static/js/natural_js/css/natural.ui.css b/src/main/resources/static/js/natural_js/css/natural.ui.css index 6c08d3b..b92f0eb 100644 --- a/src/main/resources/static/js/natural_js/css/natural.ui.css +++ b/src/main/resources/static/js/natural_js/css/natural.ui.css @@ -14,11 +14,13 @@ background: var(--md-sys-color-surface-container-lowest); border: 1px solid var(--md-sys-color-outline-variant); box-shadow: 4px 4px 0 var(--md-sys-color-shadow); + border-radius: 3px; } .alert__.block_overlay_msg__ .msg_title_box__ { background-color: var(--md-sys-color-primary); border-top: none; + border-radius: 3px 3px 0 0; } .alert__.block_overlay_msg__ .msg_title_box__ .msg_title__ { @@ -807,6 +809,7 @@ a.btn_elevated__, input[type='button'].btn_elevated__, button.btn_elevated__ { margin-right: 1px; padding: 2px 4px; border: 1px solid var(--md-sys-color-outline-variant); + border-radius: 3px 3px 0 0; cursor: pointer; min-width: 60px; text-align: center; @@ -887,6 +890,7 @@ a.btn_elevated__, input[type='button'].btn_elevated__, button.btn_elevated__ { .tab__>div { padding: 15px; border: 1px solid var(--md-sys-color-outline-variant); + border-radius: 0 3px 3px 3px; } .tab__>div > .view_context__ { @@ -913,10 +917,11 @@ a.btn_elevated__, input[type='button'].btn_elevated__, button.btn_elevated__ { border: 1px solid var(--md-sys-color-outline-variant); box-shadow: 3px 3px 0 var(--md-sys-color-shadow); background-color: var(--md-sys-color-surface-container-lowest); - font-size: 95%; + font-size: 90%; z-index: 1; padding: 2px; width: 314px; + border-radius: 3px; } .datepicker_contents__ > .datepicker_years_panel__ { @@ -1058,12 +1063,11 @@ a.btn_elevated__, input[type='button'].btn_elevated__, button.btn_elevated__ { .datepicker_contents__ .datepicker_year_title__, .datepicker_contents__ .datepicker_month_title__, .datepicker_contents__ .datepicker_day_title__ { - border: 1px solid var(--md-sys-color-outline-variant); + border: 1px solid var(--md-sys-color-secondary-container); background-color: var(--md-sys-color-secondary-container); line-height: 25px; text-align: center; - color: var(--md-sys-color-surface-container-lowest); - font-weight: 700; + color: var(--md-sys-color-on-secondary-container); } .datepicker_contents__ .datepicker_year_selected__ { @@ -1427,7 +1431,7 @@ a.btn_elevated__, input[type='button'].btn_elevated__, button.btn_elevated__ { background-color: var(--md-sys-color-surface-container-lowest); border: 1px solid var(--md-sys-color-outline-variant); margin-bottom: 5px; - border-radius: 5px; + border-radius: 3px; } .notify__ .notify_msg__.visible__ { @@ -1494,7 +1498,6 @@ a.btn_elevated__, input[type='button'].btn_elevated__, button.btn_elevated__ { .docs__>.docs_tab_context__>ul.docs_tab_utils__ { position: absolute; right: 0; - background-color: var(--md-sys-color-secondary-container); padding: 0; } @@ -1505,6 +1508,8 @@ a.btn_elevated__, input[type='button'].btn_elevated__, button.btn_elevated__ { padding: 0; border: 1px solid var(--md-sys-color-outline-variant); text-align: center; + background-color: var(--md-sys-color-secondary-container); + border-radius: 3px 3px 0 0; } .docs__>.docs_tab_context__>.docs_tabs__>.docs_tab__ { @@ -1574,6 +1579,7 @@ a.btn_elevated__, input[type='button'].btn_elevated__, button.btn_elevated__ { text-align: center; background-color: var(--md-sys-color-surface-dim); line-height: 10px; + border-radius: 3px 3px 0 0; } .docs__>.docs_tab_context__>ul.docs_tab_utils__>li>a { diff --git a/src/main/resources/static/js/natural_js/natural.js.min.js b/src/main/resources/static/js/natural_js/natural.js.min.js index c6290c0..53762b1 100644 --- a/src/main/resources/static/js/natural_js/natural.js.min.js +++ b/src/main/resources/static/js/natural_js/natural.js.min.js @@ -138,14 +138,14 @@ new RegExp(f[0],f[1]):new RegExp(f[0])).test(c)}});h.extend(k.prototype,{validat -1f.rules[g].toString().indexOf("required")&&"required"!==a&&e.string.isEmpty(String(d[g]))?x.result=!0:x.result=k[a](e.string.trimToEmpty(d[g]),C)}catch(q){if(-1v&&(v=100,d=v+a.maxYear);for(;v<=d;v++){var y="";v===q[0]&&(a.currYear=q[0],y='selected="selected"');g.append('")}}e.string.isEmpty(a.context.val())||g.trigger("change.datepicker")}isNaN(b[1])||2!==b[1].length||(l.find(".datepicker_month_item__").removeClass("datepicker_month_selected__"),a.monthonly?l.find(".datepicker_month_item__:contains("+String(q[1])+"):eq(0)").addClass("datepicker_month_selected__"):l.find(".datepicker_month_item__:contains("+String(q[1])+"):eq(0)").trigger("click.datepicker"),"top"===a.monthsPanelPosition&&a.contents.find(".datepicker_top_months_panel__ .datepicker_month_item__").val(String(q[1]))); -isNaN(b[2])||2!==b[2].length||(m.find(".datepicker_prev_day_item__, .datepicker_day_item__, .datepicker_next_day_item__").removeClass("datepicker_day_selected__"),m.find(".datepicker_day_item__:contains("+String(q[2])+"):eq(0)").addClass("datepicker_day_selected__"))}});h.extend(c.prototype,{context:function(a){return void 0!==a?this.options.context.find(a):this.options.context},show:function(){var a=this.options,b=a.context.closest("label,span");if(0===a.context.next(".datepicker_contents__.visible").length&& --1a.contents.outerWidth()?d.offset().left+parseInt(d.css("padding-left"))+d.width():H.innerWidth?H.innerWidth:h(H).width();g.offset().left+a.contents.width()>y?(a.contents.css("left", -v+g.outerWidth()-a.contents.width()+"px"),a.contents.removeClass("orgin_left__").addClass("orgin_right__")):(a.contents.css("left",v+"px"),a.contents.removeClass("orgin_right__").addClass("orgin_left__"))}).trigger("resize.datepicker");var l=this;a.contents.show(10,function(){h(this).removeClass("hidden__").addClass("visible__");h(this).one(e.event.whichTransitionEvent(a.contents),function(m){h(document).off("click.datepicker").on("click.datepicker",function(q){a.context.get(0).blur();l.hide()}); -null!==a.onShow&&a.onShow.call(l,a.context,a.contents);a.context.trigger("onShow",[a.context,a.contents])}).trigger("nothing")})}return this},hide:function(){var a=this.options;if(a.contents.hasClass("visible__")){var b=this;if(null!==a.onBeforeHide){var d=a.onBeforeHide.call(this,a.context,a.contents,0a.contents.outerWidth()?d.offset().left+parseInt(d.css("padding-left"))+d.width():H.innerWidth?H.innerWidth:h(H).width();g.offset().left+a.contents.width()> +y?(a.contents.css("left",v+g.outerWidth()-a.contents.width()+"px"),a.contents.removeClass("orgin_left__").addClass("orgin_right__")):(a.contents.css("left",v+"px"),a.contents.removeClass("orgin_right__").addClass("orgin_left__"))}).trigger("resize.datepicker");var l=this;a.contents.show(10,function(){h(this).removeClass("hidden__").addClass("visible__");h(this).one(e.event.whichTransitionEvent(a.contents),function(m){h(document).off("click.datepicker").on("click.datepicker",function(q){a.context.get(0).blur(); +l.hide()});null!==a.onShow&&a.onShow.call(l,a.context,a.contents);a.context.trigger("onShow",[a.context,a.contents])}).trigger("nothing")})}return this},hide:function(){var a=this.options;if(a.contents.hasClass("visible__")){var b=this;if(null!==a.onBeforeHide){var d=a.onBeforeHide.call(this,a.context,a.contents,0