Compare commits

..

No commits in common. "d5a06ed5ebccbb74b2cfffc483cd98a7f665de32" and "1fd4a1944009e7aa7d00c2cec9f6c7ac3aad79c1" have entirely different histories.

35 changed files with 17 additions and 132 deletions

View File

@ -2,7 +2,6 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<html> <html>
<head> <head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css"> <link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css"> <link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title> <title>Decentrala</title>
@ -10,7 +9,8 @@
<body> <body>
<div class="container"> <div class="container">
<div class="header"> <div class="header">
<h1 class="logo">DECENTRALA</h1> <h1 class="logo">Decentrala</h1>
<a id="d" href="/index.html"><div id="d"></div></a>
</div> </div>
<main> <main>
<h2>Chat</h2> <h2>Chat</h2>

View File

@ -2,7 +2,6 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<html> <html>
<head> <head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css"> <link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css"> <link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title> <title>Decentrala</title>
@ -10,7 +9,8 @@
<body> <body>
<div class="container"> <div class="container">
<div class="header"> <div class="header">
<h1 class="logo">DECENTRALA</h1> <h1 class="logo">Decentrala</h1>
<a id="d" href="/index.html"><div id="d"></div></a>
</div> </div>
<main> <main>
<h2>Dogadjaji</h2> <h2>Dogadjaji</h2>

View File

@ -2,7 +2,6 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<html> <html>
<head> <head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css"> <link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css"> <link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title> <title>Decentrala</title>
@ -10,11 +9,12 @@
<body> <body>
<div class="container"> <div class="container">
<div class="header"> <div class="header">
<h1 class="logo">DECENTRALA</h1> <h1 class="logo">Decentrala</h1>
<a id="d" href="/index.html"><div id="d"></div></a>
</div> </div>
<main> <main>
<h2>Forum</h2> <h2>Forum</h2>
<p> Forum je na <a href="https://forum.dmz.rs">forum.dmz.rs</a> <p> <p> Forum je na https://forum.dmz.rs <p>
<p> Nalog na forumu nije povezan sa nalogom na xmpp i mail serveru <p> <p> Nalog na forumu nije povezan sa nalogom na xmpp i mail serveru <p>
<div class="back"> <div class="back">
<ul class="nav"> <ul class="nav">

View File

@ -2,7 +2,6 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<html> <html>
<head> <head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css"> <link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css"> <link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title> <title>Decentrala</title>
@ -10,17 +9,16 @@
<body> <body>
<div class="container"> <div class="container">
<div class="header"> <div class="header">
<h1 class="logo">DECENTRALA</h1> <h1 class="logo">Decentrala</h1>
<a id="d" href="/index.html"><div id="d"></div></a>
</div> </div>
<main> <main>
<p id="about"> Decentrala je zajednica okupljena oko decentralizacije tehnologija i sirenja znanja. <p> <p id="about"> Decentrala je zajednica okupljena oko decentralizacije tehnologija i sirenja znanja. <p>
<ul class="nav"> <ul class="nav">
<a href="/dogadjaji.html"><li>DOGAĐAJI</li></a> <a href="/dogadjaji.html"><li>Dogadjaji</li></a>
<a href="/forum.html"><li>FORUM</li></a> <a href="/forum.html"><li>Forum</li></a>
<a href="/chat.html"><li>CHAT</li></a> <a href="/chat.html"><li>Chat</li></a>
<a href="/nalog.html"><li>NALOG</li></a> <a href="/nalog.html"><li>Nalog</li></a>
<a href="/saznajvise.html"><li>SAZNAJ VIŠE</li></a>
<a href="/kontakt.html"><li>KONTAKT</li></a>
</ul> </ul>
</main> </main>
</div> </div>

View File

@ -1,28 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>
<h2>Kontakt</h2>
<p> Mozete nam poslati email na dmz@dmz.rs <p>
<p> Ili nas kontaktiraje na <a href="/forum.html">forumu</a> ili <a href="/chat.html">chat kanalu</a> <p>
<p> Takodje mozete i doci na neku od dogadjaja i upoznati nas uzivo <p>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</div>
</body>
</html>

View File

@ -2,7 +2,6 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<html> <html>
<head> <head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css"> <link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css"> <link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title> <title>Decentrala</title>
@ -10,7 +9,8 @@
<body> <body>
<div class="container"> <div class="container">
<div class="header"> <div class="header">
<h1 class="logo">DECENTRALA</h1> <h1 class="logo">Decentrala</h1>
<a id="d" href="/index.html"><div id="d"></div></a>
</div> </div>
<main> <main>
<h2>Nalog</h2> <h2>Nalog</h2>

View File

@ -1,44 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>
<h2>Sta je Decentrala</h2>
<p> Decentrala je zajednica okupljena oko decentralizacije tehnologija i sirenja znanja. <p>
<div id="saznajvise">
<div class="box">
<h3> Znanje </h3>
<p> Svako moze drzati predavanje na bilo koju temu, samo se najavite na forumu. <p>
<p> Decentrala veruje da svako treba da ima pristup znanju, zbog cega su predavanja uvek besplatna i bez promocija. <p>
<p> Ako zelite nesto da podelite sa drugima sto ste naucili, prijavite se da drzite jedno ili vise predavanja! <p>
</div>
<div class="box">
<h3> Akcija </h3>
<p> Organizovanje dogadjaja programiranja ili instalacije servisa koje pomazu u decentralizaciji Interneta. <p>
<p> Organizujemo hackathone kao posebne dogadjaje na kojima se okupljamo da radimo na zajednickom cilju. <p>
</div>
<div class="box">
<h3> Druzenje </h3>
<p> Drustvene dogadjaje u cilju socijalizacije. <p>
<p> Ako zelite da se druzite sa ljudima zainteresovanim za ravnopravnost koriscenja tehnologija, slobodnog softvera, privatnost i bezbednost, posetite neku od okupljanja Decentrale. <p>
</div>
</div>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</div>
</body>
</html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +0,0 @@
2f069ecf-a1fc-4aaf-924c-de17efcde7a8

View File

@ -1,23 +1,6 @@
@font-face {
font-family: Facade;
src: url(fonts/facade/Facade-Sud.woff);
}
@font-face {
font-family: sligoil;
src: url(fonts/sligoil/Sligoil-Micro.woff);
}
@font-face {
font-family: jetbrains-mono;
src: url(fonts/jetbrains-mono/JetBrainsMono-Regular.ttf);
}
body { body {
background-color: rgb(0, 0, 0); background-color: rgb(0, 0, 0);
font-family: jetbrains-mono; font: 3vw "Monospace", sans-serif;
font-size: 3vw;
} }
.container { .container {
@ -30,8 +13,7 @@ body {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin: 0 auto; margin: 0 auto;
font-family: facade; font: 12vw "Monospace", sans-serif;
font-size: 12vw;
color: #24ea26; color: #24ea26;
} }
@ -48,24 +30,14 @@ main {
} }
main h2 { main h2 {
font-family: sligoil;
font-size: 5vw; font-size: 5vw;
} }
main h3 {
font-family: sligoil;
font-size: 4vw;
margin: 2rem auto;
margin-left: 2vw;
margin-right: 1vw;
}
#about { #about {
margin-bottom: 2rem; margin-bottom: 2rem;
} }
a { a {
font-family: sligoil;
text-decoration: underline; text-decoration: underline;
color: #24ea26; color: #24ea26;
@ -103,7 +75,6 @@ main ul li:before {
.back ul li { .back ul li {
text-align: right; text-align: right;
clear: both;
} }
.back ul li:before { .back ul li:before {
@ -111,14 +82,3 @@ main ul li:before {
padding-right: 5px; padding-right: 5px;
color: #24ea26; color: #24ea26;
} }
#saznajvise p {
font-size: 2vw;
}
.box {
float: left;
width: 25vw;
text-align: center;
padding: 1vw;
}