Working on removing Material Design 2

bbalganjjm · Jun 25, 2024 · 7955c78 · 7955c78
1 parent a8c95e6
commit 7955c78
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 29 deletions.
diff --git a/src/main/resources/static/html/com/app/sample/type0401.html b/src/main/resources/static/html/com/app/sample/type0401.html
@@ -132,19 +132,19 @@
                         <textarea id="greeting" rows="4" cols="34" data-validate='[["required"]]'></textarea>
                     </label>
                 </li>
-                <li>
-                    <label>
-                        <span>Active</span>
-                        <input id="isActive" type="checkbox">
-                    </label>
-                </li>
                 <li>
                     <label for="isActive"><span>Active</span></label>
                     <label class="toggle-switch">
                         <input id="isActive" type="checkbox">
                         <span class="slider"></span>
                     </label>
                 </li>
+                <li>
+                    <label>
+                        <span>Attachments</span>
+                        <button id="btnFile">File</button>
+                    </label>
+                </li>
             </ul>
         </div>
     </div>

diff --git a/src/main/resources/static/html/com/app/sample/type0402.html b/src/main/resources/static/html/com/app/sample/type0402.html
@@ -139,19 +139,19 @@
                     <textarea id="greeting" rows="4" cols="34" data-validate='[["required"]]'></textarea>
                 </label>
             </li>
-            <li>
-                <label>
-                    <span>Active</span>
-                    <input id="isActive" type="checkbox">
-                </label>
-            </li>
             <li>
                 <label for="isActive"><span>Active</span></label>
                 <label class="toggle-switch">
                     <input id="isActive" type="checkbox">
                     <span class="slider"></span>
                 </label>
             </li>
+            <li>
+                <label>
+                    <span>Attachments</span>
+                    <button id="btnFile">File</button>
+                </label>
+            </li>
         </ul>
     </div>
 

diff --git a/src/main/resources/static/html/com/app/sample/type0501.html b/src/main/resources/static/html/com/app/sample/type0501.html
@@ -138,19 +138,19 @@
                         <textarea id="greeting" rows="4" cols="34" data-validate='[["required"]]'></textarea>
                     </label>
                 </li>
-                <li>
-                    <label>
-                        <span>Active</span>
-                        <input id="isActive" type="checkbox">
-                    </label>
-                </li>
                 <li>
                     <label for="isActive"><span>Active</span></label>
                     <label class="toggle-switch">
                         <input id="isActive" type="checkbox">
                         <span class="slider"></span>
                     </label>
                 </li>
+                <li>
+                    <label>
+                        <span>Attachments</span>
+                        <button id="btnFile">File</button>
+                    </label>
+                </li>
             </ul>
         </div>
     </div>

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
@@ -1838,7 +1838,7 @@ HTML Template & variables
 </label>
  */
 .toggle-switch {
-    --njs-toggle-switch-height: 24px;
+    --njs-toggle-switch-height: 27px;
     --njs-toggle-switch-width: calc(var(--njs-toggle-switch-height) * 2);
     --njs-toggle-switch-padding: calc(var(--njs-toggle-switch-height) / 7);
     --njs-toggle-switch-on-content: "ON";

diff --git a/src/main/resources/templates/common/app/file/manager.html b/src/main/resources/templates/common/app/file/manager.html
@@ -10,8 +10,8 @@
 }
 
 .file_manager__ .file_upload__, .file_manager__ .file_download__ {
-    border: 1px solid rgba(0,0,0,0.12);
-    border-radius: 4px;
+    border: 1px solid var(--md-sys-color-outline-variant);
+    border-radius: var(--njs-border-radius-m);
     padding: 10px;
 }
 
@@ -67,18 +67,14 @@
 .file_manager__ .max_upload_file_cnt__ {
     font-weight: normal;
 }
-
-.file_manager__ .button-panel {
-    padding: 20px;
-}
 </style>
 
 <article class="file_manager__" title="파일 관리">
     <div class="file_contents__">
         <div class="upload__ flex-horizental">
             <div class="button-panel">
                 <button id="btnAdd">추가</button>
-                <button id="btnUpload" class="mdc-button--raised">업로드</button>
+                <button id="btnUpload" data-opts='{ "color": "primary" }'>업로드</button>
             </div>
         </div>
         <h4 class="download__">다운로드</h4>
@@ -91,7 +87,7 @@ <h4 class="upload__">업로드<span class="max_upload_file_cnt__"></span></h4>
         </div>
         <div class="upload__ desc"></div>
     </div>
-    <div class="button-panel">
+    <div class="button-panel" style="padding-right: 20px; text-align: center;">
         <button id="btnOk" class="upload__">확인</button>
     </div>
 </article>
@@ -243,7 +239,7 @@ <h4 class="upload__">업로드<span class="max_upload_file_cnt__"></span></h4>
                         fileNameText = file.name;
                     }
 
-                    fileGroupUl.append('<li><span' + warnStyle + '>' + fileNameText + '</span><button data-fileid="' + (file.lastModified + file.name + file.size) + '" class="delete_file_item__" href="#"><span>삭제</span></button></li>');
+                    fileGroupUl.append('<li><span' + warnStyle + '>' + fileNameText + '</span><a data-fileid="' + (file.lastModified + file.name + file.size) + '" class="delete_file_item__" href="#"><span>삭제</span></a></li>');
                 });
 
                 if(files.length > 0) {
@@ -338,7 +334,7 @@ <h4 class="upload__">업로드<span class="max_upload_file_cnt__"></span></h4>
                     }).addClass("file_download_link__").data("fileid", fileId).data("fileseq", this.fileSeq))
 
                     // 삭제버튼
-                    li.append($('<button class="delete_file__" href="#"><span>삭제</span></button>'));
+                    li.append($('<a class="delete_file__" href="#"><span>삭제</span></a>'));
 
                     li.appendTo(N(".file_download_items__", cont.view));