From 16a9294598952f062bd63fce09b18665a08f03a8 Mon Sep 17 00:00:00 2001 From: a-ill Date: Mon, 26 Jun 2023 23:14:59 +0300 Subject: [PATCH] Update --- Server/app/svelte/public/css/common.css | 14 +++---- .../svelte/src/affiliates-component.svelte | 40 ++++++++++++++----- .../svelte/src/cooperatives-component.svelte | 26 ++++++++++-- Server/public/css/common.css | 14 +++---- .../js/components/affiliates-component.js | 2 +- .../js/components/cooperatives-component.js | 2 +- 6 files changed, 69 insertions(+), 29 deletions(-) diff --git a/Server/app/svelte/public/css/common.css b/Server/app/svelte/public/css/common.css index d947f63..117eff9 100644 --- a/Server/app/svelte/public/css/common.css +++ b/Server/app/svelte/public/css/common.css @@ -503,30 +503,30 @@ html { @media only screen and (max-width: 660px) { html { - font-size: 14px; + font-size: 15px; } } @media only screen and (max-width: 570px) { html { - font-size: 13px; + font-size: 14.5px; } } -/* + @media only screen and (max-width: 470px) { html { - font-size: 11px; + font-size: 14px; } } @media only screen and (max-width: 400px) { html { - font-size: 10px; + font-size: 13.5px; } } @media only screen and (max-width: 360px) { html { - font-size: 9px; + font-size: 13px; } -}*/ \ No newline at end of file +} \ No newline at end of file diff --git a/Server/app/svelte/src/affiliates-component.svelte b/Server/app/svelte/src/affiliates-component.svelte index 69679d4..8546feb 100644 --- a/Server/app/svelte/src/affiliates-component.svelte +++ b/Server/app/svelte/src/affiliates-component.svelte @@ -35,17 +35,17 @@

Online

{#each affiliates as affiliate}
-
-
-

Name: {affiliate.name}

-

Type: {affiliate.type}

-

Link: {affiliate.link}

-
+
+
+

Name: {affiliate.name}

+

Type: {affiliate.type}

+

Link: {affiliate.link}

+

Description: {affiliate.description}

@@ -70,16 +70,16 @@ margin-top: 8rem; } - .location-info>:first-child { + .img-general-info { display: flex; align-content: center; width: 100%; - justify-content: space-between; - gap: 3rem; + gap: 1.5rem; align-items: center; + margin-bottom: 1rem; } - .location-info>:first-child>:first-child { + .img-general-info>:nth-child(2) { flex:none; } @@ -146,4 +146,24 @@ text-align: justify; } + @media only screen and (max-width: 500px) { + .img-general-info { + display: flex; + flex-direction: column; + align-content: left; + width: 100%; + gap: 1.5rem; + align-items: left; + margin-bottom: 0rem; + } + + .img-general-info>:nth-child(1) { + width: max-content; + } + + .img-general-info>:nth-child(2) { + width: 100%; + } + } + \ No newline at end of file diff --git a/Server/app/svelte/src/cooperatives-component.svelte b/Server/app/svelte/src/cooperatives-component.svelte index 69f6c17..3d7e2c6 100644 --- a/Server/app/svelte/src/cooperatives-component.svelte +++ b/Server/app/svelte/src/cooperatives-component.svelte @@ -31,7 +31,7 @@

Europe

{#each coops as coop}
-
+

Name: {coop.name}

Location: {coop.location[0]}

@@ -69,7 +69,7 @@ margin-top: 8rem; } - .location-info>:first-child { + .img-general-info { display: flex; align-content: center; width: 100%; @@ -78,7 +78,7 @@ align-items: center; } - .location-info>:first-child>:first-child { + .img-general-info>:first-child { flex:none; } @@ -144,4 +144,24 @@ text-align: justify; } + @media only screen and (max-width: 600px) { + .img-general-info { + display: flex; + flex-direction: column-reverse; + align-content: left; + width: 100%; + gap: 1rem; + align-items: left; + margin-bottom: 0rem; + } + + .img-general-info>:nth-child(2) { + width: max-content; + } + + .img-general-info>:nth-child(1) { + width: 100%; + } + } + \ No newline at end of file diff --git a/Server/public/css/common.css b/Server/public/css/common.css index d947f63..117eff9 100644 --- a/Server/public/css/common.css +++ b/Server/public/css/common.css @@ -503,30 +503,30 @@ html { @media only screen and (max-width: 660px) { html { - font-size: 14px; + font-size: 15px; } } @media only screen and (max-width: 570px) { html { - font-size: 13px; + font-size: 14.5px; } } -/* + @media only screen and (max-width: 470px) { html { - font-size: 11px; + font-size: 14px; } } @media only screen and (max-width: 400px) { html { - font-size: 10px; + font-size: 13.5px; } } @media only screen and (max-width: 360px) { html { - font-size: 9px; + font-size: 13px; } -}*/ \ No newline at end of file +} \ No newline at end of file diff --git a/Server/public/js/components/affiliates-component.js b/Server/public/js/components/affiliates-component.js index 3409de5..fe9b834 100644 --- a/Server/public/js/components/affiliates-component.js +++ b/Server/public/js/components/affiliates-component.js @@ -1 +1 @@ -import{S as t,i as e,a as i,b as n,s as o,e as a,c as s,n as r,d as l,f as m,g as c,h,j as d,o as g,t as f}from"./index-95aedb1a.js";import"../../../../../../../../../js/components/map-component.js";function p(t,e,i){const n=t.slice();return n[1]=e[i],n}function u(t){let e,i,o,m,d,g,p,u,b,x,w,v,y,k,C,z,j,D,T,A,E,F,G,L,O,R,S,W=t[1].name+"",_=t[1].type+"",q=t[1].link+"",H=t[1].description+"";return{c(){e=a("div"),i=a("div"),o=a("div"),m=a("p"),d=a("b"),d.textContent="Name: ",g=f(W),p=s(),u=a("p"),b=a("b"),b.textContent="Type: ",x=f(_),w=s(),v=a("p"),y=a("b"),y.textContent="Link: ",k=a("a"),C=f(q),z=s(),j=a("picture"),D=a("source"),T=s(),A=a("source"),E=s(),F=a("img"),G=s(),L=a("p"),O=a("b"),O.textContent="Description: ",R=f(H),S=s(),l(k,"href",t[1].link),l(k,"target",";_blank;"),l(k,"rel","noreferrer"),l(D,"srcset","/img/affiliates/"+t[1].logo+".webp"),l(A,"srcset","/img/affiliates/"+t[1].logo+".png"),l(F,"class","affiliate-logo"),l(F,"alt","logo"),l(e,"class","location-info")},m(t,a){n(t,e,a),c(e,i),c(i,o),c(o,m),c(m,d),c(m,g),c(o,p),c(o,u),c(u,b),c(u,x),c(o,w),c(o,v),c(v,y),c(v,k),c(k,C),c(i,z),c(i,j),c(j,D),c(j,T),c(j,A),c(j,E),c(j,F),c(e,G),c(e,L),c(L,O),c(L,R),c(e,S)},p:r,d(t){t&&h(e)}}}function b(t){let e,i,o,g,f,b,x,w,v,y,k,C,z,j=t[0],D=[];for(let e=0;e{})),[[{name:"Gaia's Fall",type:"a place to discuss and organize",link:"https://discord.libsoc.org",description:"Gaia's Fall is a server that promotes Solarpunk ideals, environmentalism, anarchism, and anti-capitalism. We encourage civil debates, discussions of theories and possibilities, and the creation of communities focused on shaping a better world. It is our official Discord server where we organize and work together.",logo:"gaias_fall"}]]}class w extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:i(this.attributes),customElement:!0},x,b,o,{},null),t&&t.target&&n(t.target,this,t.anchor)}}customElements.define("affiliates-component",w);export{w as default}; +import{S as t,i as e,a as i,b as n,s as o,e as a,c as r,n as s,d as l,f as m,g as c,h as g,j as d,o as h,t as f}from"./index-95aedb1a.js";import"../../../../../../../../../js/components/map-component.js";function p(t,e,i){const n=t.slice();return n[1]=e[i],n}function u(t){let e,i,o,m,d,h,p,u,x,b,w,v,y,k,C,z,j,D,T,A,E,F,G,L,O,R,S,W=t[1].name+"",_=t[1].type+"",q=t[1].link+"",H=t[1].description+"";return{c(){e=a("div"),i=a("div"),o=a("picture"),m=a("source"),d=r(),h=a("source"),p=r(),u=a("img"),x=r(),b=a("div"),w=a("p"),v=a("b"),v.textContent="Name: ",y=f(W),k=r(),C=a("p"),z=a("b"),z.textContent="Type: ",j=f(_),D=r(),T=a("p"),A=a("b"),A.textContent="Link: ",E=a("a"),F=f(q),G=r(),L=a("p"),O=a("b"),O.textContent="Description: ",R=f(H),S=r(),l(m,"srcset","/img/affiliates/"+t[1].logo+".webp"),l(h,"srcset","/img/affiliates/"+t[1].logo+".png"),l(u,"class","affiliate-logo"),l(u,"alt","logo"),l(E,"href",t[1].link),l(E,"target",";_blank;"),l(E,"rel","noreferrer"),l(i,"class","img-general-info"),l(e,"class","location-info")},m(t,a){n(t,e,a),c(e,i),c(i,o),c(o,m),c(o,d),c(o,h),c(o,p),c(o,u),c(i,x),c(i,b),c(b,w),c(w,v),c(w,y),c(b,k),c(b,C),c(C,z),c(C,j),c(b,D),c(b,T),c(T,A),c(T,E),c(E,F),c(e,G),c(e,L),c(L,O),c(L,R),c(e,S)},p:s,d(t){t&&g(e)}}}function x(t){let e,i,o,h,f,x,b,w,v,y,k,C,z,j=t[0],D=[];for(let e=0;e{})),[[{name:"Gaia's Fall",type:"a place to discuss and organize",link:"https://discord.libsoc.org",description:"Gaia's Fall is a server that promotes Solarpunk ideals, environmentalism, anarchism, and anti-capitalism. We encourage civil debates, discussions of theories and possibilities, and the creation of communities focused on shaping a better world. It is our official Discord server where we organize and work together.",logo:"gaias_fall"}]]}class w extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:i(this.attributes),customElement:!0},b,x,o,{},null),t&&t.target&&n(t.target,this,t.anchor)}}customElements.define("affiliates-component",w);export{w as default}; diff --git a/Server/public/js/components/cooperatives-component.js b/Server/public/js/components/cooperatives-component.js index 8c49a7f..71df88f 100644 --- a/Server/public/js/components/cooperatives-component.js +++ b/Server/public/js/components/cooperatives-component.js @@ -1 +1 @@ -import{S as t,i as e,a as o,b as n,s as i,e as r,c as s,n as a,d as c,f as m,k as l,g as p,h as g,j as h,o as d,t as f}from"./index-95aedb1a.js";import{coops as u,addMarkersCoops as b}from"../../../../../../../../../js/coops.js";import"../../../../../../../../../js/components/map-component.js";function x(t,e,o){const n=t.slice();return n[1]=e[o],n}function w(t){let e,o,i,m,l,h,d,u,b,x,w,v,k,C,y,j,z,W,E,D,L,M,R,S,T,_,A,B,H,N,O,q,F,G,I,J,K,P,Q,U,V,X,Y,Z,$=t[1].name+"",tt=t[1].location[0]+"",et=t[1].market+"",ot=t[1].workers+"",nt=t[1].status+"",it=t[1].website+"",rt=t[1].contact[1]+"",st=t[1].description+"";return{c(){e=r("div"),o=r("div"),i=r("div"),m=r("p"),l=r("b"),l.textContent="Name: ",h=f($),d=s(),u=r("p"),b=r("b"),b.textContent="Location: ",x=f(tt),w=s(),v=r("p"),k=r("b"),k.textContent="Market: ",C=f(et),y=s(),j=r("p"),z=r("b"),z.textContent="Workers: ",W=f(ot),E=s(),D=r("p"),L=r("b"),L.textContent="Status: ",M=f(nt),R=s(),S=r("p"),T=r("b"),T.textContent="Website: ",_=r("a"),A=f(it),B=s(),H=r("p"),N=r("b"),N.textContent="Contact: ",O=r("a"),q=f(rt),F=s(),G=r("picture"),I=r("source"),J=s(),K=r("source"),P=s(),Q=r("img"),U=s(),V=r("p"),X=r("b"),X.textContent="Description: ",Y=f(st),Z=s(),c(_,"href","https://www."+t[1].website),c(_,"target","_blank"),c(_,"rel","noreferrer"),c(O,"href",t[1].contact[0]),c(O,"target",";_blank;"),c(O,"rel","noreferrer"),c(I,"srcset","/img/coops/"+t[1].logo+".webp"),c(K,"srcset","/img/coops/"+t[1].logo+".png"),c(Q,"class","coop-logo"),c(Q,"alt","logo"),c(e,"class","location-info")},m(t,r){n(t,e,r),p(e,o),p(o,i),p(i,m),p(m,l),p(m,h),p(i,d),p(i,u),p(u,b),p(u,x),p(i,w),p(i,v),p(v,k),p(v,C),p(i,y),p(i,j),p(j,z),p(j,W),p(i,E),p(i,D),p(D,L),p(D,M),p(i,R),p(i,S),p(S,T),p(S,_),p(_,A),p(i,B),p(i,H),p(H,N),p(H,O),p(O,q),p(o,F),p(o,G),p(G,I),p(G,J),p(G,K),p(G,P),p(G,Q),p(e,U),p(e,V),p(V,X),p(V,Y),p(e,Z)},p:a,d(t){t&&g(e)}}}function v(t){let e,o,i,d,f,b,v,k,C,y,j,z,W,E,D,L,M,R=u,S=[];for(let e=0;e{})),[function(t){let e=t([51.505,-.09],3);b(e)}]}class C extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:o(this.attributes),customElement:!0},k,v,i,{},null),t&&t.target&&n(t.target,this,t.anchor)}}customElements.define("cooperatives-component",C);export{C as default}; +import{S as t,i as e,a as o,b as n,s as i,e as r,c as a,n as s,d as c,f as m,k as l,g as p,h as g,j as h,o as d,t as f}from"./index-95aedb1a.js";import{coops as u,addMarkersCoops as b}from"../../../../../../../../../js/coops.js";import"../../../../../../../../../js/components/map-component.js";function x(t,e,o){const n=t.slice();return n[1]=e[o],n}function w(t){let e,o,i,m,l,h,d,u,b,x,w,v,k,C,y,j,z,W,E,D,L,M,R,S,T,_,A,B,H,N,O,q,F,G,I,J,K,P,Q,U,V,X,Y,Z,$=t[1].name+"",tt=t[1].location[0]+"",et=t[1].market+"",ot=t[1].workers+"",nt=t[1].status+"",it=t[1].website+"",rt=t[1].contact[1]+"",at=t[1].description+"";return{c(){e=r("div"),o=r("div"),i=r("div"),m=r("p"),l=r("b"),l.textContent="Name: ",h=f($),d=a(),u=r("p"),b=r("b"),b.textContent="Location: ",x=f(tt),w=a(),v=r("p"),k=r("b"),k.textContent="Market: ",C=f(et),y=a(),j=r("p"),z=r("b"),z.textContent="Workers: ",W=f(ot),E=a(),D=r("p"),L=r("b"),L.textContent="Status: ",M=f(nt),R=a(),S=r("p"),T=r("b"),T.textContent="Website: ",_=r("a"),A=f(it),B=a(),H=r("p"),N=r("b"),N.textContent="Contact: ",O=r("a"),q=f(rt),F=a(),G=r("picture"),I=r("source"),J=a(),K=r("source"),P=a(),Q=r("img"),U=a(),V=r("p"),X=r("b"),X.textContent="Description: ",Y=f(at),Z=a(),c(_,"href","https://www."+t[1].website),c(_,"target","_blank"),c(_,"rel","noreferrer"),c(O,"href",t[1].contact[0]),c(O,"target",";_blank;"),c(O,"rel","noreferrer"),c(I,"srcset","/img/coops/"+t[1].logo+".webp"),c(K,"srcset","/img/coops/"+t[1].logo+".png"),c(Q,"class","coop-logo"),c(Q,"alt","logo"),c(o,"class","img-general-info"),c(e,"class","location-info")},m(t,r){n(t,e,r),p(e,o),p(o,i),p(i,m),p(m,l),p(m,h),p(i,d),p(i,u),p(u,b),p(u,x),p(i,w),p(i,v),p(v,k),p(v,C),p(i,y),p(i,j),p(j,z),p(j,W),p(i,E),p(i,D),p(D,L),p(D,M),p(i,R),p(i,S),p(S,T),p(S,_),p(_,A),p(i,B),p(i,H),p(H,N),p(H,O),p(O,q),p(o,F),p(o,G),p(G,I),p(G,J),p(G,K),p(G,P),p(G,Q),p(e,U),p(e,V),p(V,X),p(V,Y),p(e,Z)},p:s,d(t){t&&g(e)}}}function v(t){let e,o,i,d,f,b,v,k,C,y,j,z,W,E,D,L,M,R=u,S=[];for(let e=0;e{})),[function(t){let e=t([51.505,-.09],3);b(e)}]}class C extends t{constructor(t){super(),this.shadowRoot.innerHTML="",e(this,{target:this.shadowRoot,props:o(this.attributes),customElement:!0},k,v,i,{},null),t&&t.target&&n(t.target,this,t.anchor)}}customElements.define("cooperatives-component",C);export{C as default};