Skip to content

Commit fa1fd10

Browse files
committed
Update right column styles
Signed-off-by: Olga Bulat <obulat@gmail.com>
1 parent a98a9d6 commit fa1fd10

File tree

6 files changed

+92
-31
lines changed

6 files changed

+92
-31
lines changed

src/App.vue

+15-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,19 @@
22
<div id="app">
33
<Header :title="$t('app-title')"/>
44
<div class="container" id="site-container">
5+
<div class="page-head columns">
6+
<div class="column">
7+
<h2 class="vocab h2a ha">{{$t('select-license.heading')}}</h2>
8+
<p class="stepper-instructions vocab-body body-bigger">{{$t('select-license.instructions')}}</p>
9+
</div>
10+
<div class="column">
11+
<LocaleChooser />
12+
</div>
13+
</div>
514
<div class="columns">
615
<Stepper v-model="currentStepId" />
716
<div class="column" >
8-
<LocaleChooser />
17+
<div class="fixed-right-column">
918
<SelectedLicenseCard
1019
v-if="showLicense"
1120
/>
@@ -89,8 +98,12 @@ export default {
8998
-webkit-font-smoothing: antialiased;
9099
-moz-osx-font-smoothing: grayscale;
91100
color: #2c3e50;
101+
counter-reset: step-counter;
102+
}
103+
.fixed-right-column {
104+
position: sticky;
105+
top: 10px;
92106
}
93-
94107
#site-container {
95108
padding-top: 2rem;
96109
padding-bottom: 2%;

src/components/LicenseIcons.vue

+2-7
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,10 @@ export default LicenseIcons
2626
display: inline-block;
2727
white-space: nowrap;
2828
vertical-align: text-bottom;
29-
opacity: .7;
3029
margin-right:3px;
31-
height: 22px !important;
32-
&:hover {
33-
opacity: 1;
3430
}
35-
}
36-
.photo-license-icon {
31+
.photo-license-icon {
3732
height: inherit;
3833
margin-left: 3px;
39-
}
34+
}
4035
</style>

src/components/LicenseUseCard.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="license-use-card">
3-
<h4 class="vocab-h4">Use Your License</h4>
3+
<h4 class="vocab h4b hb">Use Your License</h4>
44
<p class="license-use-instructions">{{$t('use-license.instructions')}}</p>
55
<b-tabs>
66
<b-tab-item label="Website">

src/components/SelectedLicenseCard.vue

+60-9
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
<ul class="license-list">
1919
<transition-group name="highlight">
2020
<li v-for="item in iconsList"
21+
:class="['license-list-item', item]"
2122
:key="item">
22-
<LicenseIconography
23-
:icon-list="[item]"/>
2423
<span class="readable-string">
25-
{{ $t(`selected-license.description.${item}`)}}
26-
</span>
24+
<b>{{item.toUpperCase()}}:</b> {{$t(`selected-license.description.${item}`)}}
25+
</span>
2726
</li>
2827
</transition-group>
2928
</ul>
@@ -33,14 +32,12 @@
3332

3433
<script>
3534
import LicenseIcons from './LicenseIcons'
36-
import LicenseIconography from './LicenseIconography'
3735
import { mapGetters } from 'vuex'
3836
3937
export default {
4038
name: 'SelectedLicenseCard',
4139
components: {
42-
LicenseIcons,
43-
LicenseIconography
40+
LicenseIcons
4441
},
4542
computed: {
4643
...mapGetters(['shortName', 'fullName', 'iconsList', 'licenseUrl']),
@@ -55,6 +52,60 @@ export default {
5552
}
5653
</script>
5754

58-
<style scoped>
59-
55+
<style lang="scss">
56+
.license-name {
57+
vertical-align: middle;
58+
display: inline-block;
59+
margin-top: 8px;
60+
}
61+
.license-name .photo-license-icons {
62+
height: 35px;
63+
vertical-align: middle;
64+
}
65+
.license-name .photo-license-icon {
66+
height: 35px;
67+
opacity: 1;
68+
}
69+
.license-visual-info {
70+
margin-top: 16px;
71+
}
72+
.license-list-item {
73+
position: relative;
74+
padding-bottom: 8px;
75+
}
76+
.license-list-item span {
77+
vertical-align: middle;
78+
display:inline-block;
79+
}
80+
.license-list-item span b {
81+
display: inline-block;
82+
width: 24px;
83+
}
84+
.license-list-item::before{
85+
position: absolute;
86+
left: 0;
87+
top: 0;
88+
display: inline-block;
89+
width: 35px;
90+
height: 35px;
91+
border-radius: 50%;
92+
content: "";
93+
background-size: 35px 35px;
94+
}
95+
.license-list-item.by::before {
96+
background-image: url("../assets/license-icons/cc-by_icon.svg");
97+
}
98+
.license-list-item.nc::before {
99+
background-image: url("../assets/license-icons/cc-nc_icon.svg");
100+
}
101+
.license-list-item.nd::before {
102+
background-image: url("../assets/license-icons/cc-nd_icon.svg");
103+
}
104+
.license-list-item.sa::before {
105+
background-image: url("../assets/license-icons/cc-sa_icon.svg");
106+
}
107+
.readable-string {
108+
padding-left:51px;
109+
line-height:35px;
110+
}
60111
</style>

src/components/SelectedLicenseCode.vue

-9
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,6 @@ export default {
198198
}
199199
.license-code {
200200
margin-top: 0.4rem;
201-
h2.vocab-h2{
202-
font-family: Roboto Condensed;
203-
font-style: normal;
204-
font-weight: bold;
205-
font-size: 28px;
206-
line-height: 36px;
207-
letter-spacing: 0.02em;
208-
text-transform: uppercase;
209-
}
210201
div.attribution-tab {
211202
margin-bottom: 1rem;
212203
nav.tabs {

src/locales/en.json

+14-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"instructions": "Use the most open license with attribution requirement, or select other options to restrict it."
8686
},
8787
"selected-license": {
88-
"heading": "Your license",
88+
"heading": "RECOMMENDED LICENSE",
8989
"instructions": "If you already know which license you need, just select it in the dropdown below.",
9090
"description": {
9191
"common": "allows others to share, distribute, remix, adapt, and build upon your work",
@@ -112,7 +112,7 @@
112112
"this-work": "This work",
113113
"license-text": "{workTitle} {byLine} is licensed under "
114114
},
115-
"license-dropdown-label": "You can select the license you need in the dropdown below:",
115+
"license-dropdown-placeholder": "You can select the license you need in the dropdown below:",
116116
"cc0": {
117117
"copyright-waive-statement": "I hereby waive all copyright and related or neighboring rights together with all associated claims and causes of action with respect to this work to the extent possible under the law.",
118118
"confirm": "I have read and understand the terms and intended legal effect of CC0, and hereby voluntarily elect to apply it to this work.",
@@ -200,5 +200,16 @@
200200
"yes": "Yes. ",
201201
"no": "No. ",
202202
"disabled-tooltip.SA": "This step is disabled because you chose ND",
203-
"locale-chooser.label": "Languages available"
203+
"locale-chooser.label": "Languages available",
204+
"footer": {
205+
"donation": {
206+
"header": "OUR WORK RELIES ON YOU!",
207+
"call": "Help us keep Internet free and open."
208+
},
209+
"licensing": {
210+
"text": "Except where otherwise {noted}, content on this site is licensed under a {CCBY}. Icons by Noun Project.",
211+
"noted": "noted",
212+
"CCBY": "Creative Commons Attribution 4.0 International license"
213+
}
214+
}
204215
}

0 commit comments

Comments
 (0)