Merge remote-tracking branch 'origin/main'

src/main/webapp/WEB-INF/jsp/include/head.jsp

@@ -28,15 +28,13 @@
   <link rel="stylesheet" href="<c:url value="/webjars/3rd-party/sneat/fonts/flag-icons.css"/>" />
 
   <!-- Core CSS -->  
-  <!-- Core CSS -->
-  <link rel="stylesheet" href="<c:url value="/resources/css/adds.css"/>" />
   <link rel="stylesheet" href="<c:url value="/webjars/3rd-party/sneat/css/rtl/core.css"/>" class="template-customizer-core-css" />
   <link rel="stylesheet" href="<c:url value="/webjars/3rd-party/sneat/css/rtl/theme-default.css"/>" class="template-customizer-theme-css" />
   <link rel="stylesheet" href="<c:url value="/webjars/css/styles.css"/>" />
 	
   <link rel="stylesheet" href="<c:url value="/webjars/applib/css/overwrite.css?${ver}"/>" />
   <link rel="stylesheet" href="<c:url value="/webjars/applib/css/applib.css?${ver}"/>" />
-   
+  <link rel="stylesheet" href="<c:url value="/resources/css/adds.css"/>" />
 
   
   <%--link rel="stylesheet" href="<c:url value="/webjars/3rd-party/sneat/css/demo.css" /--%>

src/main/webapp/WEB-INF/jsp/include/top.jsp

@@ -1,20 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
 <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
 
-<style>
-	.navbar.bg-primary {
-		background-color: #35A354 !important;
-		color: #e0e1ff !important;
-	}
-
-	.bg-navbar-theme .navbar-nav .show > .nav-link,
-	.bg-navbar-theme .navbar-nav .active > .nav-link,
-	.bg-navbar-theme .navbar-nav .nav-link.show,
-	.bg-navbar-theme .navbar-nav .nav-link.active {
-		color: #fff !important;
-	}
-</style>
-
 <%-- Navbar --%>
 <nav id="layout-navbar" class="layout-navbar navbar navbar-expand-xl bg-navbar-theme bg-primary justify-content-between">
 	<div class="navbar-nav">

src/main/webapp/resources/css/adds.css

@@ -2,6 +2,18 @@
 
 /* 추후 개편 필요 임시 css */
 
+.navbar.bg-primary {
+	background-color: #35A354 !important;
+	color: #e0e1ff !important;
+}
+
+.bg-navbar-theme .navbar-nav .show > .nav-link,
+.bg-navbar-theme .navbar-nav .active > .nav-link,
+.bg-navbar-theme .navbar-nav .nav-link.show,
+.bg-navbar-theme .navbar-nav .nav-link.active {
+	color: #fff !important;
+}
+
 .current-row {
-    background-color: rgba(24, 171, 63, 0.16)   !important;
+    background-color: rgba(24, 171, 63, 0.16);
 }