diff --git a/api-webapp/src/test/resources/weights.txt b/api-webapp/src/test/resources/weights.txt index 6898e52..e51822a 100644 --- a/api-webapp/src/test/resources/weights.txt +++ b/api-webapp/src/test/resources/weights.txt @@ -1,4 +1,4 @@ -Round 2 +Round 1 Costs Player1Name=Baratou Paul Player2Name=Batailler Philippe diff --git a/server.sh b/server.sh index 6b763ce..c80e88b 100755 --- a/server.sh +++ b/server.sh @@ -1,4 +1,4 @@ #!/bin/bash export MAVEN_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005" -mvn --projects api-webapp package jetty:run +mvn -DskipTests --projects api-webapp package jetty:run diff --git a/standalone.sh b/standalone.sh index bd21b39..0fd09f5 100755 --- a/standalone.sh +++ b/standalone.sh @@ -3,4 +3,4 @@ # debug version # mvn package && java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5006 -jar application/target/pairgoth-engine.jar -mvn package && java -jar application/target/pairgoth-engine.jar +mvn -DskipTests package && java -jar application/target/pairgoth-engine.jar diff --git a/view-webapp/src/main/sass/main.scss b/view-webapp/src/main/sass/main.scss index abb1eef..e291058 100644 --- a/view-webapp/src/main/sass/main.scss +++ b/view-webapp/src/main/sass/main.scss @@ -1,7 +1,8 @@ +@import "/fonts/hornbill.css"; @import "/lib/fomantic-ui-2.9.2/semantic.min.css" layer(semantic); @layer pairgoth { - + /* general styles */ body { font-size: clamp(14px, 1rem + 1vw, 24px); @@ -24,6 +25,20 @@ } } + .logo { + font-family: Hornbill, serif; + font-weight: bolder; + font-style: normal; + } + + .centered { + text-align: center; + } + + .nobreak { + white-space: nowrap; + } + /* header, center, footer */ #header { diff --git a/view-webapp/src/main/webapp/WEB-INF/layouts/standard.html b/view-webapp/src/main/webapp/WEB-INF/layouts/standard.html index f099390..b3a3f23 100644 --- a/view-webapp/src/main/webapp/WEB-INF/layouts/standard.html +++ b/view-webapp/src/main/webapp/WEB-INF/layouts/standard.html @@ -13,7 +13,7 @@
-#translate('tournament-form.inc.html') + #translate('tournament-form.inc.html')