Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-coremodules/org.eclipse.openk-coremodules.contactBaseData.frontend into KON-593-Bugs-Labels
diff --git a/angular.json b/angular.json
index 51b699f..9f999ed 100644
--- a/angular.json
+++ b/angular.json
@@ -22,7 +22,8 @@
"assets": [
"src/assets",
"src/favicon.ico",
- "src/service-worker.js",
+ "src/service-worker.js",
+ "src/WEB-INF",
{
"glob": "**/*",
"input": "config",
@@ -112,6 +113,7 @@
"src/assets",
"src/favicon.ico",
"src/service-worker.js",
+ "src/WEB-INF",
{
"glob": "**/*",
"input": "config",
diff --git a/package.json b/package.json
index f2edf8c..9644923 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
"sy-post-build": "node hooks/post-build.js",
"sy-build": "npm run sy-pre-build && ng build --base-href /contactdatabase/ --prod --aot && npm run sy-post-build",
"sy-build-noprod": "npm run sy-pre-build && ng build --base-href /contactdatabase/ && npm run sy-post-build",
+ "sy-build-prod": "npm run sy-pre-build && ng build --prod --aot --base-href /contactdatabase/ && npm run sy-post-build",
"start-in-docker": "npm run sy-pre-start && ng serve --optimization=false --vendor-chunk --common-chunk --host=0.0.0.0 --disableHostCheck=true --proxy-config proxy-docker.conf.json",
"start-in-docker-unsecure": "npm run sy-pre-start && ng serve --optimization=false --vendor-chunk --common-chunk --host=0.0.0.0 --disableHostCheck=true --proxy-config proxy-docker-unsecure.conf.json"
},
diff --git a/src/WEB-INF/web.xml b/src/WEB-INF/web.xml
new file mode 100644
index 0000000..94ac5db
--- /dev/null
+++ b/src/WEB-INF/web.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
+
+ <error-page>
+ <error-code>404</error-code>
+ <location>/index.html</location>
+ </error-page>
+
+</web-app>
diff --git a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.scss b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.scss
index a2ba532..4b7805a 100644
--- a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.scss
+++ b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.scss
@@ -54,11 +54,11 @@
}
.syncAlertMessage {
position: absolute;
- right: 0px;
top: 0px;
- margin: 20px;
+ left: 50vw;
+ margin: 20px 20px 20px 0;
padding: 14px;
- font-size: 13px;
+ font-size: 20px;
background-color: rgba(255, 178, 0, 0.2);
border: 1px solid rgba(0, 0, 0, 0.15);
}
