From 5c92d4c94cfe1bbc1acdeb8c31057241450f6cdf Mon Sep 17 00:00:00 2001 From: Olga Bulat Date: Sun, 24 May 2020 21:54:04 +0300 Subject: [PATCH 1/5] Update vocabulary to v.1, import vocabulary styles --- package.json | 2 +- src/App.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 30c46aadd..fe07adfef 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "i18n:report": "vue-cli-service i18n:report -v --src src/**/*.vue --locales src/locales/**.json -o output.json" }, "dependencies": { - "@creativecommons/vocabulary": "0.0.0-alpha.30", + "@creativecommons/vocabulary": "^1.0.0-beta.14", "@creativecommons/vue-vocabulary": "0.0.0-alpha.30", "@fortawesome/fontawesome-svg-core": "^1.2.26", "@fortawesome/free-brands-svg-icons": "^5.12.0", diff --git a/src/App.vue b/src/App.vue index ac37c86ed..8615514ab 100644 --- a/src/App.vue +++ b/src/App.vue @@ -104,6 +104,7 @@ export default { @import '~buefy/src/scss/components/_icon.scss'; @import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro%3A%20400%2C600%2C700%7CRoboto+Condensed&ver=4.9.8"); + @import "@creativecommons/vocabulary/scss/vocabulary.scss"; #app { -webkit-font-smoothing: antialiased; From 37e90161bf5663b86ec0c0a18e6388eaf51c893f Mon Sep 17 00:00:00 2001 From: Olga Bulat Date: Sun, 24 May 2020 22:26:05 +0300 Subject: [PATCH 2/5] Replace app title with new logo image, update header styles 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. --- src/App.vue | 6 +-- src/assets/chooser.svg | 15 +++++++ src/components/Header.vue | 67 -------------------------------- src/components/HeaderSection.vue | 51 ++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 70 deletions(-) create mode 100644 src/assets/chooser.svg delete mode 100644 src/components/Header.vue create mode 100644 src/components/HeaderSection.vue diff --git a/src/App.vue b/src/App.vue index 8615514ab..d751ecbb6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@ @@ -42,7 +42,7 @@ import HelpSection from './components/HelpSection' import Stepper from './components/Stepper' import LicenseUseCard from './components/LicenseUseCard' import HeaderSection from './components/HeaderSection' -import Footer from './components/Footer' +import FooterSection from './components/FooterSection' import LocaleChooser from './components/LocaleChooser' import LicenseDetailsCard from './components/LicenseDetailsCard' @@ -54,7 +54,7 @@ export default { LicenseDetailsCard, LicenseUseCard, HeaderSection, - Footer, + FooterSection, LocaleChooser }, data() { diff --git a/src/components/Footer.vue b/src/components/Footer.vue deleted file mode 100644 index 087b87a88..000000000 --- a/src/components/Footer.vue +++ /dev/null @@ -1,105 +0,0 @@ - - - - - diff --git a/src/components/FooterSection.vue b/src/components/FooterSection.vue new file mode 100644 index 000000000..efa400144 --- /dev/null +++ b/src/components/FooterSection.vue @@ -0,0 +1,146 @@ + + + + + + From 7c4c1225859144f4c095cdccbaa0d72e14a56f0e Mon Sep 17 00:00:00 2001 From: Olga Bulat Date: Sun, 24 May 2020 22:59:22 +0300 Subject: [PATCH 4/5] Use styles from vocabulary package for headings 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. --- src/components/HelpSection.vue | 2 +- src/components/LicenseDetailsCard.vue | 4 +-- src/components/LicenseUseCard.vue | 2 +- src/components/Stepper.vue | 2 +- src/styles/vocab.scss | 49 +++------------------------ 5 files changed, 9 insertions(+), 50 deletions(-) diff --git a/src/components/HelpSection.vue b/src/components/HelpSection.vue index 28cb16b91..692d29400 100644 --- a/src/components/HelpSection.vue +++ b/src/components/HelpSection.vue @@ -1,6 +1,6 @@