From 6aecd1c50bfff536fa25afa25de9cb9d221b4e8f Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Thu, 14 Mar 2024 00:59:16 +0100 Subject: [PATCH] Aggiustamenti a licenze, partners, social. --- content/pages/colophon.md | 8 ----- content/pages/license.md | 8 +++++ content/pages/partners.md | 3 ++ pelicanconf.py | 9 +++--- themes/pelican-blue/static/css/style.css | 33 +++++++++++++++++++-- themes/pelican-blue/templates/base.html | 9 ++++-- themes/pelican-blue/templates/license.html | 3 +- themes/pelican-blue/templates/partners.html | 3 +- themes/pelican-blue/templates/social.html | 1 + 9 files changed, 56 insertions(+), 21 deletions(-) delete mode 100644 content/pages/colophon.md create mode 100644 content/pages/license.md diff --git a/content/pages/colophon.md b/content/pages/colophon.md deleted file mode 100644 index 7bcd4b9..0000000 --- a/content/pages/colophon.md +++ /dev/null @@ -1,8 +0,0 @@ -title: Colophon - Conferenza Italiana LibreItalia -slug: colophon - -# Licenza - Conferenza Italiana LibreItalia # - -I contenuti del sito sono tutti rilasciati con licenza CC BY 3.0

- -[![cc-by-3.0](https://i0.wp.com/www.libreitalia.org/wp-content/uploads/2017/11/by.png?fit=249%2C87&ssl=1 "CC-BY 3.0 Logo")](https://creativecommons.org/licenses/by/3.0/it/ "Creative Commons - Attribuzione 3.0") diff --git a/content/pages/license.md b/content/pages/license.md new file mode 100644 index 0000000..1b987c1 --- /dev/null +++ b/content/pages/license.md @@ -0,0 +1,8 @@ +title: Licenze - Conferenza Italiana LibreItalia +slug: license + +# Licenza - Conferenza Italiana LibreItalia # + +I contenuti del sito sono tutti rilasciati con licenza [CC BY 4.0 ](https://creativecommons.org/licenses/by/4.0/deed.it "Creative Commons - Attribuzione 4.0"){:target="_blank"}. + +[![cc-by-4.0](https://i0.wp.com/www.libreitalia.org/wp-content/uploads/2017/11/by.png?fit=249%2C87&ssl=1 "CC-BY 4.0 Logo")](https://creativecommons.org/licenses/by/4.0/ "Creative Commons - BY 4.0 DEED"){:target="_blank"} diff --git a/content/pages/partners.md b/content/pages/partners.md index aa0b81b..a356823 100644 --- a/content/pages/partners.md +++ b/content/pages/partners.md @@ -2,6 +2,9 @@ title: Partners - Conferenza Italiana LibreItalia slug: partners --- + # Partners diff --git a/pelicanconf.py b/pelicanconf.py index 1ff05f6..45d87c4 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -39,10 +39,11 @@ MENUITEMS = ( #("Chill Room", "https://open.meet.garr.it/libreitaliaconf-chillroom", 1), ) -PARTNERS = ( - ('http://www.ils.org/', 'Italian Linux Society', 'https://upload.wikimedia.org/wikipedia/commons/0/0d/Logoilsvettoriale.svg', '50'), - ('https://www.garr.it/it/', 'Home | GARR', 'https://www.garr.it/images/logo_medio_garr.png', '150'), -) +#PARTNERS = ( +# ('http://www.ils.org/', 'Italian Linux Society', 'https://upload.wikimedia.org/wikipedia/commons/0/0d/Logoilsvettoriale.svg', '50'), +# ('https://www.garr.it/it/', 'Home | GARR', 'https://www.garr.it/images/logo_medio_garr.png', '150'), +#) +PARTNERS = () DISPLAY_PAGES_ON_MENU = False DISPLAY_CATEGORIES_ON_MENU = False diff --git a/themes/pelican-blue/static/css/style.css b/themes/pelican-blue/static/css/style.css index 229bee4..fa0ac34 100644 --- a/themes/pelican-blue/static/css/style.css +++ b/themes/pelican-blue/static/css/style.css @@ -101,7 +101,6 @@ article > header border-radius: 5px 5px; } - /* Links */; a { color:#3a7c78; text-decoration:none; } a:visited { color:#3a7c78; text-decoration:none; } @@ -144,6 +143,33 @@ aside > h2 { margin-bottom: 5px; } +aside #partners a { + font-style: italic; + color: white; + text-decoration: none; + display: block; + padding: 0.77273rem 0rem; + border: 0px solid #73d08a; + margin: 0px 5px; + border-radius: 10px 10px; + margin: 40px -30px; + -webkit-transition: 200ms; + -moz-transition: 200ms; + -ms-transition: 200ms; + -o-transition: 200ms; + transition: 200ms; +} + +aside #partners a:hover { + background-color: #73d08a; + color: #3a7c78; +} + +aside #partners a.active { + background-color: #4e8986; + font-weight: bold; +} + #avatar { margin: 0; @@ -201,6 +227,7 @@ aside > h2 { background-color: #4e8986; font-weight: bold; } + .nav a:hover { background-color: #73d08a; color: #3a7c78; @@ -276,10 +303,10 @@ td.hours { margin: 10px auto; } - #license, + /* #license, aside #partners, aside .social, - aside nav.nav { display: none; } + aside nav.nav { display: none; } */ aside .sidetitle { display: flex; align-items: center; diff --git a/themes/pelican-blue/templates/base.html b/themes/pelican-blue/templates/base.html index 8c0c6cc..6246875 100644 --- a/themes/pelican-blue/templates/base.html +++ b/themes/pelican-blue/templates/base.html @@ -132,7 +132,7 @@ {% endif %} - + {% include "partners.html" %} {% include "social.html" %} {% include "license.html" %} @@ -146,8 +146,11 @@ {% if DISPLAY_FOOTER or DISPLAY_FOOTER is not defined %} {% endif %} diff --git a/themes/pelican-blue/templates/license.html b/themes/pelican-blue/templates/license.html index f108958..b244994 100644 --- a/themes/pelican-blue/templates/license.html +++ b/themes/pelican-blue/templates/license.html @@ -1,4 +1,3 @@
-

I contenuti del sito sono tutti rilasciati con licenza CC BY 3.0

-

Creative Commons BY Logo

+

Creative Commons BY Logo

diff --git a/themes/pelican-blue/templates/partners.html b/themes/pelican-blue/templates/partners.html index 033d757..010a274 100644 --- a/themes/pelican-blue/templates/partners.html +++ b/themes/pelican-blue/templates/partners.html @@ -1,10 +1,11 @@
-

Partners:

{% if PARTNERS %} + {% else %} +

Partner e Sponsor

{% endif %}
diff --git a/themes/pelican-blue/templates/social.html b/themes/pelican-blue/templates/social.html index 152a102..d3fdc6d 100644 --- a/themes/pelican-blue/templates/social.html +++ b/themes/pelican-blue/templates/social.html @@ -1,5 +1,6 @@
{% if SOCIAL %} +   {% for name, link in SOCIAL %}   {% endfor %}