Merge pull request 'v4.2.7' (#65) from asonix/changes into ceralor/blimps

Reviewed-on: #65

app/javascript/images/app-icon.svg

@@ -1,28 +1 @@
-<svg width="130" height="130" viewBox="0 0 121 130" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="130" height="130" fill="url(#paint0_linear_2_2)" x="-4.5"/>
-<g filter="url(#filter0_di_2_2)">
-<path d="M95.7135 43.6043C94.6199 35.5459 87.5351 29.1953 79.1366 27.9647C77.7196 27.7568 72.351 27 59.9148 27H59.822C47.3824 27 44.7135 27.7568 43.2966 27.9647C35.1319 29.1612 27.6757 34.8675 25.8667 43.0214C24.9966 47.0369 24.9037 51.4888 25.0654 55.5726C25.2958 61.4289 25.3405 67.275 25.877 73.1075C26.2479 76.9817 26.895 80.8251 27.8133 84.6088C29.5329 91.5968 36.4938 97.4122 43.3138 99.7848C50.6155 102.259 58.468 102.67 65.9919 100.971C66.8196 100.78 67.6381 100.559 68.4475 100.306C70.2737 99.7302 72.4164 99.086 73.9915 97.9542C74.0131 97.9384 74.0308 97.9178 74.0433 97.8942C74.0558 97.8706 74.0628 97.8445 74.0637 97.8179V92.1661C74.0634 92.1412 74.0574 92.1167 74.0462 92.0944C74.035 92.0721 74.0189 92.0525 73.9992 92.0371C73.9794 92.0218 73.9564 92.011 73.9318 92.0056C73.9073 92.0002 73.8819 92.0003 73.8574 92.0059C69.0369 93.1472 64.0971 93.7193 59.141 93.7103C50.6118 93.7103 48.3178 89.6981 47.6609 88.0278C47.1329 86.5842 46.7976 85.0784 46.6636 83.5486C46.6622 83.5229 46.667 83.4973 46.6775 83.4738C46.688 83.4502 46.7039 83.4295 46.724 83.4132C46.7441 83.397 46.7678 83.3856 46.7931 83.3801C46.8185 83.3746 46.8448 83.3751 46.8699 83.3816C51.6101 84.5151 56.4693 85.0873 61.3455 85.086C62.5183 85.086 63.6876 85.086 64.8604 85.0553C69.7647 84.919 74.9339 84.6701 79.7591 83.7361C79.8794 83.7123 79.9998 83.6918 80.103 83.6611C87.7139 82.2124 94.9569 77.665 95.6929 66.1501C95.7204 65.6967 95.7892 61.4016 95.7892 60.9312C95.7926 59.3325 96.3085 49.5901 95.7135 43.6043ZM83.9996 72.3371H75.9966V52.9069C75.9966 48.8163 74.277 46.7302 70.7793 46.7302C66.9343 46.7302 65.0083 49.1981 65.0083 54.0727V64.7082H57.0534V54.0727C57.0534 49.1981 55.124 46.7302 51.279 46.7302C47.8019 46.7302 46.0651 48.8163 46.0617 52.9069V72.3371H38.0656V52.3172C38.0656 48.2266 39.1191 44.9769 41.2262 42.568C43.3998 40.1648 46.2509 38.9308 49.7898 38.9308C53.8859 38.9308 56.9812 40.492 59.0447 43.6111L61.036 46.9245L63.0308 43.6111C65.0943 40.492 68.1896 38.9308 72.2788 38.9308C75.8143 38.9308 78.6654 40.1648 80.8459 42.568C82.9529 44.9746 84.0065 48.2243 84.0065 52.3172L83.9996 72.3371Z" fill="#FBFBFB" fill-opacity="0.97"/>
-</g>
-<defs>
-<filter id="filter0_di_2_2" x="21" y="27" width="79" height="83" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="4"/>
-<feGaussianBlur stdDeviation="2"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.261224 0 0 0 0 0.16597 0 0 0 0 0.662652 0 0 0 0.4 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_2"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_2_2" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="4"/>
-<feGaussianBlur stdDeviation="2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.337255 0 0 0 0 0.227451 0 0 0 0 0.8 0 0 0 0.05 0"/>
-<feBlend mode="normal" in2="shape" result="effect2_innerShadow_2_2"/>
-</filter>
-<linearGradient id="paint0_linear_2_2" x1="61" y1="130" x2="61" y2="-91.5" gradientUnits="userSpaceOnUse">
-<stop offset="0.0755157" stop-color="#563ACC"/>
-<stop offset="0.520094" stop-color="#6364FF"/>
-</linearGradient>
-</defs>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"><rect id="pool_toy_valve" x="0" y="0" width="32" height="32" style="fill:none;"/><clipPath id="_clip1"><rect x="0" y="0" width="32" height="32"/></clipPath><g clip-path="url(#_clip1)"><g id="outline"><rect x="5" y="8" width="15" height="8"/><path id="hinge-bottom" serif:id="hinge bottom" d="M8.586,6c1.292,-1.059 4.574,-1.813 8.414,-1.813c3.84,0 7.122,0.754 8.414,1.813l2.586,0c0.265,0 0.52,0.105 0.707,0.293c0.188,0.187 0.293,0.442 0.293,0.707c0,0.034 -0.002,0.067 -0.005,0.101l0.005,0l0,1.899c0,0.265 -0.105,0.52 -0.293,0.707c-0.187,0.188 -0.442,0.293 -0.707,0.293l-2.586,0l0,0c-0.689,0.564 -1.942,1.042 -3.544,1.365l0,1.064c1.313,0.398 2.13,0.955 2.13,1.571c0,0 0,1.22 0,1.22c1.61,0.684 2.633,1.602 2.731,2.618l2.269,8.162c0,0 0,0 -0.001,0.001c-7.258,4.871 -16.74,4.871 -23.998,0c-0.001,-0.001 -0.001,-0.001 -0.001,-0.001l1.446,-5.203c-2.56,-0.685 -4.446,-3.021 -4.446,-5.797c0,-0.771 0,-1.476 0,-2.009c0,0 0,-0.991 0,-0.991c0,-1.591 0.632,-3.117 1.757,-4.243c1.126,-1.125 2.652,-1.757 4.243,-1.757l0.586,0Zm0,4l-0.698,0c-1.037,0 -2.031,0.413 -2.762,1.149c-0.632,0.635 -1.022,1.465 -1.112,2.348c0.228,1.844 1.711,3.298 3.567,3.483c0.431,-0.672 1.277,-1.275 2.419,-1.76l0,-1.22c0,-0.616 0.817,-1.173 2.13,-1.571l0,-1.064c-1.602,-0.323 -2.855,-0.801 -3.544,-1.365Z" style="fill:none;stroke:#000;stroke-width:4px;"/></g><g id="emoji"><path id="hinge-bottom1" serif:id="hinge bottom" d="M8.597,17l0,2l-1.597,1l-4,-2l-1,-6l1,-3l2,-2l3.599,-1l-0.002,2c0,0 -0.241,0 -0.613,0c-1.064,0 -2.083,0.423 -2.833,1.176c-0.751,0.753 -1.171,1.774 -1.167,2.837c0.001,0.332 0.002,0.668 0.003,1c0.007,2.204 1.796,3.987 4,3.987c0.37,0 0.61,0 0.61,0Z" style="fill:#9a9a9a;"/><g id="base"><path d="M7.296,17.739l-2.296,8.261c0,0 0,0 0.001,0.001c7.258,4.871 16.74,4.871 23.998,0c0.001,-0.001 0.001,-0.001 0.001,-0.001l-2.296,-8.261l-9.704,-2.759l-9.704,2.759Z" style="fill:#c1c1c1;"/><ellipse cx="17" cy="18" rx="9.739" ry="4" style="fill:#9a9a9a;"/></g><rect x="6" y="17" width="4" height="2" style="fill:#9a9a9a;"/><path d="M10,14c0,-1.207 3.137,-2.187 7,-2.187c3.863,0 7,0.98 7,2.187c0,0 0,4 0,4c0,1.207 -3.137,2.188 -7,2.188c-3.863,0 -7,-0.981 -7,-2.188l0,-4Z" style="fill:#d2d2d2;"/><g id="lid-press" serif:id="lid press"><path d="M12.13,14l9.74,0l0,3c0,0.84 -2.182,1.522 -4.87,1.522c-2.688,0 -4.87,-0.682 -4.87,-1.522l0,-3Z" style="fill:#c7c7c7;"/><path d="M21.87,7.652l0,6.348c0,0.84 -2.182,1.522 -4.87,1.522c-2.688,0 -4.87,-0.682 -4.87,-1.522l0,-6.348l9.74,0Z" style="fill:#737373;"/></g><g id="lid"><path d="M9.1,7.652c1.529,-0.872 4.495,-1.465 7.9,-1.465c3.405,0 6.371,0.593 7.9,1.465l1.098,0l0,1.283c0.001,0.022 0.002,0.043 0.002,0.065c0,0.022 -0.001,0.043 -0.002,0.065l0,0.123l-0.018,0c-0.309,1.464 -4.214,2.625 -8.98,2.625c-4.766,0 -8.671,-1.161 -8.98,-2.625l-0.018,0l0,-0.123c-0.001,-0.022 -0.002,-0.043 -0.002,-0.065c0,-0.022 0.001,-0.043 0.002,-0.065l0,-1.283l1.098,0Z" style="fill:#808080;"/><ellipse cx="17" cy="7" rx="9" ry="2.812" style="fill:#d2d2d2;"/></g><path d="M8.597,10l-0.613,0c-1.064,0 -2.083,0.423 -2.833,1.176c-0.751,0.753 -1.171,1.774 -1.167,2.837c0.001,0.332 0.002,0.668 0.003,1c0.007,2.063 1.574,3.757 3.582,3.965l-0.001,0.022l-0.545,1.921c-2.849,-0.467 -5.023,-2.94 -5.023,-5.921c0,-0.333 0,-0.667 0,-1c0,-1.591 0.632,-3.117 1.757,-4.243c1.126,-1.125 2.652,-1.757 4.243,-1.757c0.371,0 0.599,0 0.599,0l-0.002,2Z" style="fill:#808080;"/><path id="hinge-top" serif:id="hinge top" d="M11,8l0,-2c0,0 -1.348,0 -3,0c-3.314,0 -6,2.686 -6,6c0,1.148 0,2 0,2c0,0 0,-0.001 0,-0.002c0,-1.591 0.632,-3.116 1.757,-4.241c1.125,-1.125 2.65,-1.757 4.241,-1.757c1.653,0 3.002,0 3.002,0Z" style="fill:#d2d2d2;"/><path id="hinge-bottom2" serif:id="hinge bottom" d="M25.414,7.101l0,2.899c0,0 1.525,0 2.586,0c0.265,0 0.52,-0.105 0.707,-0.293c0.188,-0.187 0.293,-0.442 0.293,-0.707c0,-0.838 0,-1.899 0,-1.899l-3.586,0Z" style="fill:#808080;"/><path id="hinge-bottom3" serif:id="hinge bottom" d="M24,6l0,2c0,0 2.541,0 4,0c0.265,0 0.52,-0.105 0.707,-0.293c0.188,-0.187 0.293,-0.442 0.293,-0.707c0,-0.265 -0.105,-0.52 -0.293,-0.707c-0.187,-0.188 -0.442,-0.293 -0.707,-0.293c-1.459,0 -4,0 -4,0Z" style="fill:#d2d2d2;"/><ellipse cx="17" cy="7" rx="5" ry="1.562" style="fill:#a3a3a3;"/></g></g></svg>

app/javascript/images/logo.svg

@@ -1,10 +1 @@
-<svg width="65" height="65" viewBox="0 0 61 65" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M60.7539 14.3904C59.8143 7.40642 53.7273 1.90257 46.5117 0.836066C45.2943 0.655854 40.6819 0 29.9973 0H29.9175C19.2299 0 16.937 0.655854 15.7196 0.836066C8.70488 1.87302 2.29885 6.81852 0.744617 13.8852C-0.00294988 17.3654 -0.0827298 21.2237 0.0561464 24.7629C0.254119 29.8384 0.292531 34.905 0.753482 39.9598C1.07215 43.3175 1.62806 46.6484 2.41704 49.9276C3.89445 55.9839 9.87499 61.0239 15.7344 63.0801C22.0077 65.2244 28.7542 65.5804 35.2184 64.1082C35.9295 63.9428 36.6318 63.7508 37.3252 63.5321C38.8971 63.0329 40.738 62.4745 42.0913 61.4937C42.1099 61.4799 42.1251 61.4621 42.1358 61.4417C42.1466 61.4212 42.1526 61.3986 42.1534 61.3755V56.4773C42.153 56.4557 42.1479 56.4345 42.1383 56.4151C42.1287 56.3958 42.1149 56.3788 42.0979 56.3655C42.0809 56.3522 42.0611 56.3429 42.04 56.3382C42.019 56.3335 41.9971 56.3336 41.9761 56.3384C37.8345 57.3276 33.5905 57.8234 29.3324 57.8156C22.0045 57.8156 20.0336 54.3384 19.4693 52.8908C19.0156 51.6397 18.7275 50.3346 18.6124 49.0088C18.6112 48.9866 18.6153 48.9643 18.6243 48.9439C18.6333 48.9236 18.647 48.9056 18.6643 48.8915C18.6816 48.8774 18.7019 48.8675 18.7237 48.8628C18.7455 48.858 18.7681 48.8585 18.7897 48.8641C22.8622 49.8465 27.037 50.3423 31.2265 50.3412C32.234 50.3412 33.2387 50.3412 34.2463 50.3146C38.4598 50.1964 42.9009 49.9808 47.0465 49.1713C47.1499 49.1506 47.2534 49.1329 47.342 49.1063C53.881 47.8507 60.1038 43.9097 60.7362 33.9301C60.7598 33.5372 60.8189 29.8148 60.8189 29.4071C60.8218 28.0215 61.2651 19.5781 60.7539 14.3904Z" fill="url(#paint0_linear_89_8)"/>
-<path d="M50.3943 22.237V39.5876H43.5185V22.7481C43.5185 19.2029 42.0411 17.3949 39.036 17.3949C35.7325 17.3949 34.0778 19.5338 34.0778 23.7585V32.9759H27.2434V23.7585C27.2434 19.5338 25.5857 17.3949 22.2822 17.3949C19.2949 17.3949 17.8027 19.2029 17.8027 22.7481V39.5876H10.9298V22.237C10.9298 18.6918 11.835 15.8754 13.6453 13.7877C15.5128 11.7049 17.9623 10.6355 21.0028 10.6355C24.522 10.6355 27.1813 11.9885 28.9542 14.6917L30.665 17.5633L32.3788 14.6917C34.1517 11.9885 36.811 10.6355 40.3243 10.6355C43.3619 10.6355 45.8114 11.7049 47.6847 13.7877C49.4931 15.8734 50.3963 18.6899 50.3943 22.237Z" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_89_8" x1="30.5" y1="0" x2="30.5" y2="65" gradientUnits="userSpaceOnUse">
-<stop stop-color="#6364FF"/>
-<stop offset="1" stop-color="#563ACC"/>
-</linearGradient>
-</defs>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"><rect id="pool_toy_valve" x="0" y="0" width="32" height="32" style="fill:none;"/><clipPath id="_clip1"><rect x="0" y="0" width="32" height="32"/></clipPath><g clip-path="url(#_clip1)"><g id="outline"><rect x="5" y="8" width="15" height="8"/><path id="hinge-bottom" serif:id="hinge bottom" d="M8.586,6c1.292,-1.059 4.574,-1.813 8.414,-1.813c3.84,0 7.122,0.754 8.414,1.813l2.586,0c0.265,0 0.52,0.105 0.707,0.293c0.188,0.187 0.293,0.442 0.293,0.707c0,0.034 -0.002,0.067 -0.005,0.101l0.005,0l0,1.899c0,0.265 -0.105,0.52 -0.293,0.707c-0.187,0.188 -0.442,0.293 -0.707,0.293l-2.586,0l0,0c-0.689,0.564 -1.942,1.042 -3.544,1.365l0,1.064c1.313,0.398 2.13,0.955 2.13,1.571c0,0 0,1.22 0,1.22c1.61,0.684 2.633,1.602 2.731,2.618l2.269,8.162c0,0 0,0 -0.001,0.001c-7.258,4.871 -16.74,4.871 -23.998,0c-0.001,-0.001 -0.001,-0.001 -0.001,-0.001l1.446,-5.203c-2.56,-0.685 -4.446,-3.021 -4.446,-5.797c0,-0.771 0,-1.476 0,-2.009c0,0 0,-0.991 0,-0.991c0,-1.591 0.632,-3.117 1.757,-4.243c1.126,-1.125 2.652,-1.757 4.243,-1.757l0.586,0Zm0,4l-0.698,0c-1.037,0 -2.031,0.413 -2.762,1.149c-0.632,0.635 -1.022,1.465 -1.112,2.348c0.228,1.844 1.711,3.298 3.567,3.483c0.431,-0.672 1.277,-1.275 2.419,-1.76l0,-1.22c0,-0.616 0.817,-1.173 2.13,-1.571l0,-1.064c-1.602,-0.323 -2.855,-0.801 -3.544,-1.365Z" style="fill:none;stroke:#000;stroke-width:4px;"/></g><g id="emoji"><path id="hinge-bottom1" serif:id="hinge bottom" d="M8.597,17l0,2l-1.597,1l-4,-2l-1,-6l1,-3l2,-2l3.599,-1l-0.002,2c0,0 -0.241,0 -0.613,0c-1.064,0 -2.083,0.423 -2.833,1.176c-0.751,0.753 -1.171,1.774 -1.167,2.837c0.001,0.332 0.002,0.668 0.003,1c0.007,2.204 1.796,3.987 4,3.987c0.37,0 0.61,0 0.61,0Z" style="fill:#9a9a9a;"/><g id="base"><path d="M7.296,17.739l-2.296,8.261c0,0 0,0 0.001,0.001c7.258,4.871 16.74,4.871 23.998,0c0.001,-0.001 0.001,-0.001 0.001,-0.001l-2.296,-8.261l-9.704,-2.759l-9.704,2.759Z" style="fill:#c1c1c1;"/><ellipse cx="17" cy="18" rx="9.739" ry="4" style="fill:#9a9a9a;"/></g><rect x="6" y="17" width="4" height="2" style="fill:#9a9a9a;"/><path d="M10,14c0,-1.207 3.137,-2.187 7,-2.187c3.863,0 7,0.98 7,2.187c0,0 0,4 0,4c0,1.207 -3.137,2.188 -7,2.188c-3.863,0 -7,-0.981 -7,-2.188l0,-4Z" style="fill:#d2d2d2;"/><g id="lid-press" serif:id="lid press"><path d="M12.13,14l9.74,0l0,3c0,0.84 -2.182,1.522 -4.87,1.522c-2.688,0 -4.87,-0.682 -4.87,-1.522l0,-3Z" style="fill:#c7c7c7;"/><path d="M21.87,7.652l0,6.348c0,0.84 -2.182,1.522 -4.87,1.522c-2.688,0 -4.87,-0.682 -4.87,-1.522l0,-6.348l9.74,0Z" style="fill:#737373;"/></g><g id="lid"><path d="M9.1,7.652c1.529,-0.872 4.495,-1.465 7.9,-1.465c3.405,0 6.371,0.593 7.9,1.465l1.098,0l0,1.283c0.001,0.022 0.002,0.043 0.002,0.065c0,0.022 -0.001,0.043 -0.002,0.065l0,0.123l-0.018,0c-0.309,1.464 -4.214,2.625 -8.98,2.625c-4.766,0 -8.671,-1.161 -8.98,-2.625l-0.018,0l0,-0.123c-0.001,-0.022 -0.002,-0.043 -0.002,-0.065c0,-0.022 0.001,-0.043 0.002,-0.065l0,-1.283l1.098,0Z" style="fill:#808080;"/><ellipse cx="17" cy="7" rx="9" ry="2.812" style="fill:#d2d2d2;"/></g><path d="M8.597,10l-0.613,0c-1.064,0 -2.083,0.423 -2.833,1.176c-0.751,0.753 -1.171,1.774 -1.167,2.837c0.001,0.332 0.002,0.668 0.003,1c0.007,2.063 1.574,3.757 3.582,3.965l-0.001,0.022l-0.545,1.921c-2.849,-0.467 -5.023,-2.94 -5.023,-5.921c0,-0.333 0,-0.667 0,-1c0,-1.591 0.632,-3.117 1.757,-4.243c1.126,-1.125 2.652,-1.757 4.243,-1.757c0.371,0 0.599,0 0.599,0l-0.002,2Z" style="fill:#808080;"/><path id="hinge-top" serif:id="hinge top" d="M11,8l0,-2c0,0 -1.348,0 -3,0c-3.314,0 -6,2.686 -6,6c0,1.148 0,2 0,2c0,0 0,-0.001 0,-0.002c0,-1.591 0.632,-3.116 1.757,-4.241c1.125,-1.125 2.65,-1.757 4.241,-1.757c1.653,0 3.002,0 3.002,0Z" style="fill:#d2d2d2;"/><path id="hinge-bottom2" serif:id="hinge bottom" d="M25.414,7.101l0,2.899c0,0 1.525,0 2.586,0c0.265,0 0.52,-0.105 0.707,-0.293c0.188,-0.187 0.293,-0.442 0.293,-0.707c0,-0.838 0,-1.899 0,-1.899l-3.586,0Z" style="fill:#808080;"/><path id="hinge-bottom3" serif:id="hinge bottom" d="M24,6l0,2c0,0 2.541,0 4,0c0.265,0 0.52,-0.105 0.707,-0.293c0.188,-0.187 0.293,-0.442 0.293,-0.707c0,-0.265 -0.105,-0.52 -0.293,-0.707c-0.187,-0.188 -0.442,-0.293 -0.707,-0.293c-1.459,0 -4,0 -4,0Z" style="fill:#d2d2d2;"/><ellipse cx="17" cy="7" rx="5" ry="1.562" style="fill:#a3a3a3;"/></g></g></svg>

config/application.rb

@@ -189,7 +189,7 @@ module Mastodon
       if config.i18n.available_locales.include?(custom_default_locale)
         custom_default_locale
       else
-        :en
+        :'en-SQ'
       end
     end
 

config/settings.yml

@@ -16,7 +16,7 @@ defaults: &defaults
   show_staff_badge: true
   preview_sensitive_media: false
   noindex: false
-  theme: 'default'
+  theme: 'pop-wider'
   trends: true
   trends_as_landing_page: true
   trendable_by_default: false