From 009f2c0a5057d25815ac752c017d6463b88db2ef Mon Sep 17 00:00:00 2001 From: Hugo Peixoto Date: Sun, 31 Oct 2021 00:53:14 +0100 Subject: [PATCH 1/2] Add politics menu and pages --- content/contactos.md | 3 ++- content/noticias/2012-03-25-politica.md | 16 -------------- ...os-eurodeputados-sobre-normas-europeias.md | 1 - ...opean-free-software-policy-meeting-2017.md | 1 - content/politica.md | 22 +++++++++++++++++++ .../15O.md} | 0 .../ap.md} | 0 .../da.md} | 0 .../legislacao.md} | 0 .../swpat.md} | 0 themes/academic/assets/scss/ansol.scss | 4 ++-- themes/academic/layouts/_default/baseof.html | 1 + 12 files changed, 27 insertions(+), 21 deletions(-) delete mode 100644 content/noticias/2012-03-25-politica.md create mode 100644 content/politica.md rename content/{noticias/2013-04-19-15-de-outubro.md => politica/15O.md} (100%) rename content/{noticias/2012-11-13-software-livre-na-administracao-publica.md => politica/ap.md} (100%) rename content/{noticias/2012-03-25-direito-de-autor.md => politica/da.md} (100%) rename content/{noticias/2012-03-30-legislacao.md => politica/legislacao.md} (100%) rename content/{noticias/2012-03-27-patentes-de-software.md => politica/swpat.md} (100%) diff --git a/content/contactos.md b/content/contactos.md index 9ce2d74..05e11eb 100644 --- a/content/contactos.md +++ b/content/contactos.md @@ -14,7 +14,8 @@ aliases: - "/node/35/" - "/page/35/" --- -

Correio Electrónico

+ +## Correio Electrónico
Geral:
diff --git a/content/noticias/2012-03-25-politica.md b/content/noticias/2012-03-25-politica.md deleted file mode 100644 index 227e59b..0000000 --- a/content/noticias/2012-03-25-politica.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -categories: [] -metadata: - slide: - - slide_value: 0 - node_id: 5 -layout: page -title: Política -created: 1332707586 -date: 2012-03-25 -aliases: -- "/node/5/" -- "/page/5/" -- "/politica/" ---- - diff --git a/content/noticias/2017-02-14-carta-aberta-aos-eurodeputados-sobre-normas-europeias.md b/content/noticias/2017-02-14-carta-aberta-aos-eurodeputados-sobre-normas-europeias.md index 71e9aec..d1efd04 100644 --- a/content/noticias/2017-02-14-carta-aberta-aos-eurodeputados-sobre-normas-europeias.md +++ b/content/noticias/2017-02-14-carta-aberta-aos-eurodeputados-sobre-normas-europeias.md @@ -5,7 +5,6 @@ categories: - normas abertas - eu - europa -- política - imprensa metadata: tags: diff --git a/content/noticias/2017-02-18-ansol-na-european-free-software-policy-meeting-2017.md b/content/noticias/2017-02-18-ansol-na-european-free-software-policy-meeting-2017.md index 7acde6b..e75bc41 100644 --- a/content/noticias/2017-02-18-ansol-na-european-free-software-policy-meeting-2017.md +++ b/content/noticias/2017-02-18-ansol-na-european-free-software-policy-meeting-2017.md @@ -3,7 +3,6 @@ categories: - ansol - eu - policy -- política - imprensa metadata: tags: diff --git a/content/politica.md b/content/politica.md new file mode 100644 index 0000000..28b4f04 --- /dev/null +++ b/content/politica.md @@ -0,0 +1,22 @@ +--- +categories: [] +metadata: + slide: + - slide_value: 0 + node_id: 5 +layout: page +title: Política +created: 1332707586 +date: 2012-03-25 +aliases: +- "/node/5/" +- "/page/5/" +- "/politica/" +--- + +* [Administração Pública]({{< ref "/politica/ap" >}}) +* [Direito de Autor]({{< ref "/politica/da" >}}) +* [Patentes]({{< ref "/politica/swpat" >}}) +* [Legislação]({{< ref "/politica/legislacao" >}}) +* [15 de Outubro]({{< ref "/politica/15O" >}}) +* [Comércio Electrónico](https://github.com/marado/ecommerce-WTO/blob/master/ecommerce.md) diff --git a/content/noticias/2013-04-19-15-de-outubro.md b/content/politica/15O.md similarity index 100% rename from content/noticias/2013-04-19-15-de-outubro.md rename to content/politica/15O.md diff --git a/content/noticias/2012-11-13-software-livre-na-administracao-publica.md b/content/politica/ap.md similarity index 100% rename from content/noticias/2012-11-13-software-livre-na-administracao-publica.md rename to content/politica/ap.md diff --git a/content/noticias/2012-03-25-direito-de-autor.md b/content/politica/da.md similarity index 100% rename from content/noticias/2012-03-25-direito-de-autor.md rename to content/politica/da.md diff --git a/content/noticias/2012-03-30-legislacao.md b/content/politica/legislacao.md similarity index 100% rename from content/noticias/2012-03-30-legislacao.md rename to content/politica/legislacao.md diff --git a/content/noticias/2012-03-27-patentes-de-software.md b/content/politica/swpat.md similarity index 100% rename from content/noticias/2012-03-27-patentes-de-software.md rename to content/politica/swpat.md diff --git a/themes/academic/assets/scss/ansol.scss b/themes/academic/assets/scss/ansol.scss index 03e14d8..2f6acbc 100644 --- a/themes/academic/assets/scss/ansol.scss +++ b/themes/academic/assets/scss/ansol.scss @@ -27,7 +27,7 @@ footer p { margin: 10px; } .news-list li .text { width: 280px; } } -@media (max-width: 840px) { +@media (max-width: 1000px) { :root { --body-width: calc(100vw - 20px); } nav.main .menu { display: flex; } nav.main .nav-search { font-size: 0; } @@ -45,7 +45,7 @@ footer p { margin: 10px; } border-top: 1px solid white; } } -@media (min-width: 841px) { +@media (min-width: 1001px) { nav.main .menu { display: none; } } diff --git a/themes/academic/layouts/_default/baseof.html b/themes/academic/layouts/_default/baseof.html index 393a680..a9a0b91 100644 --- a/themes/academic/layouts/_default/baseof.html +++ b/themes/academic/layouts/_default/baseof.html @@ -9,6 +9,7 @@ From ae3ed35da70e0d66969eaec4ff633473f7178ae4 Mon Sep 17 00:00:00 2001 From: Hugo Peixoto Date: Sun, 31 Oct 2021 00:53:32 +0100 Subject: [PATCH 2/2] Fix some layout issues and add social networks --- content/contactos.md | 6 ++++++ content/sobre/index.md | 10 +++++----- themes/academic/assets/scss/ansol.scss | 10 +++++++++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/content/contactos.md b/content/contactos.md index 05e11eb..c5a32cc 100644 --- a/content/contactos.md +++ b/content/contactos.md @@ -24,3 +24,9 @@ aliases:
webmaster@ansol.org
Discussão e participação:
listas de correio
Poderá também consultar e contactar os **[órgãos sociais em exercício](/orgaos-sociais)**. + +## Redes sociais + +Estamos presentes no twitter: + +Temos uma sala Matrix aberta ao público: diff --git a/content/sobre/index.md b/content/sobre/index.md index dff3a78..8cdd770 100644 --- a/content/sobre/index.md +++ b/content/sobre/index.md @@ -64,27 +64,27 @@ científicas.

- Junta-te a nós + }}" class='cta' style="margin-left: 0px;">Junta-te a nós

- + }}" style="display: block;">

- Órgãos sociais: + }}">Órgãos sociais: Conhece as pessoas que compõe a nossa equipa.

- + }}" style="display: block;">

- Contactos: + }}">Contactos: Estamos disponíveis para falar. Temos também canais de comunicação abertos a toda a comunidade.

diff --git a/themes/academic/assets/scss/ansol.scss b/themes/academic/assets/scss/ansol.scss index 2f6acbc..366109d 100644 --- a/themes/academic/assets/scss/ansol.scss +++ b/themes/academic/assets/scss/ansol.scss @@ -9,10 +9,18 @@ } -body { margin: 0px; font-family: Roboto; font-weight: 400; } +body { + margin: 0px; + font-family: Roboto; + font-weight: 400; + display: flex; + flex-direction: column; + min-height: 100vh; +} .body-width { margin: 0px auto; width: var(--body-width); max-width: 1000px; } footer { + margin-top: auto; background-color: #041952; color: white; padding: 40px 0px;