Merge branch 'nightlybuild' into feature/ms_proxy_before_refactoring

# Conflicts:
#	basicConfig/templates/error_message.html
#	connector/src/main/resources/specific_eIDAS_connector.beans.xml
#	connector/src/test/resources/config/junit_config_1_springboot.properties
#	connector/src/test/resources/config/junit_config_2_springboot.properties
#	connector/src/test/resources/config/templates/countrySelection.html
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
#	pom.xml

1 files changed, 184 insertions, 136 deletions

diff --git a/basicConfig/webcontent/css/css_country.css b/basicConfig/webcontent/css/css_country.css
index 4091955f..e193126c 100644
--- a/basicConfig/webcontent/css/css_country.css
+++ b/basicConfig/webcontent/css/css_country.css
@@ -1,137 +1,185 @@
 @charset "utf-8";
-    body {
-         background-image: none;
-	       margin:		0px;
-      	 font-family:	"Helvetica Neue", Helvetica, Arial, sans-serif;
-    }
-    #page {
-        padding-top: 2%;
-        padding-left: 10%;
-    }
-    
-    #country {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        align-items: center;
-    }
-
-    .block {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        cursor: pointer;
-        text-decoration: none;
-        padding-right:2%;
-        width: 250px;
-    }
-    
-    .countryimage {
-        width:50px;
-        height:50px;
-        padding-right: 2%;
-        padding-bottom: 4%;
-    }
-
-    input[type=button], input[type=submit], input[type=reset] {
-       display:flex;
-        background-color:transparent;
-        border:none;
-        color: black;
-        text-decoration: none;
-        cursor: pointer;  
-    }
-    #testEnvironment {
-        border: none;
-        color: black;
-        padding: 10px 20px;
-        text-decoration: none;
-        margin: 4px 2px;
-        height: 3%;
-        display: inline-block;
-        vertical-align: middle;
-        width: 40%;  
-    }
-    #button{
-        background-color: transparent;
-        border:none;
-    }
-    div.header { 
-	      background-color: #e9ecef;
-	      padding-top: 28px;
-      	padding-left: 137px;
-      	padding-right: 137px;
-      	padding-bottom: 12px;
-    }
-    div.titlebar { 
-        padding: 0px;
-    }
-    div.titlebar div { 
-    }
-    .hidden {
-        display: none;
-    }
-    ul.nav_oben {
-      	padding: 0px;
-      	margin: 0px;
-      	text-align: right;
-      	text-transform: uppercase;
-    }
-    li {
-      	display: inline-block;
-    }	
-    div.header a {
-      	text-decoration: none;
-      	color: black;
-    }
-    a {
-      	text-decoration: none;
-      	color: #a22c1c;
-    }
-    .content {
-      	padding-left: 137px;
-        padding-right: 137px;
-    }
-    div.subtitle h1 {
-      	padding: 0px;
-      	margin: 0px;
-      	font-size: 130%;
-      	align: right;
-    }
-    div.subtitle h2 {
-      	padding: 0px;
-      	margin: 0px;
-      	font-size: 115%;
-    }
-    footer {
-        position: fixed;
-        left: 0;
-        padding-left: 137px;
-        padding-right: 137px;
-        padding-top: 1em;
-        bottom: 0;
-        width: 100%;
-        height: 2em;
-        background-color: rgb(162,44,28);
-        color: white;
-    }
-    .float {
-      	float: left;
-    }
-    .floatright {
-      	float: right;
-    }
-    .copyright {
-      	width: 66%;
-      	font-size: 80%;
-    }
-    #countries,#country {
-      	padding-bottom: 40px; 
-    }
-    input[type=submit] {
-      	width: inherit;
-        /*	text-align: left; */
-    }
-    form {
-      	justify-content: center;
-    }
\ No newline at end of file
+body {
+    background-image: none;
+    margin: 0px;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+#page {
+    padding-top: 2%;
+    padding-left: 10%;
+}
+
+#country {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
+}
+
+#matchingError {
+    border: 2px solid rgb(162, 44, 28);
+    padding: 1em;
+    width: 80%;
+    margin-top: 2em;
+    margin-bottom: 2em;
+}
+
+.block {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    cursor: pointer;
+    text-decoration: none;
+    padding-right: 2%;
+    width: 250px;
+    justify-content: center;    
+}
+
+.countryimage {
+    width: 50px;
+    height: 50px;
+    padding-right: 2%;
+    padding-bottom: 4%;
+}
+
+input[type=button], input[type=submit], input[type=reset] {
+    display: flex;
+    background-color: transparent;
+    border: none;
+    color: black;
+    text-decoration: none;
+    cursor: pointer;
+}
+
+#testEnvironment {
+    border: none;
+    color: black;
+    padding: 10px 20px;
+    text-decoration: none;
+    margin: 4px 2px;
+    height: 3%;
+    display: inline-block;
+    vertical-align: middle;
+    width: 40%;
+}
+
+#button {
+    background-color: transparent;
+    border: none;
+}
+
+.primaryButton {
+    height: 4em;
+}
+
+.singleButton {
+    padding-left: 2em;
+}
+
+.mainDescription {
+    width: 80%;
+}
+
+
+div.mainDescription li {
+  display: list-item;
+  
+}
+
+div.header {
+    background-color: #e9ecef;
+    padding-top: 28px;
+    padding-left: 137px;
+    padding-right: 137px;
+    padding-bottom: 12px;
+}
+
+div.titlebar {
+    padding: 0px;
+}
+
+div.titlebar div {
+}
+
+.hidden {
+    display: none;
+}
+
+ul.nav_oben {
+    padding: 0px;
+    margin: 0px;
+    text-align: right;
+    text-transform: uppercase;
+}
+
+li {
+    display: inline-block;
+}
+
+div.header a {
+    text-decoration: none;
+    color: black;
+}
+
+a {
+    text-decoration: none;
+    color: #a22c1c;
+}
+
+.content {
+    padding-left: 137px;
+    padding-right: 137px;
+}
+
+div.subtitle h1 {
+    padding: 0px;
+    margin: 0px;
+    font-size: 130%;
+    align: right;
+}
+
+div.subtitle h2 {
+    padding: 0px;
+    margin: 0px;
+    font-size: 115%;
+}
+
+footer {
+    position: fixed;
+    left: 0;
+    padding-left: 137px;
+    padding-right: 137px;
+    padding-top: 1em;
+    bottom: 0;
+    width: 100%;
+    height: 2em;
+    background-color: rgb(162, 44, 28);
+    color: white;
+}
+
+.float {
+    float: left;
+}
+
+.floatright {
+    float: right;
+}
+
+.copyright {
+    width: 66%;
+    font-size: 80%;
+}
+
+#countries, #country {
+    padding-bottom: 40px;
+}
+
+input[type=submit] {
+    width: inherit;
+    /*	text-align: left; */
+}
+
+form {
+    justify-content: center;
+}