Skip to content

Update Vue Vocabulary to latest version #230

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Dec 2, 2020
Merged

Update Vue Vocabulary to latest version #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
264327a
Update Vue Vocabulary to latest version
obulat Nov 25, 2020
0553308
Add back input border (temporary fix before using Vocabulary for inputs)
obulat Nov 25, 2020
c59c4a6
Update test snapshots
obulat Nov 25, 2020
4bcaa86
Fix select border and caret regressions
obulat Dec 2, 2020
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
21,345 changes: 21,025 additions & 320 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
"i18n:report": "vue-cli-service i18n:report -v --src src/**/*.vue --locales src/locales/**.json -o output.json"
},
"dependencies": {
"@creativecommons/vocabulary": "^1.0.0-beta.16",
"@creativecommons/vue-vocabulary": "0.0.0-alpha.30",
"@creativecommons/vocabulary": "^2020.11.3",
"@creativecommons/vue-vocabulary": "^2020.11.3",
"@fortawesome/fontawesome-svg-core": "^1.2.30",
"@fortawesome/free-brands-svg-icons": "^5.14.0",
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@fortawesome/vue-fontawesome": "^0.1.10",
"@linusborg/vue-simple-portal": "^0.1.4",
"@sentry/browser": "^5.20.1",
"@sentry/integrations": "^5.20.1",
"buefy": "^0.8.20",
"buefy": "^0.9.4",
"clipboard": "^2.0.6",
"core-js": "^3.6.5",
"vue": "^2.6.10",
Expand Down
7 changes: 6 additions & 1 deletion src/components/AttributionDetailsStep.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default {

}
</script>
<style>
<style lang="scss">
.attribution-details-form {
margin-top: 1rem;
}
Expand All @@ -97,5 +97,10 @@ export default {
font-weight: 600;
font-size: 16px;
color: #333333;
border-width: 2px;
border-color: #d8d8d8;
&:focus, &:active, &:hover {
border-color: #b0b0b0;
}
}
</style>
2 changes: 1 addition & 1 deletion src/components/LicenseCopy.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export default {
}
.license-code .attribution-tab .tabs span {
font-style: normal;
color: #B0B0B0;
color: #b0b0b0;
font-size: 16px;
line-height: 24px;
}
Expand Down
6 changes: 6 additions & 0 deletions src/components/LicenseDropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,11 @@ export default {
.select, select {
width: 100%;
}
.select select {
border: 0.125rem solid #d8d8d8;
&:active, &:focus, &:hover {
border-color: #b0b0b0;
}
}
}
</style>
4 changes: 2 additions & 2 deletions src/components/Stepper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,11 +386,11 @@ export default {
background-color: #F5F5F5;
}
.previous.disabled {
color: #B0B0B0;
color: #b0b0b0;
}
.previous.disabled .step-title,
.inactive .step-title {
color: #B0B0B0;
color: #b0b0b0;
}
.step-navigation {
margin: 13px 0;
Expand Down
2 changes: 2 additions & 0 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Vue from 'vue'
import Buefy from 'buefy'
import VueVocabulary from '@creativecommons/vue-vocabulary/vue-vocabulary.common.js'
import i18n from './i18n'
import App from './App.vue'
import createStore from './store'
Expand Down Expand Up @@ -30,6 +31,7 @@ library.add(
Vue.component('vue-fontawesome', FontAwesomeIcon)
Vue.config.productionTip = false
Vue.use(Buefy)
Vue.use(VueVocabulary)

if (process.env.NODE_ENV === 'production') {
Vue.use(VueAnalytics, {
Expand Down
4 changes: 4 additions & 0 deletions src/styles/vocab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,7 @@
a, a:hover {
text-decoration: none;
}

.select:not(.is-multiple):not(.is-loading)::after {
border: none;
}
20 changes: 0 additions & 20 deletions tests/unit/specs/components/__snapshots__/AttributionDetailsStep.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
>
stepper.AD.form.creator-name.label
</label>

<div
class="control is-clearfix"
>
Expand All @@ -36,14 +35,10 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
placeholder="stepper.AD.form.creator-name.placeholder"
type="text"
/>

<!---->

<!---->

<!---->
</div>

<!---->
</div>

Expand All @@ -55,7 +50,6 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
>
stepper.AD.form.work-title.label
</label>

<div
class="control is-clearfix"
>
Expand All @@ -65,14 +59,10 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
placeholder="stepper.AD.form.work-title.placeholder"
type="text"
/>

<!---->

<!---->

<!---->
</div>

<!---->
</div>

Expand All @@ -84,7 +74,6 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
>
stepper.AD.form.work-url.label
</label>

<div
class="control is-clearfix"
>
Expand All @@ -94,14 +83,10 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
placeholder="stepper.AD.form.work-url.placeholder"
type="text"
/>

<!---->

<!---->

<!---->
</div>

<!---->
</div>

Expand All @@ -113,7 +98,6 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
>
stepper.AD.form.creator-profile.label
</label>

<div
class="control is-clearfix"
>
Expand All @@ -123,14 +107,10 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
placeholder="stepper.AD.form.creator-profile.placeholder"
type="text"
/>

<!---->

<!---->

<!---->
</div>

<!---->
</div>
</form>
Expand Down
4 changes: 0 additions & 4 deletions tests/unit/specs/components/__snapshots__/FirstStep.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@ exports[`FirstStep Component Mark up is correctly rendered 1`] = `
type="radio"
value="yes"
/>

<span
class="check"
/>

<span
class="control-label"
>
Expand All @@ -46,11 +44,9 @@ exports[`FirstStep Component Mark up is correctly rendered 1`] = `
type="radio"
value="no"
/>

<span
class="check"
/>

<span
class="control-label"
>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/specs/components/__snapshots__/LicenseDropdown.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`LicenseDropdown.vue Check if the LicenseDropdown.vue component has the expected UI 1`] = `
<div class="field license-dropdown">
<!---->
<div class="control"><span class="select"><select><!----> <option value="CC0 1.0">
<div class="control"><span class="select"><select><!----><option value="CC0 1.0">
CC0 1.0
</option><option value="CC BY 4.0">
CC BY 4.0
Expand Down