Skip to content

Commit 61588a8

Browse files
committed
Address review comments on style
Signed-off-by: Olga Bulat <obulat@gmail.com>
1 parent b21174a commit 61588a8

File tree

6 files changed

+28
-49
lines changed

6 files changed

+28
-49
lines changed

src/App.vue

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
<LocaleChooser />
1111
</div>
1212
<div class="columns">
13-
<Stepper v-model="currentStepId" />
14-
<div class="column" >
15-
<div class="fixed-right-column">
16-
<SelectedLicenseCard
17-
v-if="showLicense"
18-
/>
19-
<LicenseUseCard
20-
v-if="showLicenseUse"
21-
/>
22-
<HelpSection />
13+
<Stepper v-model="currentStepId" />
14+
<div class="column" >
15+
<div class="fixed-right-column">
16+
<SelectedLicenseCard
17+
v-if="showLicense"
18+
/>
19+
<LicenseUseCard
20+
v-if="showLicenseUse"
21+
/>
22+
<HelpSection />
23+
</div>
2324
</div>
2425
</div>
25-
</div>
2626
</div>
2727
<Footer />
2828
</div>

src/components/HelpSection.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,7 @@ export default {
268268
color: #ED592F;
269269
}
270270
.help-links .help-link .help-link-a:hover {
271-
font-weight: bold;
272-
color:black!important;
271+
color:#363636!important;
273272
}
274273
.help-links {
275274
list-style-position: inside;

src/components/LicenseCode.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,21 @@
1212
<template v-slot:creator>
1313
<a :href="creatorProfileUrl" v-if="creatorProfileUrl && isWeb" rel="cc:attributionURL">
1414
<span v-html="creatorSpan" /></a>
15-
<span v-else v-html="creatorSpan" />
15+
<span v-else-if="creatorName" v-html="creatorSpan" />
1616
</template>
1717
<template v-slot:by>
1818
{{$t(byString)}}
1919
</template>
20+
<template v-slot:licensed-text>
21+
<span>{{$t('license-use.richtext.licensed-text')}}</span>
22+
</template>
2023
<template v-slot:licenseName>
2124
<a v-if="isWeb" :href="licenseUrl('web')" target="_blank" rel="license noopener noreferrer"
2225
style="display: inline-block;">{{shortName}}</a>
2326
<span v-else>{{shortName}}</span>
2427
<LicenseIcons
2528
v-if="isWeb"
26-
:url="licenseUrl"
29+
:url="licenseUrl('web')"
2730
:iconsArr="iconsList"/>
2831
</template>
2932
</i18n>
@@ -80,6 +83,6 @@ export default {
8083

8184
<style scoped>
8285
.license-text .photo-license-icons {
83-
height: 22px;
86+
height: 1.4rem!important;
8487
}
8588
</style>

src/components/PrintMediaLicenseCode.vue

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,15 @@ export default {
111111
}
112112
</script>
113113
<style lang="scss">
114-
.attribution-tab .photo-license-icon {
115-
height: 26px;
116-
}
117-
#attribution-richtext>p>span,
118-
#attribution-richtext .photo-license-icons{
119-
height: 26px;
114+
.license-text span * {
120115
vertical-align: middle;
121116
}
122-
#attribution-richtext p {
123-
margin-top: 1rem;
117+
.attribution-tab .photo-license-icon {
118+
height: 1.4rem;
119+
}
120+
121+
#attribution-plaintext p {
122+
margin-top: 0.5rem;
124123
margin-bottom: 1rem;
125124
}
126125
.license-use-hint {
@@ -171,27 +170,4 @@ export default {
171170
}
172171
}
173172
}
174-
#generated-html-container {
175-
padding-top:10px;
176-
padding-bottom: 10px;
177-
textarea {
178-
word-break: break-all;
179-
-ms-word-break: break-all;
180-
min-height: 60px;
181-
font-family: "Source Sans Pro", "Noto Sans", Arial, "Helvetica Neue", Helvetica, sans-serif;
182-
font-size:0.845rem;
183-
}
184-
}
185-
#generated-richtext-container {
186-
margin-top: 1rem;
187-
display: block;
188-
.attribution-license-icons {
189-
vertical-align: middle;
190-
margin-top: 0;
191-
margin-left: 2px;
192-
}
193-
p {
194-
display: inline
195-
}
196-
}
197173
</style>

src/components/WebLicenseCode.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ export default {
148148
vertical-align: middle;
149149
}
150150
#attribution-richtext p {
151-
margin-top: 1rem;
151+
margin-top: 0.5rem;
152152
margin-bottom: 1rem;
153153
}
154154
.license-use-hint {

src/locales/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,10 @@
118118
"copy-label": "Copy",
119119
"copied-label": "Copied!",
120120
"richtext": {
121-
"full-text": "{workTitle} {by} {creator} is licensed under {licenseName}",
121+
"full-text": "{workTitle} {by} {creator}{licensed-text}{licenseName}",
122122
"workTitle": "This work",
123123
"by": "by",
124+
"licensed-text": " is licensed under ",
124125
"print-instructions": ". To view a copy of this license, visit {linkToLicenseDeed}."
125126
}
126127
},

0 commit comments

Comments
 (0)