Working on removing Material Design 2

bbalganjjm · Jun 24, 2024 · c35d2b8 · c35d2b8
1 parent fea2cce
commit c35d2b8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/src/main/resources/static/css/common.pub.css b/src/main/resources/static/css/common.pub.css
@@ -34,6 +34,9 @@
     margin-bottom: 10px;
     line-height: 40px;
 }
+.view_context__ .button-panel button {
+    margin-left: 5px;
+}
 
 /* N.form */
 .view_context__ ul.form__ {

diff --git a/src/main/resources/static/html/com/app/sample/type0201.html b/src/main/resources/static/html/com/app/sample/type0201.html
@@ -8,6 +8,7 @@
             </ul>
         </div>
     </div>
+
     <div class="button-panel">
         <button id="btnSearch" data-opts='{ "color": "primary" }'>조회</button>
         <button id="btnExcelImport">엑셀임포트</button>

diff --git a/src/main/resources/static/html/com/app/sample/type04P0.html b/src/main/resources/static/html/com/app/sample/type04P0.html
@@ -41,7 +41,7 @@
     </table>
 
     <div class="button-panel">
-        <button id="btnOk">확인</button>
+        <button id="btnOk" data-opts='{ "color": "primary" }'>확인</button>
         <button id="btnCancel">취소</button>
     </div>
 

diff --git a/src/main/resources/static/js/natural_js/natural.config.js b/src/main/resources/static/js/natural_js/natural.config.js
@@ -394,23 +394,21 @@
              *  - If it is not SPA(Single Page Application), please set it to "body".
              */
             "container" : ".docs__ > .docs_contents__.visible__",
-            "global" : {
-                /**
-                 * N.alert's OK button style
-                 *  - It is specified as an option of the Button(N.button) component.
-                 */
-                "okBtnStyle" : {
-                    color : "primary",
-                    size : "medium"
-                },
-                /**
-                 * N.alert's Cancel button style
-                 *  - It is specified as an option of the Button(N.button) component.
-                 */
-                "cancelBtnStyle" : {
-                    color : "primary_container",
-                    size : "medium"
-                }
+            /**
+             * N.alert's OK button style
+             *  - It is specified as an option of the Button(N.button) component.
+             */
+            "okButtonOpts" : {
+                color : "primary",
+                size : "medium"
+            },
+            /**
+             * N.alert's Cancel button style
+             *  - It is specified as an option of the Button(N.button) component.
+             */
+            "cancelButtonOpts" : {
+                color : "primary_container",
+                size : "medium"
             },
             /**
              * Global draggableOverflowCorrectionAddValues option
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
                 </ul>
             </div>
         </div>
         <div class="button-panel">
             <button id="btnSearch" data-opts='{ "color": "primary" }'>조회</button>
             <button id="btnExcelImport">엑셀임포트</button>
@@ Expand Down @@