Skip to content

Commit 6ef753b

Browse files
committed
Small fixes in language and style
Signed-off-by: Olga Bulat <obulat@gmail.com>
1 parent 0820417 commit 6ef753b

File tree

4 files changed

+47
-38
lines changed

4 files changed

+47
-38
lines changed

src/components/Header.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<b-navbar wrapperClass = "container">
2+
<b-navbar wrapperClass="container">
33
<template slot="brand">
44
<b-navbar-item>
55
<img
@@ -12,6 +12,7 @@
1212
<template slot="end">
1313
<b-navbar-item
1414
href="https://docs.google.com/forms/d/e/1FAIpQLSfF7MCKxlPsPuMn17v_sLYWMkxBkudQSPXCXoJKjh5GCtx63g/viewform"
15+
title="Feedback"
1516
:class="'navbar-item-feedback'">
1617
{{$t('header.nav-feedback')}}
1718
</b-navbar-item>

src/components/LicenseIcons.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default LicenseIcons
2525
.photo-license-icons {
2626
display: inline-block;
2727
white-space: nowrap;
28-
vertical-align: text-bottom;
28+
vertical-align: middle;
2929
margin-right:3px;
3030
}
3131
.photo-license-icon {

src/components/Stepper.vue

+34-26
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ export default {
136136
},
137137
isStepReversed(stepName) {
138138
/**
139-
* NC and ND steps are reversed: unlike BY and SA, they are selected when the user
139+
* NC, ND and SA steps are reversed: unlike BY, they are selected when the user
140140
* answers no, and not selected when the user answers yes
141141
*/
142-
return stepName === 'NC' || stepName === 'ND'
142+
return ['NC', 'ND', 'SA'].indexOf(stepName) > -1
143143
},
144144
nextButtonEnabledState(stepId) {
145145
/**
@@ -160,8 +160,9 @@ export default {
160160
this.$store.commit('setSelected', { stepName, isSelected })
161161
// When the user first selects a license attribute, the dropdown step's Next button should be enabled
162162
// as the dropdown will be populated with the selected license from the state
163-
if (this.steps[5].selected === undefined && stepName === 'BY') {
164-
this.steps[5].selected = true
163+
const DROPDOWNSTEP = 5
164+
if (this.steps[DROPDOWNSTEP].selected === undefined && stepName === 'BY') {
165+
this.$set(this.steps, DROPDOWNSTEP, { ...this.steps[DROPDOWNSTEP], selected: true })
165166
}
166167
}
167168
this.$set(this.steps, stepId, { ...this.steps[stepId], selected: isSelected })
@@ -308,7 +309,7 @@ export default {
308309
const stepId = this.steps[step].id
309310
const stepName = this.steps[step].name
310311
const isStepSelected = this.steps[step].selected
311-
const isAttrSelected = this.$store.state.currentLicenseAttributes[stepName]
312+
const isAttrSelected = state.currentLicenseAttributes[stepName]
312313
if (this.isLicenseAttribute(stepName) && isStepSelected !== isAttrSelected) {
313314
this.$set(this.steps, stepId, { ...this.steps[stepId], selected: isAttrSelected })
314315
this.updateDisabledAndVisibleSteps(stepName, isAttrSelected)
@@ -345,6 +346,7 @@ export default {
345346
}
346347
.stepper-card:last-of-type {
347348
border-bottom: 2px solid #D8D8D8;
349+
margin-bottom: 15rem;
348350
}
349351
.stepper-card-header {
350352
background-color: transparent;
@@ -404,28 +406,34 @@ export default {
404406
.inactive .vocab.h5b {
405407
color: #B0B0B0;
406408
}
407-
.step-navigation {
408-
margin: 13px 0 13px -4px;
409-
}
410-
.pagination-next {
411-
background-color: #04A635;
412-
color: white!important;
413-
font-family: Roboto Condensed,sans-serif;
414-
font-style: normal;
415-
font-weight: 500;
416-
font-size: 18px;
417-
line-height: 24px;
418-
}
419-
.pagination-next.disabled {
420-
background-color: #D8D8D8;
421-
}
422-
.pagination-next.disabled:hover,
423-
.pagination-next.disabled:active {
424-
box-shadow: none;
425-
border: 1px solid transparent;
409+
.stepper-card .b-radio.radio input[type=radio]:not(:disabled) + .check {
410+
border-color: rgba(51, 51, 51, 0.2);
411+
}
412+
.stepper-card .b-radio.radio:hover input[type=radio]:not(:disabled) + .check {
413+
border: 4px solid #0464E1;
426414
}
427-
.slide-enter-active {
428-
/*transition: all .3s ease;*/
415+
.step-navigation {
416+
margin: 13px 0 13px -4px;
417+
}
418+
.pagination-next {
419+
background-color: #04A635;
420+
color: white!important;
421+
font-family: Roboto Condensed,sans-serif;
422+
font-style: normal;
423+
font-weight: 500;
424+
font-size: 18px;
425+
line-height: 24px;
426+
}
427+
.pagination-next.disabled {
428+
background-color: #D8D8D8;
429+
}
430+
.pagination-next.disabled:hover,
431+
.pagination-next.disabled:active {
432+
box-shadow: none;
433+
border: 1px solid transparent;
434+
}
435+
.slide-enter-active {
436+
/*transition: all .3s ease;*/
429437
animation: slide-down .5s;
430438
}
431439
.slide-leave-active {

src/locales/en.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,32 @@
2424
"FS": {
2525
"heading": "License Expertise",
2626
"question": "Do you know which license you need?",
27-
"selected": "Yes, I know which license I need",
28-
"not-selected": "No, I need help selecting a license"
27+
"selected": "I know which license I need",
28+
"not-selected": "I need help selecting a license"
2929
},
3030
"BY": {
3131
"heading": "Attribution",
3232
"question": "Do you want attribution for your work?",
33-
"selected": "Yes, anyone using my work must include proper attribution.",
34-
"not-selected": "No, anyone can use my work, even without giving me attribution."
33+
"selected": "Anyone using my work must include proper attribution.",
34+
"not-selected": "Anyone can use my work, even without giving me attribution."
3535
},
3636
"NC": {
3737
"heading": "Commercial Use",
3838
"question": "Do you want to allow others to use your work commercially?",
39-
"selected": "Yes, others can use my work, even for commercial purposes.",
40-
"not-selected": "No, others can not use my work for commercial purposes."
39+
"selected": "Others can use my work, even for commercial purposes.",
40+
"not-selected": "Others can not use my work for commercial purposes."
4141
},
4242
"ND": {
4343
"heading": "Derivative Works",
4444
"question": "Do you want to allow others to remix, adapt, or build upon your work?",
45-
"selected": "Yes, others can remix, adapt, or build upon my work.",
46-
"not-selected": "No, others may only use my work in unadapted form."
45+
"selected": "Others can remix, adapt, or build upon my work.",
46+
"not-selected": "Others may only use my work in unadapted form."
4747
},
4848
"SA": {
4949
"heading": "Sharing Requirements",
5050
"question": "Do you want to allow others to share adaptations under any terms?",
51-
"selected": "Yes, others can share adaptations of my work under any terms.",
52-
"not-selected": "No, others must license adaptations of my work under identical terms."
51+
"selected": "Others can share adaptations of my work under any terms.",
52+
"not-selected": "Others must license adaptations of my work under identical terms."
5353
},
5454
"CW": {
5555
"heading": "Copyright Waiver",

0 commit comments

Comments
 (0)