Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update icons, strapline and logo #219

Merged
merged 3 commits into from
Aug 9, 2024
Merged

Update icons, strapline and logo #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18980ad
Replace type logo with new logo
chrislo Aug 9, 2024
0384976
Replace headphone / my collection icon
chrislo Aug 9, 2024
35ac547
Update strap line on home page.
chrislo Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/views/interests/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
)
%>

<h1 class="text-4xl tracking-tight leading-10 font-extrabold mb-3">A new music platform. <br /> <span class="text-amber-600">For us.</span></h1>
<h1 class="text-4xl tracking-tight leading-10 font-extrabold mb-3">An online music store. <br /> <span class="text-amber-600">Owned by us.</span></h1>

<div class="max-w-3xl">
<p class="mb-3 text-slate-600">We're a co-operative music platform, 100% run by and for the benefit of musicians, fans and the people who make it. <%= text_link_to "Find out more", about_path %>.</p>
<p class="mb-3 text-slate-600">We're a co-operatively owned music store, 100% run by and for the benefit of musicians, fans and the people who work here. <%= text_link_to "Find out more", about_path %>.</p>
</div>

<section class="mt-6 mb-12">
Expand Down
25 changes: 17 additions & 8 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,28 @@

<body class="bg-slate-100">
<div class="mx-auto sm:w-2/3 w-full text-slate-800">
<nav class="w-full flex justify-between items-center h-10 px-2 sm:mt-2">
<div><a href="/" class="text-l font-semibold text-slate-500">jam.coop</a></div>
<nav class="w-full flex justify-between items-center px-1 sm:mt-2">
<div>
<a href="/">
<svg width="7em" viewBox="0 0 139 80" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M26.6722 57.9141C26.6752 65.3049 22.8061 71.831 15.0096 72.2526C12.8356 72.4218 10.6615 72.2156 8.60105 71.5079C7.95006 71.2741 7.48639 71.0033 7.35742 70.5541C7.18239 69.3356 7.97463 68.2249 8.34619 67.0372C9.37487 63.6064 10.769 65.4279 13.3545 65.0402C17.5368 64.6033 18.5624 60.4679 18.458 56.8002C18.4273 53.2526 18.5194 38.8156 18.4242 32.8741C18.3413 32.5418 17.9514 32.5418 17.6474 32.511C16.7476 32.4372 14.3955 32.5541 13.3914 32.4218C12.725 32.3695 12.4855 31.8372 12.4794 31.2033C12.4456 30.0372 12.4456 27.8126 12.4794 26.8341C12.4978 26.3787 12.593 25.8956 13.1303 25.8679C16.0659 25.8033 21.9525 25.8526 24.6854 25.8372C24.9065 25.8372 25.708 25.8249 25.8861 25.8249C26.0304 25.8249 26.1747 25.8249 26.316 25.8618C26.4818 25.9049 26.6292 25.9633 26.6415 26.1479C26.6445 26.2126 26.6507 26.2741 26.6507 26.3387C26.6537 26.4556 26.6568 26.5695 26.6599 26.6864C26.666 26.9787 26.6691 27.271 26.6722 27.5633C26.6752 27.9295 26.6814 28.2987 26.6845 28.6649C26.6875 29.0987 26.6906 29.5326 26.6937 29.9664C26.6937 30.4587 26.6967 30.951 26.6998 31.4433C26.6998 31.9849 26.6998 32.5264 26.7029 33.071C26.7029 33.6556 26.7029 34.2402 26.7029 34.8249C26.7029 35.4433 26.7029 36.0618 26.7029 36.6802C26.7029 37.2987 26.7029 37.9695 26.7029 38.6126C26.7029 39.2556 26.7029 39.9356 26.7029 40.5972C26.7029 41.2587 26.7029 41.9387 26.7029 42.6095C26.7029 43.2802 26.7029 43.9541 26.6998 44.6249C26.6967 45.2956 26.6998 45.9572 26.6967 46.6218C26.6937 47.2864 26.6967 47.9233 26.6937 48.5726C26.6906 49.2218 26.6937 49.8279 26.6906 50.4526C26.6875 51.0772 26.6906 51.6433 26.6875 52.2402C26.6875 52.7972 26.6875 53.3541 26.6845 53.9079C26.6845 54.4156 26.6845 54.9264 26.6845 55.4341C26.6845 55.8864 26.6845 56.3387 26.6845 56.7941C26.6845 57.1295 26.6967 57.4649 26.6845 57.8002V57.911L26.6722 57.9141ZM64.2208 50.4218L64.1409 50.3941C63.8339 50.2833 63.797 50.0464 63.7847 49.7541C63.7755 47.2495 63.7755 36.0556 63.7847 33.3449C63.797 32.9449 63.8738 32.7202 64.2208 32.6064C65.1696 32.2526 66.88 32.8772 67.5064 31.8341C67.8749 30.4926 67.6078 28.4279 67.6723 27.0987C67.663 26.7695 67.6323 26.3541 67.4942 26.1233C67.3468 25.9018 67.1134 25.8556 66.8401 25.8341C65.578 25.791 62.016 25.8249 59.3291 25.8156C58.0579 25.8279 57.0169 25.7818 56.4611 25.8526C56.1663 25.8987 55.9821 26.0064 55.8746 26.2741C55.4079 26.9849 56.3475 31.9202 54.7139 29.391C51.6155 24.9264 45.0749 23.9572 40.2171 25.6433C35.4452 27.2064 31.963 31.6402 30.8882 36.511C29.1257 43.9141 31.3949 53.6033 38.9888 56.8926C43.4628 58.8772 49.6718 58.5849 53.3904 55.3387C54.1366 54.7295 54.7968 53.9202 55.3741 53.1756C55.7272 52.7326 55.9483 52.5787 56.0527 52.9479C56.2247 53.6556 56.1203 55.1541 56.1725 55.8987C56.1909 56.6956 56.3659 57.1726 57.152 57.1726C59.0221 57.1972 64.8165 57.1941 66.6835 57.1756C66.9691 57.1602 67.1809 57.1264 67.3253 57.0341C67.6293 56.8218 67.6385 56.4156 67.663 56.0526C67.6661 54.9018 67.7552 52.8095 67.6139 51.5233C67.3498 50.0249 65.2157 50.751 64.2208 50.4218ZM48.2285 50.8556C42.2376 51.3602 38.2272 46.2126 38.9949 40.2095C39.3327 32.6002 48.7014 29.4618 53.9431 34.6033L54.0475 34.7172C58.6321 39.9572 56.2984 50.8679 48.2285 50.8556ZM74.5783 32.6187C73.5926 32.2987 71.7655 32.8495 71.3448 31.5326C71.0623 30.1726 71.2251 28.0341 71.2435 26.911C71.2681 26.5849 71.3418 26.2895 71.5506 26.0864C71.8024 25.8802 72.1647 25.8526 72.527 25.8402C74.3879 25.8218 78.9878 25.831 81.0974 25.8341C81.687 25.8495 82.3502 25.8341 82.5529 26.4895C82.9736 27.3879 82.1814 31.2187 83.9439 28.7972C88.0464 23.6956 98.0078 23.4279 101.779 28.8095C102.942 30.5664 103.541 30.3695 104.769 28.831C109.501 23.3049 121.053 23.4433 124.483 29.871C127.474 35.2341 126.006 43.7941 126.39 49.3664C126.578 51.5602 130.21 49.4126 130.229 52.0279C130.296 53.0802 130.266 54.8126 130.25 55.7972C130.22 56.3449 130.232 57.0556 129.556 57.1233C126.765 57.2249 118.195 57.1264 115.21 57.1572C114.384 57.2033 114.022 56.911 114.012 56.0802C113.966 55.191 113.966 53.3695 114.003 52.191C114.04 51.751 114.077 51.2772 114.384 50.9572C115.406 49.9233 118.029 51.3079 118.284 49.4372C118.357 47.5479 118.302 42.8495 118.317 40.8618C118.33 38.7326 118.222 36.3387 116.985 34.4956C115.112 31.6895 110.226 31.6372 107.567 33.4556C103.974 36.1141 104.819 40.3233 104.696 44.471C104.705 46.3049 104.671 48.231 104.717 49.2556C104.751 49.6618 104.819 50.0433 105.178 50.2495C105.899 50.7172 108.003 50.2464 108.626 50.9572C108.93 51.2772 108.976 51.7418 109.007 52.191C108.976 53.7295 109.194 55.5356 108.854 56.7849C108.755 57.3664 106.907 57.1018 105.718 57.1602C101.815 57.151 95.2073 57.1787 93.3157 57.1449C92.3915 57.1079 92.4897 56.3787 92.4437 55.4772C92.4959 54.3356 92.2563 52.2772 92.6647 51.231C93.2881 50.0956 95.2472 50.7818 96.2053 50.2618C96.6567 50.0279 96.6843 49.5049 96.7027 49.0341C96.7212 47.1326 96.7058 42.9079 96.7089 40.8618C96.9208 37.0833 95.7692 32.4833 91.2092 32.2741C84.0238 31.7572 82.7986 37.191 83.1517 43.3849C83.207 45.3787 83.0196 47.8587 83.25 49.7387C83.775 51.2864 86.9164 49.6956 87.3555 51.4587C87.5612 53.0187 87.5827 55.2249 87.3401 56.7079C87.2726 56.8833 87.1743 56.9941 87.0085 57.0618C86.5172 57.231 85.335 57.1295 83.7106 57.1572C79.7862 57.1418 73.6847 57.1879 72.005 57.1325C71.6519 57.0956 71.4308 56.9879 71.3233 56.6249C71.1759 55.9602 71.2036 54.7879 71.2036 53.9356C71.2466 52.9879 71.0592 51.9633 71.5014 51.1295C72.0849 50.1664 74.394 50.7449 74.87 50.1787C75.0389 50.0218 75.0696 49.8218 75.0942 49.5849C75.1249 46.9726 75.1034 36.311 75.1034 33.5018C75.0849 33.1141 75.0634 32.791 74.6673 32.6402L74.5844 32.6095L74.5783 32.6187Z" fill="#1E293B"/>
<path d="M24.9372 11.7689C24.2586 11.532 23.6875 11.1659 23.7427 10.5228C23.7919 9.9597 24.4214 9.60278 24.538 9.05201C24.6517 8.51047 24.2033 7.97816 23.6782 7.80585C22.5881 7.45201 21.2708 7.97816 20.54 8.7997C20.1469 9.24278 19.7569 9.80893 19.1275 9.77508C18.0343 9.71662 17.4447 8.29201 16.5112 7.8397C16.1857 7.68278 15.808 7.62739 15.4764 7.76893C15.1447 7.91047 14.8807 8.27355 14.8899 8.66739C14.8991 9.07662 15.1785 9.40585 15.3873 9.74124C15.5992 10.0766 15.7466 10.5597 15.5102 10.8766C15.3321 11.1166 15.0096 11.1443 14.7302 11.1166C14.3187 11.0766 13.9165 10.9628 13.5081 10.9043C13.0997 10.8459 12.6698 10.8428 12.289 11.0182C11.9758 11.1597 11.5367 11.5412 11.5612 11.9659C11.5827 12.3135 11.8652 12.7782 12.1109 12.9812C12.6513 13.4243 13.4006 13.2889 13.9902 13.6089C14.2205 13.7351 14.4293 13.9412 14.5091 14.212C14.5797 14.4459 14.546 14.7043 14.4661 14.9351C14.2573 15.5382 13.8121 15.852 13.3975 16.2735C12.9001 16.7782 12.3688 17.3382 12.1078 18.0459L12.028 18.2643C11.6963 20.1105 15.7251 18.2951 16.1458 18.2274C16.7507 18.132 17.3925 18.1874 17.9299 18.5105C18.4703 18.8305 18.7098 19.3474 18.8357 19.9412C18.9463 20.4705 18.8296 21.0889 19.3854 21.4212C19.6986 21.6089 20.1316 21.5259 20.3957 21.2766C20.7826 20.9135 20.8071 20.2459 20.8501 19.7474C20.8993 19.1905 20.8624 18.5782 21.105 18.0582C21.3445 17.5412 22.0416 17.4182 22.5022 17.4982C23.018 17.5905 23.4817 17.892 23.9393 18.1812C24.3231 18.4243 24.7683 18.7289 25.2197 18.7751C25.5514 18.8089 25.9782 18.9443 26.3037 18.9012C26.4235 18.8859 26.5432 18.8212 26.6077 18.7105C26.8349 18.3105 26.3835 17.4859 26.2085 17.1135C25.9414 16.5412 25.5115 16.2366 25.5852 15.5197C25.6466 14.9197 26.0458 14.3628 26.5954 14.1135C26.8288 14.0059 27.0867 13.9535 27.3201 13.8459C27.5535 13.7382 27.7776 13.5566 27.836 13.3043C27.9035 13.0182 27.7377 12.7166 27.5043 12.5382C27.271 12.3597 26.9793 12.2797 26.6967 12.2028C26.3098 12.0982 25.579 11.9905 24.9372 11.7689Z" fill="#F16B7C"/>
<path d="M100.443 65.652C100.335 65.6489 99.5646 65.6951 99.4571 65.6089C99.3435 65.5166 99.4111 65.0828 99.2453 64.7874C98.8491 63.8643 97.5748 63.7412 96.7825 64.212C94.9678 65.5597 96.1684 68.8489 98.6587 68.1935C99.0733 68.1535 99.4909 67.7289 99.7765 67.5874C99.9699 67.5782 100.406 68.1228 100.507 68.2612C100.621 68.5012 100.16 68.7843 99.841 69.0028C96.54 70.8028 93.3341 67.7074 94.8756 64.3228C95.5696 62.6028 98.2074 62.1628 99.3988 63.5505C99.4479 63.5535 99.451 63.3843 99.4479 63.212C99.4172 62.7659 99.8625 62.9566 100.182 62.9166C100.375 62.9166 100.47 62.9228 100.489 62.9966C100.507 63.3105 100.507 65.5966 100.489 65.6366L100.44 65.6582L100.443 65.652ZM101.981 67.8428C99.9116 63.5935 105.571 60.6828 108.04 64.3135C108.918 65.9289 108.476 68.3412 106.692 69.1474C105.215 69.8674 102.884 69.5043 102.03 67.9289L101.981 67.8428ZM107.079 66.0458C107.14 63.172 102.654 63.2951 102.97 66.292C103.074 69.0058 107.155 68.8428 107.079 66.1597V66.0458ZM109.609 65.0889C109.624 65.0735 109.661 65.0735 109.68 65.0705C109.713 65.0705 109.858 65.0705 109.898 65.0705C110.085 65.0705 110.272 65.0674 110.456 65.0643C110.681 65.0643 110.905 65.0643 111.126 65.0643C111.365 65.0643 111.602 65.0643 111.841 65.0643C112.072 65.0643 112.302 65.0643 112.532 65.0643C112.732 65.0643 112.931 65.0643 113.134 65.0643C113.3 65.0643 113.463 65.0612 113.628 65.0643C113.687 65.0643 113.742 65.0705 113.8 65.0735C113.81 65.0735 113.819 65.0735 113.828 65.0797C113.85 65.0951 113.846 65.1566 113.846 65.1812C113.846 65.2305 113.846 65.2828 113.846 65.332C113.846 65.4305 113.846 65.5259 113.846 65.6243C113.846 65.8059 113.846 65.9843 113.843 66.1658C113.843 66.2028 113.865 66.2951 113.813 66.3074C113.791 66.3135 113.764 66.3074 113.742 66.3074C113.717 66.3074 113.693 66.3074 113.668 66.3074C113.619 66.3074 113.57 66.3074 113.521 66.3074C113.423 66.3074 113.321 66.3074 113.223 66.3074C113.027 66.3074 112.833 66.3074 112.637 66.3074C112.409 66.3074 112.182 66.3074 111.955 66.3074C111.718 66.3074 111.482 66.3074 111.249 66.3074C111.028 66.3074 110.81 66.3074 110.588 66.3074C110.41 66.3074 110.229 66.3074 110.051 66.3074C109.934 66.3074 109.821 66.3074 109.704 66.3012C109.676 66.3012 109.627 66.3074 109.612 66.2858C109.603 66.2735 109.6 66.2551 109.6 66.2397C109.594 66.1874 109.594 66.132 109.59 66.0797C109.584 65.9382 109.581 65.7966 109.578 65.6551C109.575 65.5135 109.578 65.3782 109.584 65.2397C109.584 65.1966 109.59 65.1566 109.6 65.1166C109.6 65.1074 109.606 65.0982 109.612 65.092L109.609 65.0889ZM115.373 67.8428C113.303 63.5935 118.962 60.6828 121.431 64.3135C122.309 65.9289 121.867 68.3412 120.083 69.1474C118.606 69.8674 116.275 69.5043 115.422 67.9289L115.373 67.8428ZM120.47 66.0458C120.531 63.172 116.045 63.2951 116.361 66.292C116.466 69.0058 120.547 68.8428 120.47 66.1597V66.0458ZM123.482 64.0551C123.326 64.0028 122.61 64.2182 122.678 63.7782C122.73 63.4889 122.521 62.8705 122.884 62.9105C123.157 62.9105 123.789 62.9105 124.244 62.9105C124.732 62.9228 124.846 62.8274 124.824 63.2089V63.5966L124.867 63.772C126.043 62.1228 129.05 62.4951 129.86 64.3105C131.205 66.892 129.212 70.3412 126.151 69.3351C124.662 68.8058 124.926 67.3597 124.901 70.0028C124.919 70.6089 124.855 71.0951 124.947 71.1351C125.269 71.1935 125.638 71.1135 125.957 71.2058C126.037 71.2705 125.988 71.7259 126.003 72.0243C126.003 72.3228 125.982 72.3012 125.752 72.2982C125.184 72.292 123.458 72.3105 122.742 72.2889C122.666 72.2735 122.684 72.1228 122.681 71.8335C122.684 71.6212 122.669 71.3966 122.693 71.2889C122.693 71.1012 123.117 71.1751 123.375 71.1535C123.614 71.1505 123.531 71.1012 123.55 70.9289C123.535 69.612 123.574 64.5351 123.538 64.0551L123.485 64.0458L123.482 64.0551ZM128.878 66.1043C128.878 65.4459 128.693 64.9259 128.328 64.5351C127.963 64.1474 127.471 63.9535 126.857 63.9535C126.243 63.9535 125.755 64.1474 125.389 64.5351C125.024 64.9228 124.84 65.4459 124.84 66.1043C124.84 66.7628 125.024 67.2735 125.389 67.6674C125.755 68.0612 126.246 68.2582 126.857 68.2582C127.468 68.2582 127.959 68.0612 128.328 67.6674C128.693 67.2766 128.878 66.7535 128.878 66.1043Z" fill="#F16B7C"/>
</svg>
</a>
</div>
<div class="flex gap-4 items-center">
<%= content_for(:navbar) %>

<div class="flex gap-2 items-center">
<% if Current.user %>
<div class="w-8 h-8 ">
<%= link_to collection_path do %>
<svg class="fill-slate-600 hover:fill-amber-600" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m21.75 12a19.6 19.6 0 0 1 -.59 4.634c-.007.033-.006.065-.014.1-.018.072-.043.141-.062.213-.027.108-.062.212-.091.319-.094.343-.183.688-.293 1.02l-.471 1.526a2.758 2.758 0 0 1 -2.63 1.94 2.708 2.708 0 0 1 -.8-.121l-.966-.3a1.748 1.748 0 0 1 -1.161-2.186l1.484-4.854a1.75 1.75 0 0 1 2.187-1.161l.942.289a2.7 2.7 0 0 1 .85.444 17 17 0 0 0 .115-1.863 8.25 8.25 0 0 0 -16.5 0 16.987 16.987 0 0 0 .116 1.865 2.723 2.723 0 0 1 .85-.444l.942-.288a1.75 1.75 0 0 1 2.187 1.16l1.484 4.856a1.747 1.747 0 0 1 -1.162 2.185l-.965.3a2.708 2.708 0 0 1 -.8.121 2.758 2.758 0 0 1 -2.63-1.94l-.472-1.538c-.11-.327-.2-.677-.3-1.024-.028-.1-.062-.2-.089-.309-.018-.072-.043-.139-.061-.212-.008-.033-.007-.065-.014-.1a19.6 19.6 0 0 1 -.586-4.632 9.75 9.75 0 0 1 19.5 0z" /></svg>
<% end %>
</div>
<%= render partial: 'avatar_menu', locals: { user: Current.user } %>
<div class="w-8 h-8">
<%= link_to collection_path do %>
<svg viewBox="0 0 40 40" xmlns="http://www.w3.org/2000/svg"><path d="M20 5C11.7167 5 5 11.7167 5 20V31.6667C5 33.5 6.5 35 8.33333 35H15V21.6667H8.33333V20C8.33333 13.55 13.55 8.33333 20 8.33333C26.45 8.33333 31.6667 13.55 31.6667 20V21.6667H25V35H31.6667C33.5 35 35 33.5 35 31.6667V20C35 11.7167 28.2833 5 20 5ZM11.6667 25V31.6667H8.33333V25H11.6667ZM31.6667 31.6667H28.3333V25H31.6667V31.6667Z" fill="#1E293B"/>
</svg>
<% end %>
</div>
<%= render partial: 'avatar_menu', locals: { user: Current.user } %>
<% else %>
<%= link_to "sign up", sign_up_path, class: "underline text-slate-500" %>
<%= link_to "log in", log_in_path, class: "underline text-slate-500" %>
Expand Down