diff --git a/README.md b/README.md
index 6f328ec..c25aba1 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Web de la acampada del 26S en Madrid. HTML y CSS, sin JavaScript.
1. `site/` va a `/var/www/acampada26s.net`. `deploy/nginx.conf` y `deploy/hub.conf` a nginx.
2. `/c` es el HUB del pub OASIS, en `127.0.0.1:3000` de la misma máquina.
-3. Directo: `/c`. Comunicados: `/c?type=posts` (los blogposts públicos del HUB).
+3. Directo: `/c?type=feed` (los feeds del HUB). Comunicados: `/c?type=posts` (los blogposts públicos del HUB).
4. Fotos subidas a mano: `tools/limpia-img.sh` antes, siempre.
Código AGPL-3.0. Textos CC BY-SA 4.0. Tipografía Anton, OFL.
diff --git a/site/css/main.css b/site/css/main.css
index dcef3c4..91bc579 100644
--- a/site/css/main.css
+++ b/site/css/main.css
@@ -51,7 +51,7 @@ h3 { font-size: 26px; margin: 0 0 6px; }
.cuadros, .botonera { display: grid; padding: 0; margin: 0; list-style: none; }
.cuadros {
- grid-template-columns: repeat(3, 1fr);
+ grid-template-columns: repeat(2, 1fr);
border-block: var(--bd);
}
.cuadros li + li { border-left: var(--bd); }
@@ -73,7 +73,7 @@ h3 { font-size: 26px; margin: 0 0 6px; }
}
.botonera {
- grid-template-columns: repeat(5, 1fr);
+ grid-template-columns: repeat(3, 1fr);
gap: 16px;
margin: 24px auto 0;
}
@@ -111,8 +111,8 @@ footer { margin: 64px 0 24px; border-top: var(--bd); padding-top: 12px; font-siz
.cuadros { grid-template-columns: 1fr; }
.cuadros li + li { border-left: 0; border-top: var(--bd); }
.cuadro { min-height: 96px; }
- .botonera { grid-template-columns: 1fr 1fr; }
- .botonera li:first-child { grid-column: 1 / -1; }
+ .botonera { gap: 8px; }
+ .botonera .bt { padding: 12px 4px; font-size: 18px; }
h2 { font-size: 32px; }
}
@@ -121,18 +121,36 @@ footer { margin: 64px 0 24px; border-top: var(--bd); padding-top: 12px; font-siz
.bt:hover, .bt:focus-visible, .bt:active { transform: none; }
}
-.colectivos { list-style: none; margin: 0 0 16px; padding: 0; columns: 2 280px; column-gap: 32px; }
-.colectivos li { break-inside: avoid; padding: 6px 0; border-bottom: 1px solid var(--fg); }
-.colectivos a { font-family: var(--tit); font-size: 22px; text-transform: uppercase; text-decoration: none; }
-.colectivos a:hover, .colectivos a:focus-visible { color: var(--neon); }
-.colectivos span { display: block; font-size: 14px; }
-
-.unete { max-width: 480px; margin: 32px auto; }
-.unete .bt { padding: 22px 16px; font-size: 34px; }
-.bt.solo-movil { display: none; }
-
-@media (max-width: 640px) {
- .unete { max-width: none; }
- .bt.solo-movil { display: block; }
- .bt.solo-pc { display: none; }
+.colectivos { list-style: none; margin: 0 0 16px; padding: 0; columns: 2 300px; column-gap: 32px; }
+.colectivos > li { break-inside: avoid; border-bottom: 1px solid var(--fg); }
+.colectivos summary, .colectivos .cab {
+ display: grid;
+ grid-template-columns: 48px 1fr;
+ column-gap: 12px;
+ align-items: center;
+ padding: 8px 0;
}
+.colectivos summary { cursor: pointer; list-style: none; }
+.colectivos summary::-webkit-details-marker { display: none; }
+.colectivos img, .colectivos .sin-logo { grid-row: span 2; width: 48px; height: 48px; border: 2px solid var(--fg); }
+.colectivos .sin-logo { background: var(--fg); }
+.colectivos .n { font-family: var(--tit); font-size: 22px; line-height: 1.1; text-transform: uppercase; }
+.colectivos .n.solo { grid-row: span 2; }
+.colectivos .d { font-size: 14px; line-height: 1.3; }
+.colectivos summary .n::after { content: " +"; }
+.colectivos details[open] .n::after { content: " −"; }
+.colectivos summary:hover .n, .colectivos summary:focus-visible .n, .colectivos details[open] .n { color: var(--neon); }
+.colectivos summary:focus-visible { outline: 2px solid var(--neon); outline-offset: 2px; }
+.redes { list-style: none; display: flex; flex-wrap: wrap; gap: 8px; margin: 0; padding: 0 0 12px 60px; }
+.redes a {
+ display: block;
+ padding: 4px 10px;
+ font-size: 15px;
+ text-decoration: none;
+ border: 2px solid var(--fg);
+ border-radius: 8px;
+}
+.redes a:hover, .redes a:focus-visible { color: var(--neon); border-color: var(--neon); outline: none; }
+.miembros { flex-direction: column; }
+.miembros a { display: flex; align-items: center; gap: 10px; padding: 4px 10px 4px 4px; }
+.colectivos .miembros img, .colectivos .miembros .sin-logo { grid-row: auto; width: 32px; height: 32px; border-width: 1px; flex: none; }
diff --git a/site/img/colectivos/animosa.webp b/site/img/colectivos/animosa.webp
new file mode 100644
index 0000000..aa78473
Binary files /dev/null and b/site/img/colectivos/animosa.webp differ
diff --git a/site/img/colectivos/ariskas.webp b/site/img/colectivos/ariskas.webp
new file mode 100644
index 0000000..fa63ebf
Binary files /dev/null and b/site/img/colectivos/ariskas.webp differ
diff --git a/site/img/colectivos/bbaa.webp b/site/img/colectivos/bbaa.webp
new file mode 100644
index 0000000..e1be9eb
Binary files /dev/null and b/site/img/colectivos/bbaa.webp differ
diff --git a/site/img/colectivos/casika.webp b/site/img/colectivos/casika.webp
new file mode 100644
index 0000000..8e5eee3
Binary files /dev/null and b/site/img/colectivos/casika.webp differ
diff --git a/site/img/colectivos/cjc.webp b/site/img/colectivos/cjc.webp
new file mode 100644
index 0000000..263e391
Binary files /dev/null and b/site/img/colectivos/cjc.webp differ
diff --git a/site/img/colectivos/cjs.webp b/site/img/colectivos/cjs.webp
new file mode 100644
index 0000000..06ee1ca
Binary files /dev/null and b/site/img/colectivos/cjs.webp differ
diff --git a/site/img/colectivos/cnt.webp b/site/img/colectivos/cnt.webp
new file mode 100644
index 0000000..21a3711
Binary files /dev/null and b/site/img/colectivos/cnt.webp differ
diff --git a/site/img/colectivos/contracorriente.webp b/site/img/colectivos/contracorriente.webp
new file mode 100644
index 0000000..8400e44
Binary files /dev/null and b/site/img/colectivos/contracorriente.webp differ
diff --git a/site/img/colectivos/crt.webp b/site/img/colectivos/crt.webp
new file mode 100644
index 0000000..75886c0
Binary files /dev/null and b/site/img/colectivos/crt.webp differ
diff --git a/site/img/colectivos/ecologistas.webp b/site/img/colectivos/ecologistas.webp
new file mode 100644
index 0000000..1ceb117
Binary files /dev/null and b/site/img/colectivos/ecologistas.webp differ
diff --git a/site/img/colectivos/eko.webp b/site/img/colectivos/eko.webp
new file mode 100644
index 0000000..18d0ca9
Binary files /dev/null and b/site/img/colectivos/eko.webp differ
diff --git a/site/img/colectivos/enredadera.webp b/site/img/colectivos/enredadera.webp
new file mode 100644
index 0000000..6d97a3a
Binary files /dev/null and b/site/img/colectivos/enredadera.webp differ
diff --git a/site/img/colectivos/fff.webp b/site/img/colectivos/fff.webp
new file mode 100644
index 0000000..ca6f684
Binary files /dev/null and b/site/img/colectivos/fff.webp differ
diff --git a/site/img/colectivos/frente-estudiantes.webp b/site/img/colectivos/frente-estudiantes.webp
new file mode 100644
index 0000000..b00218e
Binary files /dev/null and b/site/img/colectivos/frente-estudiantes.webp differ
diff --git a/site/img/colectivos/inquilinas.webp b/site/img/colectivos/inquilinas.webp
new file mode 100644
index 0000000..387e30e
Binary files /dev/null and b/site/img/colectivos/inquilinas.webp differ
diff --git a/site/img/colectivos/ir.webp b/site/img/colectivos/ir.webp
new file mode 100644
index 0000000..c6e3af2
Binary files /dev/null and b/site/img/colectivos/ir.webp differ
diff --git a/site/img/colectivos/krakenslab.webp b/site/img/colectivos/krakenslab.webp
new file mode 100644
index 0000000..b387ecd
Binary files /dev/null and b/site/img/colectivos/krakenslab.webp differ
diff --git a/site/img/colectivos/larosa.webp b/site/img/colectivos/larosa.webp
new file mode 100644
index 0000000..d8d45cc
Binary files /dev/null and b/site/img/colectivos/larosa.webp differ
diff --git a/site/img/colectivos/legal-sol.webp b/site/img/colectivos/legal-sol.webp
new file mode 100644
index 0000000..fb11627
Binary files /dev/null and b/site/img/colectivos/legal-sol.webp differ
diff --git a/site/img/colectivos/liza.webp b/site/img/colectivos/liza.webp
new file mode 100644
index 0000000..b04d903
Binary files /dev/null and b/site/img/colectivos/liza.webp differ
diff --git a/site/img/colectivos/marika.webp b/site/img/colectivos/marika.webp
new file mode 100644
index 0000000..7da190d
Binary files /dev/null and b/site/img/colectivos/marika.webp differ
diff --git a/site/img/colectivos/pah-vallekas.webp b/site/img/colectivos/pah-vallekas.webp
new file mode 100644
index 0000000..77fc27c
Binary files /dev/null and b/site/img/colectivos/pah-vallekas.webp differ
diff --git a/site/img/colectivos/palestina.webp b/site/img/colectivos/palestina.webp
new file mode 100644
index 0000000..e242bf9
Binary files /dev/null and b/site/img/colectivos/palestina.webp differ
diff --git a/site/img/colectivos/plei.webp b/site/img/colectivos/plei.webp
new file mode 100644
index 0000000..7cfb53e
Binary files /dev/null and b/site/img/colectivos/plei.webp differ
diff --git a/site/img/colectivos/sindicato-estudiantes.webp b/site/img/colectivos/sindicato-estudiantes.webp
new file mode 100644
index 0000000..425e509
Binary files /dev/null and b/site/img/colectivos/sindicato-estudiantes.webp differ
diff --git a/site/img/colectivos/sindicato-hortaleza.webp b/site/img/colectivos/sindicato-hortaleza.webp
new file mode 100644
index 0000000..7a31415
Binary files /dev/null and b/site/img/colectivos/sindicato-hortaleza.webp differ
diff --git a/site/img/colectivos/sindicato-sbc.webp b/site/img/colectivos/sindicato-sbc.webp
new file mode 100644
index 0000000..a7751e4
Binary files /dev/null and b/site/img/colectivos/sindicato-sbc.webp differ
diff --git a/site/img/colectivos/solidaridad.webp b/site/img/colectivos/solidaridad.webp
new file mode 100644
index 0000000..2e8a42e
Binary files /dev/null and b/site/img/colectivos/solidaridad.webp differ
diff --git a/site/img/colectivos/trans.webp b/site/img/colectivos/trans.webp
new file mode 100644
index 0000000..72e3e59
Binary files /dev/null and b/site/img/colectivos/trans.webp differ
diff --git a/site/img/colectivos/vivienda-alcosanse.webp b/site/img/colectivos/vivienda-alcosanse.webp
new file mode 100644
index 0000000..a2d522c
Binary files /dev/null and b/site/img/colectivos/vivienda-alcosanse.webp differ
diff --git a/site/img/colectivos/vivienda-aranjuez.webp b/site/img/colectivos/vivienda-aranjuez.webp
new file mode 100644
index 0000000..b510c0d
Binary files /dev/null and b/site/img/colectivos/vivienda-aranjuez.webp differ
diff --git a/site/img/colectivos/vivienda-pilar.webp b/site/img/colectivos/vivienda-pilar.webp
new file mode 100644
index 0000000..8a7c90a
Binary files /dev/null and b/site/img/colectivos/vivienda-pilar.webp differ
diff --git a/site/img/colectivos/vivienda-tetuan.webp b/site/img/colectivos/vivienda-tetuan.webp
new file mode 100644
index 0000000..210473f
Binary files /dev/null and b/site/img/colectivos/vivienda-tetuan.webp differ
diff --git a/site/img/colectivos/vivienda-villalba.webp b/site/img/colectivos/vivienda-villalba.webp
new file mode 100644
index 0000000..7fe8306
Binary files /dev/null and b/site/img/colectivos/vivienda-villalba.webp differ
diff --git a/site/img/colectivos/xr.webp b/site/img/colectivos/xr.webp
new file mode 100644
index 0000000..de0b29e
Binary files /dev/null and b/site/img/colectivos/xr.webp differ
diff --git a/site/index.html b/site/index.html
index fc93f79..8feaaad 100644
--- a/site/index.html
+++ b/site/index.html
@@ -6,7 +6,7 @@
Acampada 26S
-
+
@@ -16,44 +16,58 @@
Acampada 26S
-
- Organízate
- Sigue el directo en OASIS sin instalar nada. Para organizarte en colectivo de forma segura, usa OASIS.
-
- Únete
- Únete
-
- Crea una comisión o únete con la invitación de tu colectivo.
-
-
Colectivos
- Centros sociales y colectivos de Madrid. Aquí también hay información y asambleas.
+ Centros sociales y colectivos que están en la acampada. Toca uno para ver sus redes.
- ¿Falta tu colectivo? Escribe a la comisión de comunicación en OASIS.
+ ¿Falta tu colectivo? Escribe a la comisión de comunicación en OASIS o a acampada26s@riseup.net.