From 641dba40e90c408d2e0c6f4354fdb667b0681a2f Mon Sep 17 00:00:00 2001 From: David Mendez <dmendez@ebi.ac.uk> Date: Mon, 25 Oct 2021 15:58:51 +0100 Subject: [PATCH] Eubopen: fix some accessibility details (titles, color contrast) --- components/footer/LicenseAndPrivacy.vue | 5 +- .../target/NameAndClassification.vue | 2 +- pages/accessibility.vue | 9 ++- pages/acknowledgement.vue | 77 +++++++++---------- pages/disclaimer.vue | 19 +++-- pages/index.vue | 4 +- pages/privacy_notice.vue | 28 +++---- web-components-submodule | 2 +- 8 files changed, 72 insertions(+), 74 deletions(-) diff --git a/components/footer/LicenseAndPrivacy.vue b/components/footer/LicenseAndPrivacy.vue index 2b2b729..74128b5 100644 --- a/components/footer/LicenseAndPrivacy.vue +++ b/components/footer/LicenseAndPrivacy.vue @@ -4,9 +4,8 @@ <div class="d-flex justify-center text-container"> <span class="text-body-2 text-justify"> Website hosted by the - <a target="_blank" href="https://www.ebi.ac.uk/">EMBL-EBI</a>, licensed - under the - <a target="_blank" href="https://www.apache.org/licenses/LICENSE-2.0" + <a href="https://www.ebi.ac.uk/">EMBL-EBI</a>, licensed under the + <a href="https://www.apache.org/licenses/LICENSE-2.0" >Apache License, Version 2.0.</a > | diff --git a/components/report_cards/target/NameAndClassification.vue b/components/report_cards/target/NameAndClassification.vue index 0693576..5f7263b 100644 --- a/components/report_cards/target/NameAndClassification.vue +++ b/components/report_cards/target/NameAndClassification.vue @@ -57,7 +57,7 @@ <v-row class="details-row" dense> <v-col cols="12"> <div class="d-flex align-center flex-column flex-md-row"> - <b>Protein Target Classification:</b> + <b>Protein Target Classifications:</b> <ProteinTargetClassification :protein-classifications=" diff --git a/pages/accessibility.vue b/pages/accessibility.vue index 6e3f140..c2cdafe 100644 --- a/pages/accessibility.vue +++ b/pages/accessibility.vue @@ -1,9 +1,10 @@ <template> - <v-card tile flat> - <v-card-title> Accessibility </v-card-title> + <div> + <h1 class="font-weight-light">Accessibility</h1> <v-divider /> - <v-card-text> </v-card-text> - </v-card> + <br /> + <p class="text-justify">Accessibility statement coming soon...</p> + </div> </template> <script> diff --git a/pages/acknowledgement.vue b/pages/acknowledgement.vue index 2d317f6..d8f0658 100644 --- a/pages/acknowledgement.vue +++ b/pages/acknowledgement.vue @@ -1,44 +1,43 @@ <template> - <v-card tile flat> - <v-card-title> Acknowledgement </v-card-title> + <div> + <h1 class="font-weight-light">Acknoledgement</h1> <v-divider /> - <v-card-text> - <p class="text-justify"> - The EUbOPEN project has received funding from the Innovative Medicines - Initiative 2 Joint Undertaking (JU) under grant agreement No 875510. The - JU receives support from the European Union’s Horizon 2020 research and - innovation programme and EFPIA and Ontario Institute for Cancer - Research, Royal Institution for the Advancement of Learning McGill - University, Kungliga Tekniska Hoegskolan, Diamond Light Source Limited. - </p> - <br /> - <div> - <v-row> - <v-spacer /> - <template v-for="partner in partners"> - <v-col - :key="partner.id" - cols="3" - sm="2" - md="1" - class="d-flex justify-center align-center" - > - <a :href="partner.linkTo" class="logo-link"> - <v-img - :src=" - require(`@/static/img/partnerLogos/${partner.logoFilename}`) - " - :alt="partner.alt" - /> - </a> - </v-col> - <v-spacer :key="`${partner.id}-spacer`" /> - </template> - <v-spacer /> - </v-row> - </div> - </v-card-text> - </v-card> + <br /> + <p class="text-justify"> + The EUbOPEN project has received funding from the Innovative Medicines + Initiative 2 Joint Undertaking (JU) under grant agreement No 875510. The + JU receives support from the European Union’s Horizon 2020 research and + innovation programme and EFPIA and Ontario Institute for Cancer Research, + Royal Institution for the Advancement of Learning McGill University, + Kungliga Tekniska Hoegskolan, Diamond Light Source Limited. + </p> + <br /> + <div> + <v-row> + <v-spacer /> + <template v-for="partner in partners"> + <v-col + :key="partner.id" + cols="3" + sm="2" + md="1" + class="d-flex justify-center align-center" + > + <a :href="partner.linkTo" class="logo-link"> + <v-img + :src=" + require(`@/static/img/partnerLogos/${partner.logoFilename}`) + " + :alt="partner.alt" + /> + </a> + </v-col> + <v-spacer :key="`${partner.id}-spacer`" /> + </template> + <v-spacer /> + </v-row> + </div> + </div> </template> <script> diff --git a/pages/disclaimer.vue b/pages/disclaimer.vue index b559e7d..53976ff 100644 --- a/pages/disclaimer.vue +++ b/pages/disclaimer.vue @@ -1,15 +1,14 @@ <template> - <v-card tile flat> - <v-card-title> Disclaimer </v-card-title> + <div> + <h1 class="font-weight-light">Disclaimer</h1> <v-divider /> - <v-card-text> - <p class="text-justify"> - This communication reflects the views of the authors and neither IMI nor - the European Union, EFPIA or any Associated Partners are liable for any - use that may be made of the information contained herein. - </p> - </v-card-text> - </v-card> + <br /> + <p class="text-justify"> + This communication reflects the views of the authors and neither IMI nor + the European Union, EFPIA or any Associated Partners are liable for any + use that may be made of the information contained herein. + </p> + </div> </template> <script> diff --git a/pages/index.vue b/pages/index.vue index 75a5d8e..eacc9d5 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -20,12 +20,12 @@ </p> <div class="d-flex justify-space-between flex-wrap align-center"> <div class="buttons-container"> - <v-btn depressed color="primary" nuxt to="/compound/browse/state"> + <v-btn depressed color="primary" nuxt to="/compound/browse"> Explore all Compounds </v-btn> </div> <div class="buttons-container"> - <v-btn depressed color="primary" nuxt to="/target/browse/state"> + <v-btn depressed color="primary" nuxt to="/target/browse"> Explore all Targets </v-btn> </div> diff --git a/pages/privacy_notice.vue b/pages/privacy_notice.vue index 2edc10b..2b016e3 100644 --- a/pages/privacy_notice.vue +++ b/pages/privacy_notice.vue @@ -1,19 +1,19 @@ <template> - <v-card tile flat> - <v-card-title> Privacy Notice </v-card-title> + <div> + <h1 class="font-weight-light">Privacy Notice</h1> <v-divider /> - <v-card-text class="yellow lighten-4"> - <p class="text-justify"> - Click <a href="/DraftPrivacyNotice.pdf">here</a> to download the DRAFT - of the privacy notice. Ths draft is generated by the EBI Data Protection - Engine (DPE). Once we agree on a final version, this page will be - generated with the data generated by the DPE. - </p> - <p class="text-justify"> - The PDF file was generated by printing the current record in the DPE. - </p> - </v-card-text> - </v-card> + <br /> + + <p class="text-justify"> + Click <a href="/DraftPrivacyNotice.pdf">here</a> to download the DRAFT of + the privacy notice. Ths draft is generated by the EBI Data Protection + Engine (DPE). Once we agree on a final version, this page will be + generated with the data generated by the DPE. + </p> + <p class="text-justify"> + The PDF file was generated by printing the current record in the DPE. + </p> + </div> </template> <script> diff --git a/web-components-submodule b/web-components-submodule index df96383..93bc3bc 160000 --- a/web-components-submodule +++ b/web-components-submodule @@ -1 +1 @@ -Subproject commit df9638341fc071673139879290074b2c495f4f5f +Subproject commit 93bc3bc56ced4381eb5c27947817ba0238fdd958 -- GitLab