Skip to content

Fixes for styling and text bugs when bundle is built/served #81

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.

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
Jan 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/tests/e2e/reports/
/chromedriver.log
.idea/
dist/
coverage/
node_modules/
1 change: 1 addition & 0 deletions docs/css/app.4d8adfbb.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/css/app.79902109.css

This file was deleted.

2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Vue App</title><link href=/css/app.79902109.css rel=preload as=style><link href=/css/chunk-vendors.c29f3e02.css rel=preload as=style><link href=/js/app.a2e440a7.js rel=preload as=script><link href=/js/chunk-vendors.34c17f0f.js rel=preload as=script><link href=/css/chunk-vendors.c29f3e02.css rel=stylesheet><link href=/css/app.79902109.css rel=stylesheet></head><body><div id=app></div><script src=/js/chunk-vendors.34c17f0f.js></script><script src=/js/app.a2e440a7.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Vue App</title><link href=/css/app.4d8adfbb.css rel=preload as=style><link href=/css/chunk-vendors.c29f3e02.css rel=preload as=style><link href=/js/app.1e914e1c.js rel=preload as=script><link href=/js/chunk-vendors.34c17f0f.js rel=preload as=script><link href=/css/chunk-vendors.c29f3e02.css rel=stylesheet><link href=/css/app.4d8adfbb.css rel=stylesheet></head><body><div id=app></div><script src=/js/chunk-vendors.34c17f0f.js></script><script src=/js/app.1e914e1c.js></script></body></html>
2 changes: 2 additions & 0 deletions docs/js/app.1e914e1c.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/js/app.1e914e1c.js.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions docs/js/app.a2e440a7.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/js/app.a2e440a7.js.map

This file was deleted.

1 change: 0 additions & 1 deletion src/components/LicenseIcons.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export default LicenseIcons;
<style lang="scss" scoped>
.photo-license-icons {
display: inline-block;
height: 32px;
white-space: none;
opacity: .7;
margin-top: 2px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/SelectedLicenseCode.vue
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export default {
text-transform: uppercase;
letter-spacing: 0.5px;
color: #333333;
opacity:80%;
opacity:0.8;

}
}
Expand All @@ -212,7 +212,7 @@ export default {
border-bottom-width: 3px;
span{
font-weight: 700;
opacity:100%;
opacity:1;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/SelectedLicenseDropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default {
margin-top: 1rem;
label.label{
font-weight: normal;
opacity: 80%;
opacity: 0.8;
font-size: 1em;
}
span.select, select {
Expand Down
2 changes: 1 addition & 1 deletion src/components/SelectionStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default {
margin-bottom: 0;
}
.field.not-selected {
opacity: 70%;
opacity: 0.7;
}
.field:hover {
box-shadow: 0 10px 15px -3px rgba(237, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
Expand Down
32 changes: 19 additions & 13 deletions src/components/Stepper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
ref="steps"
>
<b-step-item
v-for="item in this.steps"
v-for="(item, index) in this.steps"
:icon-pack="item['icon-pack']"
:icon="getIcon(item.shortName)"
:label=$t(item.label)
:label="$t(labels[index])"
:key="item.shortName"
:selected="isStepSelected(item.shortName)"
:visible="isStepVisible(item.shortName)"
Expand Down Expand Up @@ -62,37 +62,31 @@ export default {
currentStep: 0,
steps: [
{
label: this.attributionName,
shortName: 'BY',
'icon-pack': 'fab',
itemType: 'licenseAttribute'
},
{
label: 'stepper-label.NonCommercial',
shortName: 'NC',
'icon-pack': 'fab',
itemType: 'licenseAttribute'
},
{
label: 'stepper-label.NoDerivatives',
shortName: 'ND',
'icon-pack': 'fab',
itemType: 'licenseAttribute'
},
{
label: 'stepper-label.Share-Alike',
shortName: 'SA',
'icon-pack': 'fab',
itemType: 'licenseAttribute'
},
{
label: 'stepper-label.CopyrightWaiver',
shortName: 'wv',
'icon-pack': 'fas',
itemType: 'CC0Attribute'
},
{
label: 'stepper-label.AttributionDetails',
shortName: 'ad',
'icon-pack': 'fas',
itemType: 'AttributionDetails'
Expand All @@ -107,8 +101,17 @@ export default {
attributionIcon() {
return this.$props.value.shortName.includes('BY') ? 'creative-commons-by' : 'creative-commons-zero'
},
attributionName() {
return this.$props.value.shortName.includes('BY') ? 'stepper-label.Attribution' : 'stepper-label.PublicDomain'
labels() {
const attributionStepLabel = this.$props.value.shortName.includes('BY') ? 'Attribution' : 'PublicDomain'
const stepLabels = [
`stepper-label.${attributionStepLabel}`,
'stepper-label.NoDerivatives',
'stepper-label.NonCommercial',
'stepper-label.Share-Alike',
'stepper-label.CopyrightWaiver',
'stepper-label.AttributionDetails'
]
return stepLabels
}
},
methods: {
Expand All @@ -130,6 +133,9 @@ export default {
return `creative-commons-${attrName.toLowerCase()}`
}
},
getAttributionName() {
return this.$props.value.shortName.includes('BY') ? 'stepper-label.Attribution' : 'stepper-label.PublicDomain'
},
updateLicense(itemId) {
const attrs = { ...this.licenseAttributes }
attrs[itemId] = !attrs[itemId]
Expand Down Expand Up @@ -245,11 +251,11 @@ export default {
}
#stepper .b-steps .steps .step-items .step-item.is-step-not_selected .step-title {
font-weight: normal;
opacity: 70%;
opacity: 0.7;
}
#stepper .b-steps .steps .step-items .step-item.is-step-selected .step-title {
font-weight: 700;
opacity: 90%;
opacity: 1;
}
#stepper .b-steps .steps .step-items .step-item.is-step-not_selected.is-active .step-marker {
border-color: #68ca86;
Expand All @@ -263,7 +269,7 @@ export default {
color: #ed5931;
background-color: white;
svg path {
fill-opacity: 70%;
fill-opacity: 0.7;
}
}

Expand Down