Skip to content

Commit

Permalink
Merge pull request #8 from blockchain-certificates/feat/verify-other-…
Browse files Browse the repository at this point in the history
…footer

Feat/verify other footer
  • Loading branch information
Julien Fraichot authored Sep 19, 2018
2 parents ef9718a + 8b2015f commit 975f5fd
Show file tree
Hide file tree
Showing 21 changed files with 24 additions and 30 deletions.
2 changes: 0 additions & 2 deletions src/blockcerts-verifier/BlockcertsVerifier.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -47,7 +46,6 @@ class BlockcertsVerifier extends LitElement {
? html`<buv-full-certificate></buv-full-certificate>`
: html`<buv-card-certificate></buv-card-certificate>`
}
<buv-verify-other-certificate></buv-verify-other-certificate>
<buv-verification-modal></buv-verification-modal>
</section>
${Footer()}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import {html} from '@polymer/lit-element';
export default html`<style>.buv-o-link{color:#031532}.buv-o-small-text{font-size:12px}.buv-o-large-text{font-size:15px;line-height:20px}.buv-c-drag-and-drop__droparea{z-index:100;background-color:rgba(0,0,0,0.1);display:none;position:absolute;top:0;left:0;width:100%;height:100%}.buv-c-drag-and-drop__droparea.is-active{display:block}
export default html`<style>.buv-o-small-text{font-size:12px}.buv-o-large-text{font-size:15px;line-height:20px}.buv-c-drag-and-drop__droparea{z-index:100;background-color:rgba(0,0,0,0.1);display:none;position:absolute;top:0;left:0;width:100%;height:100%}.buv-c-drag-and-drop__droparea.is-active{display:block}
</style>`;
2 changes: 1 addition & 1 deletion src/components/atoms/FileUpload/FileUpload.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function FileUpload ({ onChange = () => {}, hideFileUpload = fals

return html`
${CSS}
<label for='buv-json-file-upload' class='buv-c-file-upload buv-o-link buv-o-small-text'>
<label for='buv-json-file-upload' class='buv-o-link buv-o-link--contrast buv-o-small-text'>
<span class='buv-o-link__text--underline'>Choose JSON file</span>
<input
type='file'
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions src/components/atoms/FileUpload/_components.file-upload.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
@import '../../../shared-styles/objects.link';
@import '../../../shared-styles/objects.text';

.buv-c-file-upload {
span {
color: #fff;
}
}

@import '../../../shared-styles/utils.a11y';

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function VerifyOtherCertificateLink ({ onClick = () => {}, isVisi

return html`
${CSS}
<a onclick='${onClick}' class='buv-o-small-text buv-o-link buv-c-verify-other-certificate buv-qa-verify-other-certificate'>
<a onclick='${onClick}' class='buv-o-small-text buv-o-link buv-o-link--contrast buv-c-verify-other-certificate buv-qa-verify-other-certificate'>
<span class='buv-o-link__text--underline'>Verify another record</span>
</a>
`;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import {html} from '@polymer/lit-element';
export default html`<style>.buv-o-link{cursor:pointer;text-decoration:none}.buv-o-link__text--underline{border-bottom:1px solid}.buv-o-link{color:#031532}.buv-o-small-text{font-size:12px}.buv-o-large-text{font-size:15px;line-height:20px}.buv-c-verify-other-certificate{display:block;margin-top:20px}
export default html`<style>.buv-o-link{cursor:pointer;text-decoration:none;color:#031532}.buv-o-link--contrast{color:#fff}.buv-o-link__text--underline{border-bottom:1px solid}.buv-o-small-text{font-size:12px}.buv-o-large-text{font-size:15px;line-height:20px}.buv-c-verify-other-certificate{display:block}
</style>`;
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@

.buv-c-verify-other-certificate {
display: block;
margin-top: 20px;
}
2 changes: 2 additions & 0 deletions src/components/molecules/Footer/Footer.js
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -14,6 +15,7 @@ const Footer = (forceInPlace = false) => {
<footer class$='${classes}'>
<section>
<buv-file-upload></buv-file-upload>
<buv-verify-other-certificate></buv-verify-other-certificate>
</section>
${BlockcertsLogo()}
</footer>`;
Expand Down
Loading

0 comments on commit 975f5fd

Please sign in to comment.