Merge branch 'hotfix_modify_css_config'

修复添加自定义样式配置

Author: sunxingba

.gitignore

@@ -0,0 +1,26 @@
+/target/
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.mar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Ignore everything in this directory
+target
+.classpath
+.settings
+.project
+*.iml
+*.iws
+*.ipr
+.idea
+.vscode/
+.DS_Store

modules/org.wso2.carbon.ui_patch/src/main/resources/web/admin/layout/template.jsp

@@ -91,6 +91,7 @@
     <title><tiles:getAsString name="title"/></title>
     <%}%>
     <link href="<%=globalCSS%>" rel="stylesheet" type="text/css" media="all"/>
+    <link href="../admin/css/customizations.css" rel="stylesheet" type="text/css" media="all" />
 <%
 	Object param = session.getAttribute("authenticated");
 	if (param != null && (Boolean) param) {