Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
d26dac8
Update primary and background color
obulat Feb 6, 2020
a55e713
Style Help section according to the mockup
obulat Feb 6, 2020
4791603
mockup code
obulat Feb 7, 2020
ccbdab4
Setup vuex store
obulat Feb 10, 2020
856e795
Add vuex to components
obulat Feb 10, 2020
1976966
Clean up vuex store, show Copyright Waiver if CC0
obulat Feb 10, 2020
cb37181
Remove old components
obulat Feb 10, 2020
8b146d6
Add Dropdown step
obulat Feb 10, 2020
4394bcf
Set icon size to 35 px as in the mockup
obulat Feb 10, 2020
a5940ab
Add vuex to AttributionDetails component
obulat Feb 10, 2020
ae0004f
Review strings
obulat Feb 10, 2020
909e13e
Move store to /src and remove local functions from store
obulat Feb 11, 2020
9fc52cc
Move local data and functions from store to components
obulat Feb 11, 2020
126a4d9
Rename components: VerticalStep and VerticalStepper to Step and Stepper
obulat Feb 13, 2020
0d1c5c4
Add own Header and LocaleChooser components for launch of v1
obulat Feb 13, 2020
02655e5
Add language icon to LocaleChooser
obulat Feb 13, 2020
d07a645
Add Footer
obulat Feb 13, 2020
bd0b362
Add some Vocabulary typography styles
obulat Feb 13, 2020
562833e
Replace Vocabulary footer with own Footer component in App.vue
obulat Feb 13, 2020
e5522f3
Add white icons for Footer
obulat Feb 13, 2020
4e3555e
Some style fixes
obulat Feb 13, 2020
9634a24
Add arrow-right.png icon
obulat Feb 13, 2020
1eba7d8
Remove default options from Stepper
obulat Feb 16, 2020
1992565
Remove old LicenseCard component
obulat Feb 17, 2020
07c944e
Fix vuex bugs after removing default license state
obulat Feb 17, 2020
a98a9d6
Update steps and Stepper styles
obulat Feb 17, 2020
fa1fd10
Update right column styles
obulat Feb 17, 2020
74f2ad3
Refactor vocabulary header styles
obulat Feb 17, 2020
8ed862b
Update Footer, LocaleChooser and HelpSection styles
obulat Feb 17, 2020
4432690
Small fixes to strings, icons and header styles
obulat Feb 17, 2020
a328303
Remove console.log statements
obulat Feb 17, 2020
a2de993
Update License Card strings and styles
obulat Feb 17, 2020
0170e39
Update Header and Stepper naming
obulat Feb 18, 2020
e2622d1
Add LicenseCode component for generating License richtext
obulat Feb 18, 2020
b4a543f
Add license code references and functions
obulat Feb 18, 2020
95cf8b8
Review strings and string names
obulat Feb 18, 2020
b070efd
Fix missing strings, remove old SelectedLicenseInfo component
obulat Feb 18, 2020
5b8af35
Update Vuex and Stepper data handling
obulat Feb 20, 2020
382ac7e
Fix regression bug with currentStepId and visible steps
obulat Feb 20, 2020
c37db65
Add Help item for Free Culture Licenses
obulat Feb 20, 2020
c406081
Update language
obulat Feb 20, 2020
0ea217c
Remove unnecessary Vuex getters
obulat Feb 20, 2020
ee2218d
Update styles for SelectedLicenseCode and LicenseUseCard
obulat Feb 20, 2020
6dda97a
Make 'Next' button disabled on CopyrightWaiverStep after checkbox uns…
obulat Feb 21, 2020
22335a2
Make 'Next' button on Dropdown step enabled if navigated back after l…
obulat Feb 21, 2020
425298d
Add mode to license url generation to remove '?ref=ccchooser' from th…
obulat Feb 21, 2020
0820417
Fix LocaleSelector style, put it on top on mobile screen
obulat Feb 21, 2020
6ef753b
Small fixes in language and style
obulat Feb 21, 2020
93fda80
Format License Code for Print and Media
obulat Feb 23, 2020
be42999
Styling fixes for HelpSection
obulat Feb 23, 2020
a7597d5
Fix bug when selecting ND from the dropdown would activate unnecessar…
obulat Feb 23, 2020
c4b97db
Fix LocaleChooser on narrow screen: set to two lines
obulat Feb 23, 2020
7bb2700
Add fix to Stepper updating Visible and Enabled steps
obulat Feb 23, 2020
4b1d0d7
Update some strings
obulat Feb 23, 2020
edb7e4f
Remove blue outline from radio:hover state
obulat Feb 23, 2020
b21174a
Build the site
obulat Feb 23, 2020
61588a8
Address review comments on style
obulat Feb 24, 2020
3d27a85
Add Noun Project link, add periods at the ends of sentences, update R…
obulat Feb 24, 2020
a9445a3
Build the site
obulat Feb 24, 2020
a848d2d
Remove unnecessary period and reformat footer text
obulat Feb 25, 2020
91c32ad
Build the site
obulat Feb 25, 2020
10c898d
Fix footer links and Build the site
obulat Feb 25, 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
Prev Previous commit
Next Next commit
Small fixes in language and style
Signed-off-by: Olga Bulat <obulat@gmail.com>
  • Loading branch information
obulat committed Feb 21, 2020
commit 6ef753b53a98d57eaa998a1836125eb48d30d41b
3 changes: 2 additions & 1 deletion src/components/Header.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<b-navbar wrapperClass = "container">
<b-navbar wrapperClass="container">
<template slot="brand">
<b-navbar-item>
<img
Expand All @@ -12,6 +12,7 @@
<template slot="end">
<b-navbar-item
href="https://docs.google.com/forms/d/e/1FAIpQLSfF7MCKxlPsPuMn17v_sLYWMkxBkudQSPXCXoJKjh5GCtx63g/viewform"
title="Feedback"
:class="'navbar-item-feedback'">
{{$t('header.nav-feedback')}}
</b-navbar-item>
Expand Down
2 changes: 1 addition & 1 deletion src/components/LicenseIcons.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default LicenseIcons
.photo-license-icons {
display: inline-block;
white-space: nowrap;
vertical-align: text-bottom;
vertical-align: middle;
margin-right:3px;
}
.photo-license-icon {
Expand Down
60 changes: 34 additions & 26 deletions src/components/Stepper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ export default {
},
isStepReversed(stepName) {
/**
* NC and ND steps are reversed: unlike BY and SA, they are selected when the user
* NC, ND and SA steps are reversed: unlike BY, they are selected when the user
* answers no, and not selected when the user answers yes
*/
return stepName === 'NC' || stepName === 'ND'
return ['NC', 'ND', 'SA'].indexOf(stepName) > -1
},
nextButtonEnabledState(stepId) {
/**
Expand All @@ -160,8 +160,9 @@ export default {
this.$store.commit('setSelected', { stepName, isSelected })
// When the user first selects a license attribute, the dropdown step's Next button should be enabled
// as the dropdown will be populated with the selected license from the state
if (this.steps[5].selected === undefined && stepName === 'BY') {
this.steps[5].selected = true
const DROPDOWNSTEP = 5
if (this.steps[DROPDOWNSTEP].selected === undefined && stepName === 'BY') {
this.$set(this.steps, DROPDOWNSTEP, { ...this.steps[DROPDOWNSTEP], selected: true })
}
}
this.$set(this.steps, stepId, { ...this.steps[stepId], selected: isSelected })
Expand Down Expand Up @@ -308,7 +309,7 @@ export default {
const stepId = this.steps[step].id
const stepName = this.steps[step].name
const isStepSelected = this.steps[step].selected
const isAttrSelected = this.$store.state.currentLicenseAttributes[stepName]
const isAttrSelected = state.currentLicenseAttributes[stepName]
if (this.isLicenseAttribute(stepName) && isStepSelected !== isAttrSelected) {
this.$set(this.steps, stepId, { ...this.steps[stepId], selected: isAttrSelected })
this.updateDisabledAndVisibleSteps(stepName, isAttrSelected)
Expand Down Expand Up @@ -345,6 +346,7 @@ export default {
}
.stepper-card:last-of-type {
border-bottom: 2px solid #D8D8D8;
margin-bottom: 15rem;
}
.stepper-card-header {
background-color: transparent;
Expand Down Expand Up @@ -404,28 +406,34 @@ export default {
.inactive .vocab.h5b {
color: #B0B0B0;
}
.step-navigation {
margin: 13px 0 13px -4px;
}
.pagination-next {
background-color: #04A635;
color: white!important;
font-family: Roboto Condensed,sans-serif;
font-style: normal;
font-weight: 500;
font-size: 18px;
line-height: 24px;
}
.pagination-next.disabled {
background-color: #D8D8D8;
}
.pagination-next.disabled:hover,
.pagination-next.disabled:active {
box-shadow: none;
border: 1px solid transparent;
.stepper-card .b-radio.radio input[type=radio]:not(:disabled) + .check {
border-color: rgba(51, 51, 51, 0.2);
}
.stepper-card .b-radio.radio:hover input[type=radio]:not(:disabled) + .check {
border: 4px solid #0464E1;
}
.slide-enter-active {
/*transition: all .3s ease;*/
.step-navigation {
margin: 13px 0 13px -4px;
}
.pagination-next {
background-color: #04A635;
color: white!important;
font-family: Roboto Condensed,sans-serif;
font-style: normal;
font-weight: 500;
font-size: 18px;
line-height: 24px;
}
.pagination-next.disabled {
background-color: #D8D8D8;
}
.pagination-next.disabled:hover,
.pagination-next.disabled:active {
box-shadow: none;
border: 1px solid transparent;
}
.slide-enter-active {
/*transition: all .3s ease;*/
animation: slide-down .5s;
}
.slide-leave-active {
Expand Down
20 changes: 10 additions & 10 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,32 @@
"FS": {
"heading": "License Expertise",
"question": "Do you know which license you need?",
"selected": "Yes, I know which license I need",
"not-selected": "No, I need help selecting a license"
"selected": "I know which license I need",
"not-selected": "I need help selecting a license"
},
"BY": {
"heading": "Attribution",
"question": "Do you want attribution for your work?",
"selected": "Yes, anyone using my work must include proper attribution.",
"not-selected": "No, anyone can use my work, even without giving me attribution."
"selected": "Anyone using my work must include proper attribution.",
"not-selected": "Anyone can use my work, even without giving me attribution."
},
"NC": {
"heading": "Commercial Use",
"question": "Do you want to allow others to use your work commercially?",
"selected": "Yes, others can use my work, even for commercial purposes.",
"not-selected": "No, others can not use my work for commercial purposes."
"selected": "Others can use my work, even for commercial purposes.",
"not-selected": "Others can not use my work for commercial purposes."
},
"ND": {
"heading": "Derivative Works",
"question": "Do you want to allow others to remix, adapt, or build upon your work?",
"selected": "Yes, others can remix, adapt, or build upon my work.",
"not-selected": "No, others may only use my work in unadapted form."
"selected": "Others can remix, adapt, or build upon my work.",
"not-selected": "Others may only use my work in unadapted form."
},
"SA": {
"heading": "Sharing Requirements",
"question": "Do you want to allow others to share adaptations under any terms?",
"selected": "Yes, others can share adaptations of my work under any terms.",
"not-selected": "No, others must license adaptations of my work under identical terms."
"selected": "Others can share adaptations of my work under any terms.",
"not-selected": "Others must license adaptations of my work under identical terms."
},
"CW": {
"heading": "Copyright Waiver",
Expand Down