From 9c595c10b0c76c0c665fcdea19e89b05c7554fe8 Mon Sep 17 00:00:00 2001 From: Rene Meier Date: Fri, 8 Nov 2024 20:08:48 +0100 Subject: [PATCH] Convert to Faces 4, remove inline styles and move them to style.css --- .../webapp/includes/dialogs/aboutDialog.xhtml | 25 ++++---- .../dialogs/downloadCandidatesDialog.xhtml | 6 +- .../dialogs/downloadParametersDialog.xhtml | 57 +++++++++---------- .../processCandidatesProgressDialog.xhtml | 47 ++++++++------- .../retrieveCandidatesProgressDialog.xhtml | 39 +++++++------ .../src/main/webapp/resources/css/style.css | 5 +- 6 files changed, 86 insertions(+), 93 deletions(-) diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/aboutDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/aboutDialog.xhtml index 214c5fa..a7fac80 100644 --- a/MetFragWeb/src/main/webapp/includes/dialogs/aboutDialog.xhtml +++ b/MetFragWeb/src/main/webapp/includes/dialogs/aboutDialog.xhtml @@ -1,21 +1,18 @@ - + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + - - - - - + + + + + diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/downloadCandidatesDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/downloadCandidatesDialog.xhtml index c371f29..c092416 100644 --- a/MetFragWeb/src/main/webapp/includes/dialogs/downloadCandidatesDialog.xhtml +++ b/MetFragWeb/src/main/webapp/includes/dialogs/downloadCandidatesDialog.xhtml @@ -1,15 +1,13 @@ - - + diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/downloadParametersDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/downloadParametersDialog.xhtml index b3f0e43..580dbd6 100644 --- a/MetFragWeb/src/main/webapp/includes/dialogs/downloadParametersDialog.xhtml +++ b/MetFragWeb/src/main/webapp/includes/dialogs/downloadParametersDialog.xhtml @@ -1,37 +1,34 @@ - + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/processCandidatesProgressDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/processCandidatesProgressDialog.xhtml index b053ba2..e644e00 100644 --- a/MetFragWeb/src/main/webapp/includes/dialogs/processCandidatesProgressDialog.xhtml +++ b/MetFragWeb/src/main/webapp/includes/dialogs/processCandidatesProgressDialog.xhtml @@ -1,32 +1,31 @@ - - - - - -
- - -
- - - -
- - - - - + + + +
+ + +
+ + + +
+ + + - diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/retrieveCandidatesProgressDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/retrieveCandidatesProgressDialog.xhtml index 1282f4d..9f6bdd6 100644 --- a/MetFragWeb/src/main/webapp/includes/dialogs/retrieveCandidatesProgressDialog.xhtml +++ b/MetFragWeb/src/main/webapp/includes/dialogs/retrieveCandidatesProgressDialog.xhtml @@ -1,28 +1,27 @@ - - - - - -
- - - -
- - - - + + + +
+ + + +
+ + + - diff --git a/MetFragWeb/src/main/webapp/resources/css/style.css b/MetFragWeb/src/main/webapp/resources/css/style.css index 90c17bb..228f5fa 100644 --- a/MetFragWeb/src/main/webapp/resources/css/style.css +++ b/MetFragWeb/src/main/webapp/resources/css/style.css @@ -253,7 +253,6 @@ html,body { .ui-dialog-title { font-family: 'Lato', sans-serif; font-size: 15px; - font-weight: normal; } .firstColumnButton { @@ -598,4 +597,8 @@ html,body { .scoreDetailsText { word-wrap: break-word; +} + +.centered-text { + text-align: center; } \ No newline at end of file