Skip to content

Commit b3fa421

Browse files
committed
Merge branch 'master' into modal-fix
2 parents 6cda0b0 + 991818f commit b3fa421

File tree

13 files changed

+154
-14
lines changed

13 files changed

+154
-14
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# These owners will be the default owners for everything in
22
# the repo. Unless a later match takes precedence, they will
33
# be requested for review when someone opens a pull request.
4-
* @creativecommons/frontend @creativecommons/community-chooser
4+
* @creativecommons/frontend @creativecommons/ct-chooser-maintainers

src/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ export default {
111111
-moz-osx-font-smoothing: grayscale;
112112
color: #2c3e50;
113113
counter-reset: step-counter;
114+
background-color: #f5f5f5;
114115
}
115116
#site-container {
116117
padding: 0.75rem;

src/assets/license-icons/by.svg

Lines changed: 17 additions & 0 deletions
Loading

src/assets/license-icons/cc.svg

Lines changed: 26 additions & 0 deletions
Loading

src/assets/license-icons/nc.svg

Lines changed: 20 additions & 0 deletions
Loading

src/assets/license-icons/nd.svg

Lines changed: 17 additions & 0 deletions
Loading

src/assets/license-icons/sa.svg

Lines changed: 19 additions & 0 deletions
Loading

src/assets/license-icons/zero.svg

Lines changed: 23 additions & 0 deletions
Loading

src/components/LicenseCopy.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ export default {
167167
#attribution-text p {
168168
margin-top: 0.5rem;
169169
margin-bottom: 1rem;
170+
background-color: #fff;
171+
padding: 24px 0 0 24px;
172+
height: 100px;
170173
}
171174
#generated-html-container {
172175
padding-top: 10px;

src/components/LicenseDetailsCard.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,19 @@ export default {
108108
background-size: 35px 35px;
109109
}
110110
.license-list-item.zero::before {
111-
background-image: url("../assets/license-icons/cc-cc0_icon.svg");
111+
background-image: url("../assets/license-icons/zero.svg");
112112
}
113113
.license-list-item.by::before {
114-
background-image: url("../assets/license-icons/cc-by_icon.svg");
114+
background-image: url("../assets/license-icons/by.svg");
115115
}
116116
.license-list-item.nc::before {
117-
background-image: url("../assets/license-icons/cc-nc_icon.svg");
117+
background-image: url("../assets/license-icons/nc.svg");
118118
}
119119
.license-list-item.nd::before {
120-
background-image: url("../assets/license-icons/cc-nd_icon.svg");
120+
background-image: url("../assets/license-icons/nd.svg");
121121
}
122122
.license-list-item.sa::before {
123-
background-image: url("../assets/license-icons/cc-sa_icon.svg");
123+
background-image: url("../assets/license-icons/sa.svg");
124124
}
125125
.readable-string {
126126
padding-left:51px;

0 commit comments

Comments
 (0)