Skip to content

Commit 587cf23

Browse files
obulatobulat
authored
Update Vue Vocabulary to latest version (#230)
* Update Vue Vocabulary to latest version Buefy is also updated to fix import error * Add back input border (temporary fix before using Vocabulary for inputs) * Update test snapshots * Fix select border and caret regressions
1 parent b8827ba commit 587cf23

File tree

11 files changed

+21050
-352
lines changed

11 files changed

+21050
-352
lines changed

‎package-lock.json‎

Lines changed: 21025 additions & 320 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
"i18n:report": "vue-cli-service i18n:report -v --src src/**/*.vue --locales src/locales/**.json -o output.json"
2020
},
2121
"dependencies": {
22-
"@creativecommons/vocabulary": "^1.0.0-beta.16",
23-
"@creativecommons/vue-vocabulary": "0.0.0-alpha.30",
22+
"@creativecommons/vocabulary": "^2020.11.3",
23+
"@creativecommons/vue-vocabulary": "^2020.11.3",
2424
"@fortawesome/fontawesome-svg-core": "^1.2.30",
2525
"@fortawesome/free-brands-svg-icons": "^5.14.0",
2626
"@fortawesome/free-solid-svg-icons": "^5.14.0",
2727
"@fortawesome/vue-fontawesome": "^0.1.10",
2828
"@linusborg/vue-simple-portal": "^0.1.4",
2929
"@sentry/browser": "^5.20.1",
3030
"@sentry/integrations": "^5.20.1",
31-
"buefy": "^0.8.20",
31+
"buefy": "^0.9.4",
3232
"clipboard": "^2.0.6",
3333
"core-js": "^3.6.5",
3434
"vue": "^2.6.10",

‎src/components/AttributionDetailsStep.vue‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default {
8282
8383
}
8484
</script>
85-
<style>
85+
<style lang="scss">
8686
.attribution-details-form {
8787
margin-top: 1rem;
8888
}
@@ -97,5 +97,10 @@ export default {
9797
font-weight: 600;
9898
font-size: 16px;
9999
color: #333333;
100+
border-width: 2px;
101+
border-color: #d8d8d8;
102+
&:focus, &:active, &:hover {
103+
border-color: #b0b0b0;
104+
}
100105
}
101106
</style>

‎src/components/LicenseCopy.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ export default {
205205
}
206206
.license-code .attribution-tab .tabs span {
207207
font-style: normal;
208-
color: #B0B0B0;
208+
color: #b0b0b0;
209209
font-size: 16px;
210210
line-height: 24px;
211211
}

‎src/components/LicenseDropdown.vue‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,11 @@ export default {
6363
.select, select {
6464
width: 100%;
6565
}
66+
.select select {
67+
border: 0.125rem solid #d8d8d8;
68+
&:active, &:focus, &:hover {
69+
border-color: #b0b0b0;
70+
}
71+
}
6672
}
6773
</style>

‎src/components/Stepper.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,11 +386,11 @@ export default {
386386
background-color: #F5F5F5;
387387
}
388388
.previous.disabled {
389-
color: #B0B0B0;
389+
color: #b0b0b0;
390390
}
391391
.previous.disabled .step-title,
392392
.inactive .step-title {
393-
color: #B0B0B0;
393+
color: #b0b0b0;
394394
}
395395
.step-navigation {
396396
margin: 13px 0;

‎src/main.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Vue from 'vue'
22
import Buefy from 'buefy'
3+
import VueVocabulary from '@creativecommons/vue-vocabulary/vue-vocabulary.common.js'
34
import i18n from './i18n'
45
import App from './App.vue'
56
import createStore from './store'
@@ -30,6 +31,7 @@ library.add(
3031
Vue.component('vue-fontawesome', FontAwesomeIcon)
3132
Vue.config.productionTip = false
3233
Vue.use(Buefy)
34+
Vue.use(VueVocabulary)
3335

3436
if (process.env.NODE_ENV === 'production') {
3537
Vue.use(VueAnalytics, {

‎src/styles/vocab.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,7 @@
4545
a, a:hover {
4646
text-decoration: none;
4747
}
48+
49+
.select:not(.is-multiple):not(.is-loading)::after {
50+
border: none;
51+
}

‎tests/unit/specs/components/__snapshots__/AttributionDetailsStep.spec.js.snap‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
2626
>
2727
stepper.AD.form.creator-name.label
2828
</label>
29-
3029
<div
3130
class="control is-clearfix"
3231
>
@@ -36,14 +35,10 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
3635
placeholder="stepper.AD.form.creator-name.placeholder"
3736
type="text"
3837
/>
39-
4038
<!---->
41-
4239
<!---->
43-
4440
<!---->
4541
</div>
46-
4742
<!---->
4843
</div>
4944
@@ -55,7 +50,6 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
5550
>
5651
stepper.AD.form.work-title.label
5752
</label>
58-
5953
<div
6054
class="control is-clearfix"
6155
>
@@ -65,14 +59,10 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
6559
placeholder="stepper.AD.form.work-title.placeholder"
6660
type="text"
6761
/>
68-
6962
<!---->
70-
7163
<!---->
72-
7364
<!---->
7465
</div>
75-
7666
<!---->
7767
</div>
7868
@@ -84,7 +74,6 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
8474
>
8575
stepper.AD.form.work-url.label
8676
</label>
87-
8877
<div
8978
class="control is-clearfix"
9079
>
@@ -94,14 +83,10 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
9483
placeholder="stepper.AD.form.work-url.placeholder"
9584
type="text"
9685
/>
97-
9886
<!---->
99-
10087
<!---->
101-
10288
<!---->
10389
</div>
104-
10590
<!---->
10691
</div>
10792
@@ -113,7 +98,6 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
11398
>
11499
stepper.AD.form.creator-profile.label
115100
</label>
116-
117101
<div
118102
class="control is-clearfix"
119103
>
@@ -123,14 +107,10 @@ exports[`AttributionDetailsStep Component Rendering Component mounted if status
123107
placeholder="stepper.AD.form.creator-profile.placeholder"
124108
type="text"
125109
/>
126-
127110
<!---->
128-
129111
<!---->
130-
131112
<!---->
132113
</div>
133-
134114
<!---->
135115
</div>
136116
</form>

‎tests/unit/specs/components/__snapshots__/FirstStep.spec.js.snap‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ exports[`FirstStep Component Mark up is correctly rendered 1`] = `
1717
type="radio"
1818
value="yes"
1919
/>
20-
2120
<span
2221
class="check"
2322
/>
24-
2523
<span
2624
class="control-label"
2725
>
@@ -46,11 +44,9 @@ exports[`FirstStep Component Mark up is correctly rendered 1`] = `
4644
type="radio"
4745
value="no"
4846
/>
49-
5047
<span
5148
class="check"
5249
/>
53-
5450
<span
5551
class="control-label"
5652
>

0 commit comments

Comments
 (0)