From 8b5b381ef280a361b250757759c9e0afe1099198 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Thu, 18 Nov 2021 00:39:56 +0100 Subject: [PATCH] Rivisto il layout largo e proporzionate scalarmente. Necessario test su qualche dispositivo tablet. --- content/pages/colophon.md | 8 ++ content/pages/live.md | 31 ++----- content/pages/partners.md | 40 ++++++++++ content/pages/social.md | 22 +++++ themes/pelican-blue/static/css/large.css | 80 ++++++++++++------- themes/pelican-blue/static/css/style.css | 9 ++- themes/pelican-blue/templates/base.html | 4 + themes/pelican-blue/templates/large_base.html | 10 ++- 8 files changed, 145 insertions(+), 59 deletions(-) create mode 100644 content/pages/colophon.md create mode 100644 content/pages/partners.md create mode 100644 content/pages/social.md diff --git a/content/pages/colophon.md b/content/pages/colophon.md new file mode 100644 index 0000000..27c4aaa --- /dev/null +++ b/content/pages/colophon.md @@ -0,0 +1,8 @@ +title: Colophon - Conferenza Italiana LibreItalia +slug: colophon + +# Licenza - LibreItalia Conference 2021 # + +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/live.md b/content/pages/live.md index 679b9dd..7a81250 100644 --- a/content/pages/live.md +++ b/content/pages/live.md @@ -4,31 +4,16 @@ template: large # Live - LibreItalia Conference 2020 -
-
- -
-
- -
-
- **ATTENZIONE**: dovrete attivare manualmente la riproduzione del video per visualizzare lo *stream*, utilizzando il pulsante che comparirà al centro del player! -### Link utili ### - - +
+
+ +
+
+ +
+
diff --git a/content/pages/partners.md b/content/pages/partners.md new file mode 100644 index 0000000..aea8659 --- /dev/null +++ b/content/pages/partners.md @@ -0,0 +1,40 @@ +title: Partners - Conferenza Italiana LibreItalia +slug: partners + +# Partners - LibreItalia Conference 2021 + +## ILS - Italian Linux Society ## + +![ils logo](https://upload.wikimedia.org/wikipedia/commons/0/0d/Logoilsvettoriale.svg "Logo ILS"){:style="height: 200px"} + +Sito web: [www.ils.org ](https://www.ils.org/){:target="_blank"} + +*Italian Linux Society*, a tutti nota più semplicemente come **ILS**, nasce nel 1994 +ed in breve tempo si estende a tutto il territorio nazionale fino a diventare +la più grande associazione italiana per la promozione e la divulgazione di +Linux e del Software Libero. + +ILS favorisce la diffusione del sistema operativo libero [Linux ](https://www.linux.it){:target="_blank"}, la libera +circolazione delle idee e della conoscenza in campo informatico e promuove lo +studio ed il libero utilizzo delle idee e degli algoritmi destinati al +funzionamento dei sistemi informatici. + +
+## Consortium GARR ## + +![garr logo](https://www.garr.it/images/logo_medio_garr.png "Logo GARR") + +Sito web: [www.garr.it ](https://www.garr.it/){:target="_blank"} + +La rete GARR è ideata e gestita dal Consortium GARR, un’associazione senza +fini di lucro fondata sotto l’egida del Ministero dell’Istruzione, +dell’Università e della Ricerca. Gli enti soci sono +[CNR ](https://www.cnr.it/){:target="_blank"}, +[ENEA ](http://www.enea.it/it){:target="_blank"}, +[INAF ](http://www.inaf.it/it){:target="_blank"}, +[INFN ](http://home.infn.it/it/){:target="_blank"}, +[INGV ](http://www.ingv.it/){:target="_blank"}, +e tutte le università italiane rappresentate dalla +[Fondazione CRUI ](http://www.fondazionecrui.it/){:target="_blank"}. + diff --git a/content/pages/social.md b/content/pages/social.md new file mode 100644 index 0000000..973a9d9 --- /dev/null +++ b/content/pages/social.md @@ -0,0 +1,22 @@ +title: Social - Conferenza Italiana LibreItalia +slug: social + +# Social Media - LibreItalia Conference 2021 + +## LibreItalia ## + +* [HomePage ](https://www.libreitalia.org){:target="_blank"} +* [Diventa Socio LibreItalia ](https://www.libreitalia.org/diventa-socio/){:target="_blank"} +* [Twitter ](http://twitter.com/libreitalia){:target="_blank"} +* [Facebook ](http://facebook.com/libreitalia){:target="_blank"} +* [Slideshare ](http://www.slideshare.net/libreitalia){:target="_blank"} +* [YouTube ](http://youtube.com/channel/UCxOY9LbVqShoGyEcl3vNRfQ){:target="_blank"} +* [Telegram ](https://telegram.me/libreitalia){:target="_blank"} + +## Link utili ## + +* [The Document Foundation ](https://www.documentfoundation.org/){:target="_blank} +* [TDF Membership ](https://www.documentfoundation.org/governance/why-be-a-member/){:target="_blank"} +* [LibreOffice ](https://it.libreoffice.org/){:target="_blank"} +* [Open Document Format ](https://it.libreoffice.org/scopri/cosa-e-open-document/){:target="_blank"} +* [FUSS ](https://fuss.bz.it/){:target="_blank"} - Free Upgrade in South Tyrol's Schools diff --git a/themes/pelican-blue/static/css/large.css b/themes/pelican-blue/static/css/large.css index dcdc7cf..7baf91a 100644 --- a/themes/pelican-blue/static/css/large.css +++ b/themes/pelican-blue/static/css/large.css @@ -1,39 +1,33 @@ -article { - max-width:100%; -} -img { - max-width: 100%; +/* vim:sts=2:sw=2 */ + +article, footer { + margin: auto 5px auto 285px; + padding: 10px 5px 10px; } -#live iframe { - border: 0px; - flex: 1; - width: 100% -} +article { max-width:100%; } +img { max-width: 100%; } #footlinks { width: 100%; margin: auto; } -#footlinks ul -{ +#footlinks ul { column-count: 2; list-style: none; padding: 0 50px; margin: 0 0; } -#footlinks li -{ +#footlinks li { display: block; width: 200px; min-height: 50px; margin: 0px 5px; } -#footlinks a -{ +#footlinks a { -webkit-transition: 200ms; transition: 200ms; display: block; @@ -56,24 +50,50 @@ img { } #live { - display: flex; - flex-flow: row nowrap; - align-items: stretch; - height: 75vh; + display: flex; + flex-flow: row nowrap; + height: 77.5vh; } -#embedded-chat, #embedded-video { +#live iframe { + border: 0px; width: 100%; height: 100%; } -@media screen and (max-width: 1024px) { - #live iframe { - min-height: 500px; - } - #live { - flex-direction: column; - justify-content: space-between; - height:auto; - } +#live div { flex-grow: 1; } +#embedded-chat { border: 1px solid grey; } + +#embedded-video { + flex-grow: 3; + min-width: 66vw; +} + +@media screen and (max-width: 1024px) { + + #live { + flex-flow: column nowrap; + height: auto; + } + + #live div { min-height: 30vw; } + #embedded-video { height: 55.1vw; } + #embedded-chat { border-bottom: 1px solid black; } + +} + +@media screen and (max-width: 1600px) { + + #live { + flex-flow: column nowrap; + height: auto; + } + + #live div { min-height: 30vw; } + #embedded-video { height: 46vw; } + #embedded-chat { + border-top: 1px solid black; + border-bottom: 1px solid black; + } + } diff --git a/themes/pelican-blue/static/css/style.css b/themes/pelican-blue/static/css/style.css index be96ba3..a75bd2d 100644 --- a/themes/pelican-blue/static/css/style.css +++ b/themes/pelican-blue/static/css/style.css @@ -16,6 +16,7 @@ h1, h2 { } .mobile-menu { display: none; } +.mobile-only { display: none; } .title { @@ -246,8 +247,11 @@ td.hours { padding-top: 1px; } - .nav - { + .mobile-only { + display: list-item; + } + + .nav { margin-left: 0; margin-right: 0; } @@ -267,7 +271,6 @@ td.hours { #avatar { height: 50px; - width: 50px; margin: 10px auto; } diff --git a/themes/pelican-blue/templates/base.html b/themes/pelican-blue/templates/base.html index 93b616a..4cfae97 100644 --- a/themes/pelican-blue/templates/base.html +++ b/themes/pelican-blue/templates/base.html @@ -103,6 +103,10 @@ {% if DISPLAY_PAGES_ON_MENU and pages %}{% for p in pages %}
  • {{ p.title }}
    • {% endfor %}{% endif %} +
  • Partners
    • +
  • Social Media
    • +
  • Colophon
    • + diff --git a/themes/pelican-blue/templates/large_base.html b/themes/pelican-blue/templates/large_base.html index f7e359c..535df0a 100644 --- a/themes/pelican-blue/templates/large_base.html +++ b/themes/pelican-blue/templates/large_base.html @@ -62,9 +62,9 @@

    {{ SIDEBAR_DIGEST }}

    {% endif %} -
    {% if TWITTER_USERNAME %} +
    {% endif %}