From 61a7c149113369b0293874e06e5daec65679b179 Mon Sep 17 00:00:00 2001 From: Julien Fraichot Date: Wed, 19 Sep 2018 14:33:46 +0200 Subject: [PATCH 1/4] feat(VerifyOtherCertificateLink): move link to footer --- src/blockcerts-verifier/BlockcertsVerifier.js | 2 -- src/components/molecules/Footer/Footer.js | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blockcerts-verifier/BlockcertsVerifier.js b/src/blockcerts-verifier/BlockcertsVerifier.js index fe5a966a3..901252c6f 100644 --- a/src/blockcerts-verifier/BlockcertsVerifier.js +++ b/src/blockcerts-verifier/BlockcertsVerifier.js @@ -7,7 +7,6 @@ import ErrorMessage from '../components/atoms/ErrorMessage/'; import CSS from '../components/atoms/GlobalStylesheet'; import '../components/atoms/CardCertificate'; import '../components/organisms/FullCertificate'; -import '../components/atoms/VerifyOtherCertificateLink'; import Footer from '../components/molecules/Footer/Footer'; import { APICamelCase } from '../models/API'; import * as DISPLAY_MODE from '../constants/displayMode'; @@ -47,7 +46,6 @@ class BlockcertsVerifier extends LitElement { ? html`` : html`` } - ${Footer()} diff --git a/src/components/molecules/Footer/Footer.js b/src/components/molecules/Footer/Footer.js index a15c9be80..6b0c3ff81 100644 --- a/src/components/molecules/Footer/Footer.js +++ b/src/components/molecules/Footer/Footer.js @@ -1,4 +1,5 @@ import '../../atoms/FileUpload'; +import '../../atoms/VerifyOtherCertificateLink'; import { html } from '@polymer/lit-element'; import CSS from './_components.footer-css'; import BlockcertsLogo from '../../atoms/BlockcertsLogo/BlockcertsLogo'; @@ -14,6 +15,7 @@ const Footer = (forceInPlace = false) => { `; From 653d6ff306795fc1d090ad24f3ce73a34955a3bf Mon Sep 17 00:00:00 2001 From: Julien Fraichot Date: Wed, 19 Sep 2018 14:35:33 +0200 Subject: [PATCH 2/4] style(CSS): properly organize CSS --- .../atoms/CardCertificate/_components.card-css.js | 2 +- .../_components.certificate-details-css.js | 2 +- .../atoms/DragAndDrop/_components.drag-and-drop-css.js | 2 +- .../atoms/FileUpload/_components.file-upload-css.js | 2 +- .../_components.final-verification-step-css.js | 2 +- .../FullCertificateV1/_components.full-certificate-css.js | 2 +- .../_components.verify-other-certificate-css.js | 2 +- src/components/molecules/Footer/_components.footer-css.js | 2 +- .../molecules/Metadata/_components.metadata-css.js | 2 +- .../molecules/SocialShare/_components.social-share-css.js | 2 +- .../VerificationStep/_components.verification-step-css.js | 2 +- .../FullCertificate/_components.full-certificate-css.js | 2 +- .../organisms/SubstepsList/_components.substeps-list-css.js | 2 +- src/shared-styles/_objects.link.scss | 3 +++ src/shared-styles/_objects.text.scss | 6 ------ 15 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/components/atoms/CardCertificate/_components.card-css.js b/src/components/atoms/CardCertificate/_components.card-css.js index d51ed56e2..9470e7f85 100644 --- a/src/components/atoms/CardCertificate/_components.card-css.js +++ b/src/components/atoms/CardCertificate/_components.card-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/atoms/CertificateDetails/_components.certificate-details-css.js b/src/components/atoms/CertificateDetails/_components.certificate-details-css.js index 89944652d..339f81b34 100644 --- a/src/components/atoms/CertificateDetails/_components.certificate-details-css.js +++ b/src/components/atoms/CertificateDetails/_components.certificate-details-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/atoms/DragAndDrop/_components.drag-and-drop-css.js b/src/components/atoms/DragAndDrop/_components.drag-and-drop-css.js index 8272455c7..d8f233f20 100644 --- a/src/components/atoms/DragAndDrop/_components.drag-and-drop-css.js +++ b/src/components/atoms/DragAndDrop/_components.drag-and-drop-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/atoms/FileUpload/_components.file-upload-css.js b/src/components/atoms/FileUpload/_components.file-upload-css.js index 2ddfc4412..eb90e0d0b 100644 --- a/src/components/atoms/FileUpload/_components.file-upload-css.js +++ b/src/components/atoms/FileUpload/_components.file-upload-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/atoms/FinalVerificationStep/_components.final-verification-step-css.js b/src/components/atoms/FinalVerificationStep/_components.final-verification-step-css.js index d36ef4a03..d34933bff 100644 --- a/src/components/atoms/FinalVerificationStep/_components.final-verification-step-css.js +++ b/src/components/atoms/FinalVerificationStep/_components.final-verification-step-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/atoms/FullCertificateV1/_components.full-certificate-css.js b/src/components/atoms/FullCertificateV1/_components.full-certificate-css.js index bf0098eef..de71de0ce 100644 --- a/src/components/atoms/FullCertificateV1/_components.full-certificate-css.js +++ b/src/components/atoms/FullCertificateV1/_components.full-certificate-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate-css.js b/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate-css.js index 38ee1124a..53bb23390 100644 --- a/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate-css.js +++ b/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/molecules/Footer/_components.footer-css.js b/src/components/molecules/Footer/_components.footer-css.js index 6fc2c55de..3eaa65bc6 100644 --- a/src/components/molecules/Footer/_components.footer-css.js +++ b/src/components/molecules/Footer/_components.footer-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/molecules/Metadata/_components.metadata-css.js b/src/components/molecules/Metadata/_components.metadata-css.js index 71e751a08..9a21c1785 100644 --- a/src/components/molecules/Metadata/_components.metadata-css.js +++ b/src/components/molecules/Metadata/_components.metadata-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/molecules/SocialShare/_components.social-share-css.js b/src/components/molecules/SocialShare/_components.social-share-css.js index 971ce9a07..379d50744 100644 --- a/src/components/molecules/SocialShare/_components.social-share-css.js +++ b/src/components/molecules/SocialShare/_components.social-share-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/molecules/VerificationStep/_components.verification-step-css.js b/src/components/molecules/VerificationStep/_components.verification-step-css.js index ca63ff5a6..0f407ac8f 100644 --- a/src/components/molecules/VerificationStep/_components.verification-step-css.js +++ b/src/components/molecules/VerificationStep/_components.verification-step-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/organisms/FullCertificate/_components.full-certificate-css.js b/src/components/organisms/FullCertificate/_components.full-certificate-css.js index 5fc489718..e94df54d4 100644 --- a/src/components/organisms/FullCertificate/_components.full-certificate-css.js +++ b/src/components/organisms/FullCertificate/_components.full-certificate-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/organisms/SubstepsList/_components.substeps-list-css.js b/src/components/organisms/SubstepsList/_components.substeps-list-css.js index c5dc3e5e3..817360f98 100644 --- a/src/components/organisms/SubstepsList/_components.substeps-list-css.js +++ b/src/components/organisms/SubstepsList/_components.substeps-list-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/shared-styles/_objects.link.scss b/src/shared-styles/_objects.link.scss index 6f2a34da3..64669b8b4 100644 --- a/src/shared-styles/_objects.link.scss +++ b/src/shared-styles/_objects.link.scss @@ -1,6 +1,9 @@ +@import './settings.variables'; + .buv-o-link { cursor: pointer; text-decoration: none; + color: $fontColor; } .buv-o-link__text--underline { diff --git a/src/shared-styles/_objects.text.scss b/src/shared-styles/_objects.text.scss index 381e1d8d9..33bc13524 100644 --- a/src/shared-styles/_objects.text.scss +++ b/src/shared-styles/_objects.text.scss @@ -1,9 +1,3 @@ -@import './settings.variables'; - -.buv-o-link { - color: $fontColor; -} - .buv-o-small-text { font-size: 12px; } From 8d3e858ebe96cbdd80a34a0483d890f6563cdffb Mon Sep 17 00:00:00 2001 From: Julien Fraichot Date: Wed, 19 Sep 2018 14:37:07 +0200 Subject: [PATCH 3/4] feat(VerifyOtherCertificateLink): ensure visibility in Footer --- .../VerifyOtherCertificateLink/VerifyOtherCertificateLink.js | 2 +- .../_components.verify-other-certificate-css.js | 2 +- .../_components.verify-other-certificate.scss | 1 - src/shared-styles/_objects.link.scss | 4 ++++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/atoms/VerifyOtherCertificateLink/VerifyOtherCertificateLink.js b/src/components/atoms/VerifyOtherCertificateLink/VerifyOtherCertificateLink.js index f4ffce53d..4dbb870d8 100644 --- a/src/components/atoms/VerifyOtherCertificateLink/VerifyOtherCertificateLink.js +++ b/src/components/atoms/VerifyOtherCertificateLink/VerifyOtherCertificateLink.js @@ -8,7 +8,7 @@ export default function VerifyOtherCertificateLink ({ onClick = () => {}, isVisi return html` ${CSS} - + Verify another record `; diff --git a/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate-css.js b/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate-css.js index 53bb23390..49a59bee7 100644 --- a/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate-css.js +++ b/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate-css.js @@ -1,3 +1,3 @@ import {html} from '@polymer/lit-element'; -export default html``; diff --git a/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate.scss b/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate.scss index 78bdbb899..49808b8c5 100644 --- a/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate.scss +++ b/src/components/atoms/VerifyOtherCertificateLink/_components.verify-other-certificate.scss @@ -3,5 +3,4 @@ .buv-c-verify-other-certificate { display: block; - margin-top: 20px; } diff --git a/src/shared-styles/_objects.link.scss b/src/shared-styles/_objects.link.scss index 64669b8b4..eb1fbb774 100644 --- a/src/shared-styles/_objects.link.scss +++ b/src/shared-styles/_objects.link.scss @@ -6,6 +6,10 @@ color: $fontColor; } +.buv-o-link--contrast { + color: #fff; +} + .buv-o-link__text--underline { border-bottom: 1px solid; } From feb5b1d84f72799e9ac8a843261fffc64ae0e416 Mon Sep 17 00:00:00 2001 From: Julien Fraichot Date: Wed, 19 Sep 2018 14:40:13 +0200 Subject: [PATCH 4/4] refactor(FileUpload): reuse CSS object with same purpose --- src/components/atoms/FileUpload/FileUpload.js | 2 +- .../atoms/FileUpload/_components.file-upload-css.js | 2 +- .../atoms/FileUpload/_components.file-upload.scss | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/components/atoms/FileUpload/FileUpload.js b/src/components/atoms/FileUpload/FileUpload.js index 6c2ec4d05..8345b7262 100644 --- a/src/components/atoms/FileUpload/FileUpload.js +++ b/src/components/atoms/FileUpload/FileUpload.js @@ -8,7 +8,7 @@ export default function FileUpload ({ onChange = () => {}, hideFileUpload = fals return html` ${CSS} -