Skip to content
This repository has been archived by the owner on Apr 25, 2024. It is now read-only.

Deprecate vocabulary #11

Merged
merged 19 commits into from
Jan 25, 2022
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .storybook/meta/welcome.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'

import vocabularySvg from '@creativecommons/vocabulary/assets/logos/products/vocabulary.svg'
import gitHubCornerSvg from '@creativecommons/vocabulary/assets/github_corner.svg'
import vocabularySvg from "@creativecommons/cc-assets/logos/products/vocabulary.svg";
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faGithub } from '@fortawesome/free-brands-svg-icons';


<Meta title = 'Vue Vocabulary/Introduction'/>

Expand All @@ -16,9 +18,7 @@ import gitHubCornerSvg from '@creativecommons/vocabulary/assets/github_corner.sv
</p>

<a href="https://github.com/creativecommons/vue-vocabulary" class="github-corner">
<svg width="80" height="80" viewBox="0 0 250 250" xmlns="http://www.w3.org/2000/svg">
<use href={`${gitHubCornerSvg}#githubcorner`}></use>
</svg>
<FontAwesomeIcon icon={["fab", "github"]} />
</a>

<p class="text-normal">
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import i18n from '@/i18n'
import viewports from './viewport'
import order from './order'

import '@creativecommons/vocabulary/css/vocabulary.css'
import "@creativecommons/vocabulary-styles/dist/scss/vocabulary.scss";

addParameters({
options: { storySort: order },
Expand Down
2 changes: 1 addition & 1 deletion .storybook/theme.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { create } from "@storybook/theming";

import vocabularySvg from "@creativecommons/vocabulary/assets/logos/products/vocabulary.svg";
import vocabularySvg from "@creativecommons/cc-assets/logos/products/vocabulary.svg";

export default create({
// Inherit
Expand Down
214 changes: 183 additions & 31 deletions package-lock.json

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

11 changes: 9 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,15 @@
"dist/*.{js,css,map}"
],
"dependencies": {
"@creativecommons/fonts": "^2020.11.3",
"@creativecommons/vocabulary": "^2020.11.3",
"@creativecommons/cc-assets": "^0.1.0",
"@creativecommons/vocabulary-fonts": "^0.1.1",
"@creativecommons/vocabulary-styles": "^0.2.1",
"@fortawesome/fontawesome-svg-core": "^1.3.0-beta3",
"@fortawesome/free-brands-svg-icons": "^5.15.4",
"@fortawesome/free-regular-svg-icons": "^6.0.0-beta3",
"@fortawesome/free-solid-svg-icons": "^6.0.0-beta3",
"@fortawesome/react-fontawesome": "^0.1.16",
"@fortawesome/vue-fontawesome": "^2.0.6",
"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
"@vue/babel-preset-jsx": "^1.1.2",
"core-js": "^3.6.5",
Expand Down
Loading