From d653aacc17107f02c0febdf756dcfcd305f3a3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Garc=C3=ADa?= Date: Fri, 8 Nov 2024 12:19:03 +0100 Subject: [PATCH] Fix failing unit tests. Refactor variables used in the view and global styles. --- .../catalog/components/search/mdview/partials/contact.html | 4 +++- web-ui/src/main/resources/catalog/style/gn_metadata.less | 1 + web-ui/src/main/resources/catalog/style/gn_variables.less | 6 ++++++ .../catalog/views/default/less/gn_print_default.less | 1 + .../catalog/views/default/less/gn_result_default.less | 1 + .../main/resources/catalog/views/default/less/gn_view.less | 5 +---- 6 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 web-ui/src/main/resources/catalog/style/gn_variables.less diff --git a/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html b/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html index 8cf99de80b2..e6f41c63bf2 100644 --- a/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html +++ b/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html @@ -76,7 +76,9 @@
- + {{c.organisation}} diff --git a/web-ui/src/main/resources/catalog/style/gn_metadata.less b/web-ui/src/main/resources/catalog/style/gn_metadata.less index 12e628e7eb5..b9e87f88f08 100644 --- a/web-ui/src/main/resources/catalog/style/gn_metadata.less +++ b/web-ui/src/main/resources/catalog/style/gn_metadata.less @@ -1,4 +1,5 @@ @import "gn_search.less"; +@import "gn_variables.less"; .panel-body .gn-metadata-view { width: 100%; diff --git a/web-ui/src/main/resources/catalog/style/gn_variables.less b/web-ui/src/main/resources/catalog/style/gn_variables.less new file mode 100644 index 00000000000..7d663982363 --- /dev/null +++ b/web-ui/src/main/resources/catalog/style/gn_variables.less @@ -0,0 +1,6 @@ +// variables used in custom styles +// ------------------------------- + +@gn-spacing: 10px; +@gn-spacing-sm: 5px; +@gn-spacing-lg: 15px; diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_print_default.less b/web-ui/src/main/resources/catalog/views/default/less/gn_print_default.less index 57c17e3a2b9..01eecbe8eef 100644 --- a/web-ui/src/main/resources/catalog/views/default/less/gn_print_default.less +++ b/web-ui/src/main/resources/catalog/views/default/less/gn_print_default.less @@ -1,4 +1,5 @@ @import "../../../lib/style/bootstrap/less/variables.less"; +@import "../../../lib/style/bootstrap/less/mixins/grid.less"; @import "gn_view.less"; // special print classes diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_result_default.less b/web-ui/src/main/resources/catalog/views/default/less/gn_result_default.less index e93f8db3c78..27141087a65 100644 --- a/web-ui/src/main/resources/catalog/views/default/less/gn_result_default.less +++ b/web-ui/src/main/resources/catalog/views/default/less/gn_result_default.less @@ -1,4 +1,5 @@ @import "../../../style/gn_search.less"; +@import "../../../style/gn_variables.less"; // variables for manipulating the theme @import "gn_variables_default.less"; // must be last diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_view.less b/web-ui/src/main/resources/catalog/views/default/less/gn_view.less index 7d2cbf3c9cc..65696fb2894 100644 --- a/web-ui/src/main/resources/catalog/views/default/less/gn_view.less +++ b/web-ui/src/main/resources/catalog/views/default/less/gn_view.less @@ -1,13 +1,10 @@ @import "../../../lib/style/bootstrap/less/variables.less"; +@import "../../../style/gn_variables.less"; /* Defined here any custom style for the view which has to be applied for all apps (ie. admin, search, login, editor). */ -@gn-spacing: 10px; -@gn-spacing-sm: 5px; -@gn-spacing-lg: 15px; - // padding .gn-padding-top { padding-top: @gn-spacing !important;