branding

diff --git a/src/cas/settings.py b/src/cas/settings.py
index e71c5d4..c54bc14 100644 (file)
--- a/src/cas/settings.py
+++ b/src/cas/settings.py
@@ -27,7 +27,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.

-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Europe/Warsaw'

 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html


@@ -126,7 +126,7 @@ SESSION_COOKIE_NAME = 'fnpcas'
 GRAVATAR_DEFAULT_IMAGE = 'mm'
 GRAVATAR_URL_PREFIX = 'https://www.gravatar.com/'
 
 GRAVATAR_DEFAULT_IMAGE = 'mm'
 GRAVATAR_URL_PREFIX = 'https://www.gravatar.com/'
 

-SITE_TITLE = 'Fundacja Nowoczesna Polska'
+SITE_TITLE = 'Fundacja Wolne Lektury'

 
 
 OIDC_USERINFO = 'emails.oidc.userinfo'
 
 
 OIDC_USERINFO = 'emails.oidc.userinfo'

diff --git a/src/cas/static/brackets.png b/src/cas/static/brackets.png
deleted file mode 100644 (file)
index b4593f9..0000000
Binary files a/src/cas/static/brackets.png and /dev/null differ

diff --git a/src/cas/static/css/main.css b/src/cas/static/css/main.css
index 3938f9a..bb1515d 100644 (file)
--- a/src/cas/static/css/main.css
+++ b/src/cas/static/css/main.css
@@ -72,7 +72,6 @@ header {
     padding: 1em 0;
 }
 header img {
     padding: 1em 0;
 }
 header img {

-    margin: 0 20px;

     vertical-align: middle;
 }
 footer, #content_push {
     vertical-align: middle;
 }
 footer, #content_push {

diff --git a/src/cas/static/fnp_black.png b/src/cas/static/fnp_black.png
deleted file mode 100644 (file)
index 411b2fd..0000000
Binary files a/src/cas/static/fnp_black.png and /dev/null differ

diff --git a/src/cas/static/logo.svg b/src/cas/static/logo.svg
new file mode 100644 (file)
index 0000000..984a919
--- /dev/null
+++ b/src/cas/static/logo.svg
@@ -0,0 +1,21 @@
+<svg width="230" height="44" viewBox="0 0 230 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M186.799 43.3845C186.654 43.3481 186.072 43.2026 185.489 43.1298C183.634 42.8388 182.761 41.2015 183.852 40.11C184.252 39.7098 184.689 39.6734 187.199 39.8189C190.365 40.0372 191.929 39.7825 194.04 38.7274C195.677 37.927 197.642 35.8895 198.478 34.1431C199.097 32.8697 199.861 29.8862 199.606 29.6315C199.534 29.5588 198.842 29.8134 198.078 30.1409C196.95 30.6139 196.368 30.723 195.277 30.5775C192.621 30.25 191.529 28.7583 191.347 25.1927C191.238 22.8278 191.238 22.7914 191.966 22.464C192.984 21.991 193.312 22.4276 193.676 24.8653C194.003 27.0483 194.294 27.5577 195.422 27.8123C196.441 28.067 197.823 26.9755 198.842 25.2291C199.606 23.8829 199.788 23.7374 200.698 23.6646C201.644 23.5919 201.753 23.6646 202.189 24.6106C202.844 26.1023 202.844 31.8873 202.189 33.9612C201.171 37.2357 198.296 40.4374 194.913 42.0383C192.948 42.9843 188 43.7847 186.799 43.3845Z" fill="#96C13D"/>
+<path d="M160.712 34.798C160.057 34.2886 160.057 34.2159 159.948 27.4849C159.839 22.8642 159.73 20.7176 159.512 20.754C157.256 21.1542 156.455 21.1542 156.31 20.7176C156.201 20.4629 156.273 20.0263 156.419 19.6988C156.71 19.1167 158.638 18.1343 159.475 18.0979C159.912 18.0979 159.948 17.7341 159.948 14.1321C159.948 11.9127 160.057 9.91165 160.239 9.62058C160.567 9.03844 161.658 8.92929 162.095 9.43866C162.24 9.62058 162.459 11.5489 162.568 13.6592L162.75 17.5158L165.733 17.5886C168.244 17.6613 168.789 17.7341 169.044 18.1343C169.262 18.4982 169.262 18.7892 168.935 19.3714C168.535 20.099 168.462 20.1354 165.66 20.2082L162.786 20.3173L163.004 24.4651C163.405 32.6514 163.405 34.0703 162.823 34.7252C162.168 35.4529 161.549 35.4893 160.712 34.798Z" fill="#96C13D"/>
+<path d="M123.419 32.142C123.019 31.5235 122.91 30.5047 122.764 26.357C122.582 21.3725 121.891 14.969 121.054 10.6393C120.545 7.98332 120.545 8.16524 121.054 7.65588C121.564 7.14651 122.619 7.11012 123.055 7.5831C124.001 8.71099 125.42 19.0803 126.148 29.8498C126.221 31.0505 126.039 31.8146 125.53 32.3239C124.766 33.088 124.001 33.0152 123.419 32.142Z" fill="#96C13D"/>
+<path d="M134.335 31.7782C131.679 31.2324 129.277 29.3769 128.113 26.9755C127.494 25.7021 127.385 25.2291 127.531 23.9557C127.967 19.7716 131.97 16.7154 135.863 17.5886C138.228 18.1343 139.283 19.8444 138.664 22.1365C138.082 24.2468 135.608 25.7385 132.697 25.7385C131.133 25.7385 130.987 25.9204 131.897 26.7573C133.17 27.9215 134.335 28.3217 136.481 28.3217C138.264 28.3217 138.773 28.2126 140.338 27.4485C142.266 26.5026 142.957 26.3934 143.612 26.9028C144.558 27.6305 144.486 28.4309 143.358 29.5224C141.538 31.378 137.318 32.3967 134.335 31.7782ZM134.735 23.0461C135.535 22.6823 135.935 22.3185 136.045 21.8091C136.59 19.5897 132.843 19.8808 131.315 22.1729C130.987 22.6823 130.696 23.1917 130.696 23.3372C130.733 23.8102 133.57 23.5919 134.735 23.0461Z" fill="#96C13D"/>
+<path d="M153.618 30.7594C152.963 30.0318 152.09 29.0494 151.726 28.5764L151.034 27.6668L149.979 29.1949C148.451 31.3779 146.96 31.8145 146.341 30.1773C145.759 28.7583 145.213 25.4838 144.922 21.7363C144.777 19.6624 144.449 16.4607 144.231 14.5687C144.012 12.7132 143.903 11.0759 143.976 10.9668C144.049 10.8212 144.34 10.7485 144.631 10.7485C145.468 10.7485 146.232 13.4045 147.105 19.4441C147.542 22.5004 148.015 25.1927 148.16 25.4474C148.306 25.7385 148.815 25.0108 149.979 22.7914C151.689 19.4805 152.308 18.8984 153.509 19.4441C154.709 19.9899 154.673 20.9359 153.363 23.4099L152.199 25.6293L154.564 27.8487C157.001 30.1773 157.329 30.7958 156.419 31.5962C155.582 32.3603 154.891 32.142 153.618 30.7594Z" fill="#96C13D"/>
+<path d="M175.411 30.0681L174.611 29.1586L173.083 29.9226C169.044 31.9601 165.042 29.7771 165.442 25.7385C165.515 24.8289 165.77 24.174 166.17 23.7738C167.043 22.9006 167.662 23.41 167.88 25.12C168.098 26.7209 168.462 27.5577 169.117 27.7032C169.845 27.8851 171.154 27.4485 172.028 26.7573C172.683 26.2115 172.865 25.8477 173.01 24.3923C173.228 22.5004 173.665 21.9546 174.938 21.9546C175.848 21.9546 176.321 22.6095 176.758 24.4287C176.939 25.12 177.412 26.4298 177.849 27.3758C178.722 29.1949 178.686 29.9226 177.776 30.5411C176.939 31.1597 176.285 31.0505 175.411 30.0681Z" fill="#96C13D"/>
+<path d="M180.723 29.8134C180.468 29.486 179.268 24.5378 179.268 23.7374C179.268 23.5191 179.523 23.1916 179.814 23.0461C180.287 22.7914 180.505 22.8642 181.269 23.6646L182.142 24.6106L183.088 23.9557C184.216 23.1916 187.127 22.2457 188.4 22.2457C189.455 22.2457 190.183 22.937 190.183 23.9557C190.183 24.9017 189.746 25.1927 187.636 25.6293C185.198 26.1387 184.18 26.83 183.343 28.5764C182.761 29.8135 182.542 30.0317 181.815 30.1045C181.378 30.1409 180.905 29.9954 180.723 29.8134Z" fill="#96C13D"/>
+<path d="M96.4952 34.7253C95.6584 33.6337 95.331 32.3239 95.1127 29.3405C95.0035 28.0671 94.858 26.7936 94.7852 26.539C94.385 25.12 91.9837 27.1939 90.8558 29.9226C90.0917 31.7418 89.4368 32.2148 88.4181 31.7054C87.6176 31.3052 87.363 30.432 87.181 26.9028C86.9991 23.7374 87.2538 22.0638 87.9815 21.5908C88.6 21.227 88.7819 21.518 89.2549 23.4827C89.4368 24.2832 89.6551 24.9745 89.7279 24.9745C89.8007 24.9745 90.2373 24.647 90.7102 24.2468C91.8381 23.3008 93.5482 22.5368 94.5669 22.5368C95.622 22.5368 97.041 23.41 97.6959 24.4651C97.987 24.9381 98.3508 26.2115 98.4963 27.2666C98.6419 28.3218 98.9693 30.0682 99.1876 31.1233C99.697 33.4155 99.697 34.8708 99.2604 35.3074C99.0785 35.4893 98.5327 35.6348 98.0597 35.6348C97.3684 35.5985 97.041 35.3802 96.4952 34.7253Z" fill="#85C7CC"/>
+<path d="M107.119 32.7606C104.827 32.0329 103.19 30.7231 102.244 28.8675C100.534 25.4838 103.699 20.4629 107.883 19.8808C110.394 19.5533 112.504 20.8268 112.868 22.9006C113.268 24.9381 110.867 27.8124 108.211 28.5037C106.282 29.0131 106.246 29.0858 107.265 29.5224C108.647 30.1046 111.413 29.8863 113.123 29.0494C113.923 28.6856 115.233 27.5941 116.288 26.539C117.707 25.0472 118.253 24.6834 118.908 24.6834C120.581 24.6834 120.836 25.9568 119.562 27.8124C116.834 31.7418 111.085 34.034 107.119 32.7606ZM107.52 26.2843C110.758 24.5743 111.085 22.1729 107.993 22.7551C106.392 23.0825 104.209 25.6658 104.645 26.7573C104.827 27.2666 106.064 27.0483 107.52 26.2843Z" fill="#85C7CC"/>
+<path d="M82.2329 31.9237C81.6872 31.5235 81.6508 31.2688 81.5052 19.335C81.3961 11.6581 81.4325 6.92822 81.6144 6.63715C81.9782 5.94587 82.9242 6.01864 83.2153 6.74631C83.5427 7.54675 84.2704 18.0252 84.4887 25.5202C84.6342 30.8686 84.6342 31.4507 84.1976 31.851C83.6519 32.4331 82.997 32.4695 82.2329 31.9237Z" fill="#85C7CC"/>
+<path d="M54.5815 31.0141L53.5992 29.959L52.7259 30.7231C51.2706 31.9965 49.9244 32.0693 48.5055 30.9414C47.4503 30.1046 46.9046 27.9943 47.0137 24.9017C47.0865 22.5732 47.1229 22.3549 47.6323 22.3549C48.1052 22.3549 48.2508 22.7187 48.7601 25.1928C49.124 27.012 49.5242 28.2126 49.8516 28.5401C50.361 29.0494 50.3974 29.0494 50.9432 28.4309C51.2706 28.1035 51.9619 27.012 52.4713 26.0296C53.4536 24.2104 53.9266 23.883 55.2364 24.2468C55.7822 24.3923 55.8913 24.647 56.0369 26.1024C56.2188 27.8488 56.5826 28.7947 57.0192 28.7947C57.6741 28.7947 59.275 26.066 59.9663 23.8102C60.7667 21.1542 61.2761 20.6448 62.6223 21.1906C63.7865 21.6272 64.0049 22.6095 63.4591 24.3923C61.8582 29.4497 59.4933 32.1056 56.5826 32.1056C55.7822 32.0329 55.3819 31.851 54.5815 31.0141Z" fill="#85C7CC"/>
+<path d="M70.5539 31.5963C67.4613 30.905 65.2419 28.8675 65.2419 26.6845C65.2419 25.6294 66.006 24.0649 66.8428 23.3736C67.6433 22.7187 69.4624 21.9546 70.2993 21.9546C70.7359 21.9546 71.3544 21.7727 71.6454 21.5544C72.9916 20.5357 76.2298 21.518 77.4304 23.3372C78.4856 24.9381 78.5583 26.2843 77.6851 28.0671C76.8483 29.8135 75.4293 30.8686 73.3555 31.4144C71.9001 31.7782 71.5363 31.8146 70.5539 31.5963ZM73.3555 27.9579C75.7204 26.9028 75.4293 25.1564 72.7006 24.1376C70.8814 23.4464 70.081 23.6283 68.7711 25.0472C67.8252 26.066 67.7888 26.5753 68.5892 27.3394C69.899 28.5764 71.5363 28.7947 73.3555 27.9579Z" fill="#85C7CC"/>
+<path d="M210.048 40.7285C209.757 40.2556 209.612 38.7274 209.503 34.507C209.393 30.8686 209.212 28.3217 208.921 27.2666C208.375 25.0472 208.375 24.1376 208.957 24.1376C209.212 24.1376 209.648 24.3196 209.903 24.5742C210.376 24.9745 210.485 24.9381 211.868 23.6647C213.65 22.0274 215.251 21.4816 216.743 22.0274C220.782 23.4464 221.436 29.486 217.762 31.4143C215.579 32.5786 213.359 32.1056 212.959 30.3592C212.704 29.2677 213.614 28.5037 215.142 28.5037C215.87 28.5037 216.525 28.3217 216.779 28.0671C217.725 27.1211 216.961 24.5742 215.651 24.2104C214.851 23.9921 213.287 24.7198 211.94 25.9204L211.176 26.6117L211.613 28.8675C211.868 30.1045 212.195 33.0516 212.341 35.3802C212.595 38.873 212.559 39.7826 212.268 40.4375C211.758 41.4562 210.594 41.6017 210.048 40.7285Z" fill="#85C7CC"/>
+<path d="M224.02 30.6139C221.546 28.9403 220.09 21.8818 220.272 12.6768C220.345 8.82015 220.382 8.71099 220.964 8.63823C221.91 8.49269 222.128 9.47505 222.565 15.4056C223.001 21.5908 223.547 24.7925 224.456 26.7572C225.257 28.5037 225.766 28.7947 227.222 28.4309C228.604 28.067 229.223 28.2853 229.223 29.1586C229.223 30.9777 225.948 31.9237 224.02 30.6139Z" fill="#85C7CC"/>
+<path d="M204.955 30.2865C204.518 29.7771 204.809 28.8675 205.537 28.4673C205.937 28.249 206.228 28.2854 206.737 28.6128C207.501 29.1222 207.538 29.2677 206.992 30.0682C206.483 30.7595 205.428 30.8686 204.955 30.2865Z" fill="#85C7CC"/>
+<path d="M25.1045 22.3759C24.3041 21.5754 24.3769 20.1929 25.3228 19.3196C26.5963 18.1554 30.9259 16.2634 36.4562 14.4806L39.185 13.6074L39.8399 11.388C40.2037 10.151 40.8222 7.7133 41.2225 5.9305C41.9501 2.72875 41.9501 2.69237 41.4044 2.87428C41.0769 2.94705 40.0218 3.20174 39.0758 3.42004C36.7473 3.92941 34.5279 4.62069 31.69 5.74858L29.3978 6.65817L28.0152 10.0782C27.2512 11.9702 26.2688 14.5534 25.7958 15.8268C25.1409 17.6096 24.8135 18.1554 24.4133 18.1554C23.6128 18.1554 23.8675 16.5909 25.2865 12.7706C25.9777 10.915 26.8873 8.47735 27.3239 7.34946L28.088 5.31198L29.6889 4.72985C30.5621 4.4024 32.2721 3.78387 33.4728 3.31088C35.2192 2.65598 39.2941 1.52809 42.9689 0.691271C43.2236 0.618504 43.6238 0.764032 43.8057 0.94595C44.1331 1.2734 44.024 1.92831 43.2599 5.20283C42.4231 8.73204 41.1861 13.28 40.7495 14.4806C40.6403 14.8081 39.0031 15.4994 35.4011 16.7C29.3614 18.7375 27.7242 19.4288 26.8873 20.1929C25.5775 21.3935 26.8873 21.539 30.6712 20.5931C32.0902 20.2292 34.3824 19.5016 35.8013 18.9558C38.9667 17.7188 40.4584 17.4641 40.9678 18.0826C41.5863 18.8103 41.0769 19.6107 40.0218 19.6107C39.5124 19.6107 38.2754 19.9382 37.2567 20.302C34.1277 21.5027 28.7065 22.8852 27.1784 22.8852C26.0141 22.9216 25.5048 22.8125 25.1045 22.3759Z" fill="#FBC40F"/>
+<path d="M14.5897 19.4288C13.3891 18.9922 11.3152 18.2282 9.93265 17.6824C8.58646 17.1366 6.9492 16.5545 6.29429 16.3726C5.3847 16.1179 5.09364 15.8632 4.98449 15.3175C4.91172 14.9172 4.65703 14.1896 4.40235 13.6438C2.83786 10.0782 0.32739 1.27342 0.654842 0.40021C0.727609 0.181909 1.01868 0 1.23698 0C1.92827 0 6.07599 0.982352 10.7331 2.29216L14.8808 3.42005L16.1542 7.31309C18.5192 14.6626 20.2656 18.2645 21.0296 17.5005C21.6118 16.9183 20.5566 12.7706 18.2281 6.47627C17.5732 4.69347 17.5732 3.34728 18.2645 2.94706C18.9194 2.54684 19.5743 3.16536 19.5743 4.22048C19.5743 4.69347 20.0109 6.29435 20.5566 7.78608C23.6492 16.3726 23.5765 19.829 20.4111 19.3924C18.883 19.1741 17.3549 16.1907 14.3351 7.42224L13.4619 4.87539L11.4244 4.22048C8.91391 3.42005 2.98339 2.07386 2.80147 2.25577C2.54679 2.51046 4.32958 9.02312 5.45747 11.7883L6.58536 14.5898L11.1333 16.409C13.6438 17.4277 16.2634 18.4465 16.9911 18.7011C17.937 19.0286 18.2645 19.2833 18.2281 19.6107C18.0826 20.3384 16.9547 20.2656 14.5897 19.4288Z" fill="#96B710"/>
+<path d="M0.327453 43.2237C0.145535 43.1509 0 42.8598 0 42.6051C0 41.9139 1.71003 34.6735 2.61962 31.6173L3.38367 28.9977L7.71331 27.5787C15.0264 25.2138 18.2645 23.6129 17.5005 22.8489C17.0275 22.3759 13.6438 23.1036 9.82356 24.4861C4.51156 26.3781 3.23813 26.56 2.83792 25.5049C2.58323 24.85 3.23814 24.2678 4.22049 24.2678C4.69348 24.2678 6.29436 23.8312 7.78608 23.2855C11.3881 22.0121 15.3539 20.9933 16.8092 20.9933C19.2105 20.9933 20.2656 23.0672 18.6648 24.5953C17.355 25.8323 13.28 27.6151 7.13118 29.5798L4.80263 30.3439L3.92942 33.5093C2.83792 37.3659 2.07386 40.8587 2.29216 41.077C2.54685 41.3317 9.0595 39.5489 11.9338 38.421L14.7717 37.2932L15.3175 35.765C15.6085 34.9282 16.5545 32.5633 17.3913 30.4894C18.2282 28.4519 18.9194 26.6328 18.9194 26.4872C18.9194 26.0142 19.6107 25.6504 20.011 25.9051C20.3384 26.1234 20.302 26.4509 19.829 28.1245C18.8831 31.2899 16.0088 38.5666 15.6085 38.7485C15.4266 38.8577 14.8081 39.0759 14.2987 39.2579C13.7894 39.4398 12.2613 40.0219 10.9151 40.5313C8.95036 41.2953 6.33074 42.023 1.20066 43.2237C0.83682 43.2964 0.50937 43.2964 0.327453 43.2237Z" fill="#E61E26"/>
+<path d="M39.0031 43.2237C37.4386 42.8598 34.5279 42.0594 32.5996 41.5136L29.0704 40.4949L27.2876 35.2193C24.8135 27.9426 24.0131 26.2689 23.0307 26.2689C22.0848 26.2689 23.0307 30.6713 25.3957 37.184C26.3416 39.8036 26.378 40.1674 25.905 40.8223C25.4321 41.4772 24.6316 41.1134 24.6316 40.2766C24.6316 39.9128 24.0131 37.7661 23.249 35.474C21.0296 28.743 20.6658 25.9415 22.012 25.0319C24.195 23.5038 25.8687 25.9779 28.9976 35.2193C29.7253 37.3659 30.3802 39.1851 30.4166 39.2215C30.8532 39.6581 40.9314 42.1321 41.2953 41.9138C41.8774 41.5864 37.9844 29.6526 37.1476 29.216C36.7473 28.9977 27.2512 25.2866 26.4508 25.0683C26.1597 24.9591 25.9778 24.7044 26.0506 24.4497C26.1961 23.7221 27.2512 23.9404 31.3262 25.5049C33.2909 26.2689 35.7286 27.1785 36.7837 27.5423C38.6393 28.1972 38.712 28.2336 39.1487 29.5071C39.4033 30.2347 40.0219 31.9084 40.5676 33.2909C41.6591 36.0925 43.2964 42.4232 43.1508 43.3328C42.9325 44.0241 42.3868 44.0241 39.0031 43.2237Z" fill="#85C7CC"/>
+</svg>

diff --git a/src/cas/templates/base.html b/src/cas/templates/base.html
index e136561..849809b 100644 (file)
--- a/src/cas/templates/base.html
+++ b/src/cas/templates/base.html
@@ -3,7 +3,7 @@
   {% load static %}
   <head>
     <meta charset="utf-8" />
   {% load static %}
   <head>
     <meta charset="utf-8" />

-    <title>{% block title %}Logowanie{% endblock %} | Fundacja Nowoczesna Polska</title>
+    <title>{% block title %}Logowanie{% endblock %} | Fundacja Wolne Lektury</title>

     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous">
     <link rel="stylesheet" href="{% static 'css/main.css' %}"/>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous">
     <link rel="stylesheet" href="{% static 'css/main.css' %}"/>
     <meta name="viewport" content="width=device-width, initial-scale=1">


@@ -14,9 +14,9 @@
     <div id="header-wrap">
       <header>
         <a href="/">
     <div id="header-wrap">
       <header>
         <a href="/">

-          <img title="Fundacja Nowoczesna Polska"
-               alt="Fundacja Nowoczesna Polska"
-               src="https://static.wolnelektury.pl/2022/images/logo.svg">
+          <img title="Fundacja Wolne Lektury"
+               alt="Fundacja Wolne Lektury"
+              src="{% static 'logo.svg' %}">

         </a>
       </header>
     </div>
         </a>
       </header>
     </div>