Merge branch 'master' into modal-fix

Author: obulat

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence, they will 
 # be requested for review when someone opens a pull request.
-* @creativecommons/frontend @creativecommons/community-chooser
+* @creativecommons/frontend @creativecommons/ct-chooser-maintainers

src/App.vue

@@ -111,6 +111,7 @@ export default {
         -moz-osx-font-smoothing: grayscale;
         color: #2c3e50;
         counter-reset: step-counter;
+        background-color: #f5f5f5;
     }
     #site-container {
         padding: 0.75rem;

src/assets/license-icons/by.svg

@@ -167,6 +167,9 @@ export default {
     #attribution-text p {
         margin-top: 0.5rem;
         margin-bottom: 1rem;
+        background-color: #fff;
+        padding: 24px 0 0 24px;
+        height: 100px;
     }
     #generated-html-container {
         padding-top: 10px;

src/assets/license-icons/cc.svg

@@ -108,19 +108,19 @@ export default {
         background-size: 35px 35px;
     }
     .license-list-item.zero::before {
-        background-image: url("../assets/license-icons/cc-cc0_icon.svg");
+        background-image: url("../assets/license-icons/zero.svg");
     }
     .license-list-item.by::before {
-        background-image: url("../assets/license-icons/cc-by_icon.svg");
+        background-image: url("../assets/license-icons/by.svg");
     }
     .license-list-item.nc::before {
-        background-image: url("../assets/license-icons/cc-nc_icon.svg");
+        background-image: url("../assets/license-icons/nc.svg");
     }
     .license-list-item.nd::before {
-        background-image: url("../assets/license-icons/cc-nd_icon.svg");
+        background-image: url("../assets/license-icons/nd.svg");
     }
     .license-list-item.sa::before {
-        background-image: url("../assets/license-icons/cc-sa_icon.svg");
+        background-image: url("../assets/license-icons/sa.svg");
     }
     .readable-string {
         padding-left:51px;

src/assets/license-icons/nc.svg

@@ -10,15 +10,15 @@
             class="photo-license-icon"
             alt="CC icon"
             title="CC icon"
-            src="../assets/license-icons/cc_icon.svg"
+            src="../assets/license-icons/cc.svg"
         >
         <img
             v-for="(license, index) in iconsArr"
             :key="index"
             class="photo-license-icon"
             :alt="license + ' icon'"
             :title="license + ' icon'"
-            :src="require(`../assets/license-icons/cc-${license.toLowerCase()}_icon.svg`)"
+            :src="require(`../assets/license-icons/${license.toLowerCase()}.svg`)"
         >
     </a>
 </template>

src/assets/license-icons/nd.svg

@@ -380,6 +380,10 @@ export default {
     .current,
     .previous {
         color: black;
+        background-color: #fff;
+    }
+    .inactive{
+        background-color: #F5F5F5;
     }
     .previous.disabled {
         color: #B0B0B0;
@@ -396,10 +400,17 @@ export default {
     .step-navigation .pagination-previous {
         font-family: Roboto Condensed,sans-serif;
         font-style: normal;
-        font-weight: 500;
         font-size: 18px;
         line-height: 24px;
     }
+    .step-navigation,
+    .step-navigation {
+        font-weight: 500;
+    }
+    .pagination-next,
+    .pagination-previous {
+        font-weight: bold;
+    }
     .step-navigation .pagination-previous {
         border: 2px solid #787878;
         color: #787878;
@@ -411,6 +422,7 @@ export default {
     }
     .pagination-next.disabled {
         background-color: #D8D8D8;
+        color: #787878 !important;
     }
     .pagination-next.disabled:hover,
     .pagination-next.disabled:active {

src/assets/license-icons/sa.svg

@@ -43,8 +43,8 @@ function attrToFull(attr) {
 
 function licenseUrl(attr, mode) {
     // Returns url to license from short license name with version number (eg. 'CC BY 4.0')
-    // mode: web/ print (?ref=ccchooser is added to the end of the link if mode is web)
-    const linkRef = mode === 'web' ? '/?ref=ccchooser' : ''
+    // mode: web/ print (?ref=chooser-v1 is added to the end of the link if mode is web)
+    const linkRef = mode === 'web' ? '/?ref=chooser-v1' : ''
     if (attr.BY === false) {
         return `https://creativecommons.org/publicdomain/zero/1.0${linkRef}`
     }
@@ -125,13 +125,14 @@ function generateHTML(attributionDetails, shortLicenseName) {
         ' xmlns:cc="http://creativecommons.org/ns#"' +
         ' class="license-text">'
     const iconStyle = 'style="height:22px!important;margin-left: 3px;vertical-align:text-bottom;"'
-    const baseAssetsPath = 'https://search.creativecommons.org/static/img'
-    let licenseIcons = `<img ${iconStyle} src="${baseAssetsPath}/cc_icon.svg" />`
+    const baseAssetsPath = 'https://mirrors.creativecommons.org/presskit/icons'
+    const linkRef = '?ref=chooser-v1'
+    let licenseIcons = `<img ${iconStyle} src="${baseAssetsPath}/cc.svg/${linkRef}" />`
     if (shortLicenseName.includes('CC0')) {
         shortLicenseName = 'CC CC0 1.0'
     }
     licenseIcons += shortLicenseName.slice(3, shortLicenseName.length - 4).split('-').map(license =>
-        `<img  ${iconStyle} src="${baseAssetsPath}/cc-${license.toLowerCase()}_icon.svg" />`
+        `<img  ${iconStyle} src="${baseAssetsPath}/${license.toLowerCase()}.svg/${linkRef}" />`
     ).join('')
     dataForHtmlGeneration.licenseIconsLink = `<a href="${licenseUrl(shortToAttr(shortLicenseName))}">${licenseIcons}</a>`
 
@@ -153,6 +154,7 @@ function generateHTML(attributionDetails, shortLicenseName) {
     }
     return dataForHtmlGeneration
 }
+
 export {
     defaultAttributes, CC0Attributes, CCBYAttributes, shortToAttr, attrToShort,
     attrToFull, licenseUrl, licenseSlug, licenseIconsArr, generateHTML, updateVisibleEnabledStatus