Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate Vocabulary styles into Chooser #169

Merged
merged 5 commits into from
May 25, 2020
Merged

Conversation

obulat
Copy link
Contributor

@obulat obulat commented May 24, 2020

Fixes

Fixes #160 by @annatuma
Fixes #161 by @annatuma

Description

This PR updates Vocabulary package, adds a Vocabulary Footer section and the new Chooser logo.
ChooserLogo
VocabularyFooter

Screenshots

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the master branch of the repository.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no
    visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

obulat added 5 commits May 24, 2020 21:54
Header is renamed to HeaderSection according to the vue recommendation that component names should consist of two words, and to be consistent with cccatalog codebase.
Footer is renamed to FooterSection, and styles copied from CCCatalog, as Vue Vocabulary doesn't currently have a footer component.
Styles in styles.scss were created as temporary before the vocabulary package is ready. Since the styles for headings are available in vocabulary package now, they were removed from the styles.scss.
Before the Vocabulary package was available, 'ha' and 'hb' styles were applied to headings. Now they are replaced with 'b-heading' for 'hb' headings, 'a-heading' styles are applied by default.
Copy link
Member

@akmadian akmadian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me :) Merging!

@akmadian akmadian merged commit 5f14a68 into master May 25, 2020
@akmadian akmadian deleted the vocabulary-integration branch May 25, 2020 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Footer on Chooser to Vocabulary Update CC Chooser product logo
2 participants