Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated speak.html deadline to 30 june #1

Open
wants to merge 111 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
b85499f
update link colors
exiledsurfer Apr 1, 2019
acb9ee1
update links and formatting
exiledsurfer Apr 1, 2019
20f1e6e
Merge pull request #7 from exiledsurfer/patch-1
mariapaulafn Apr 1, 2019
4f43fa3
Merge pull request #8 from exiledsurfer/patch-2
mariapaulafn Apr 1, 2019
349e230
correct link format and styling
exiledsurfer Apr 1, 2019
2710990
correct format and style
exiledsurfer Apr 1, 2019
02208db
Merge pull request #10 from exiledsurfer/patch-5
mariapaulafn Apr 2, 2019
5ce2305
Merge pull request #9 from exiledsurfer/patch-3
mariapaulafn Apr 2, 2019
86cd7e9
fixed stuff
mariapaulafn Apr 3, 2019
50b0357
fixed stuff
mariapaulafn Apr 3, 2019
804d6d3
Update sponsorship deck
May 13, 2019
ddf17c8
Merge pull request #11 from exiledsurfer/master
ligi May 16, 2019
ea17a7e
Merge pull request #12 from exiledsurfer/master
mariapaulafn Jun 3, 2019
c08e488
EXTEND
mariapaulafn Jun 4, 2019
26cb4b5
Add speakers list
Jun 14, 2019
d8f13dd
Mute
Jun 14, 2019
d530ccf
Adjust details
Jun 14, 2019
1023054
Add speaker page, fixing html structure
Jun 18, 2019
25ca051
Add subtitle on speaker page
Jun 18, 2019
2e8ba5a
update speak
mariapaulafn Jun 18, 2019
ccf93a4
update speak
mariapaulafn Jun 18, 2019
2b08bc9
Fix formatting and typo
Jun 18, 2019
76bf772
Add favicon
Jun 18, 2019
d20b91c
Bye Gomez
Jun 19, 2019
7b7fa37
Fixing link ux
Jun 19, 2019
2897354
Increase event date's font size
Jun 24, 2019
4a2a868
Add sponsor grid
Jun 24, 2019
cffe994
Update dappcon ticket info
mariapaulafn Jun 27, 2019
ce0f77b
Update hack deadline
mariapaulafn Jun 28, 2019
51f5ac1
Upload sponsor logos
Jul 1, 2019
86f6298
Merge branch 'master' of https://github.com/Department-of-Decentraliz…
Jul 1, 2019
3056f1a
Add tier1 sponsor logos
Jul 1, 2019
18212f3
Upload and style sponsor logos
Jul 1, 2019
216ba4a
Type on about.html
Jul 1, 2019
4f5cfb0
Typo on team.html
Jul 1, 2019
a97ce46
Make logo grid mobile responsive
Jul 1, 2019
b555174
Fix typo on frontpage
Jul 1, 2019
6ba977d
Update Sponsor
mariapaulafn Jul 1, 2019
2eb10c1
Update tier 4
Jul 2, 2019
08c1dd4
Adjusting logos position
Jul 2, 2019
96e75be
Add break to section
Jul 2, 2019
c1f64d6
Update Team
mariapaulafn Jul 2, 2019
5772777
Update team.html
franzihei Jul 2, 2019
32f5457
Merge pull request #13 from franzihei/patch-1
mariapaulafn Jul 2, 2019
82b4199
Update links
Jul 3, 2019
d7b6dd2
Add logos algorand and 3box
Jul 3, 2019
7ba94fc
Add protocollabs logo
Jul 3, 2019
ebc3357
Adjust logo size
Jul 3, 2019
5633a53
Add donation wallet address
Jul 8, 2019
816dc6c
Update link
mariapaulafn Jul 9, 2019
13d413a
update link
mariapaulafn Jul 9, 2019
f740676
update lnk
mariapaulafn Jul 9, 2019
523337a
update index
mariapaulafn Jul 9, 2019
a6f0571
Add etherscan address
Jul 9, 2019
462ab94
Add Silvio in speak list
Jul 10, 2019
764ca5e
Update sponsor logos
Jul 12, 2019
973b34d
Upload more logos
Jul 12, 2019
4f7383d
Upload speaker pics to the repo
Jul 13, 2019
87f2325
Add new speaker
Jul 15, 2019
9e7babc
Update more speakers
Jul 15, 2019
97f8210
Update team.html
franzihei Jul 16, 2019
a759307
Merge pull request #14 from franzihei/patch-1
ligi Jul 16, 2019
c9c7730
Add more speaker images
Jul 17, 2019
704b8e1
Merge branch 'master' of https://github.com/Department-of-Decentraliz…
Jul 17, 2019
1ee6cef
Update speakers
Jul 17, 2019
04bcd6f
Text to add to the "team" page
ligi Jul 17, 2019
fde1327
Update sponsor logos
Jul 18, 2019
d952dee
Merge pull request #16 from Department-of-Decentralization/fix_15
Lililashka Jul 22, 2019
7daa902
Add Mitch logo
Jul 24, 2019
ab80973
Update protocol lab logo
Jul 24, 2019
10c6ef6
Adjust logo size
Jul 24, 2019
5f4b86c
Update logos
Jul 24, 2019
15761cc
Update consensys logo
Jul 26, 2019
56124b6
Update Maya's avatar
Jul 27, 2019
c86f94d
Close hack
mariapaulafn Aug 2, 2019
29240a6
Open applications
mariapaulafn Aug 5, 2019
cdfd6ae
open again
mariapaulafn Aug 5, 2019
833a8c4
Add 'Berlin'
Aug 6, 2019
e36d5ec
Update sponsor logos tier 2
Aug 6, 2019
89f4e0d
Update sponsor logo tier 1
Aug 6, 2019
e159711
Update sponsor logos tier 3
Aug 6, 2019
2148233
Update sponsor logos tier 4
Aug 6, 2019
f9ed00a
Update sponsor logos tier 5
Aug 6, 2019
4e1ab95
Ana Andrianova twitter fixed
victordymov Aug 7, 2019
cfe7c34
Update sponsor logo tier 2
Aug 7, 2019
e795117
Update sponsor logos tier 3
Aug 7, 2019
6a7e911
Update sponsor logos tier 4,5
Aug 7, 2019
043df4a
Update sponsor logo tier 4
Aug 7, 2019
c2f9463
Update SIA logo
Aug 7, 2019
4a44b80
Close hacking
mariapaulafn Aug 9, 2019
38b7ec1
Fix missing link in sponsor page
Aug 9, 2019
bedd170
Add Fanny
Aug 12, 2019
f25535e
Merge pull request #17 from victorlunichkin/speakers-update
soc1c Aug 14, 2019
bd0b6c3
add link to knowledge base
soc1c Aug 14, 2019
9e5c283
add link to knowledge base
soc1c Aug 14, 2019
97b5f96
escape <
soc1c Aug 14, 2019
5bf2fb2
Merge pull request #18 from Department-of-Decentralization/s1-hacker-kb
ligi Aug 14, 2019
31b5990
update contributors
soc1c Aug 14, 2019
2479171
Merge pull request #19 from Department-of-Decentralization/s1-hacker-kb
ligi Aug 14, 2019
5e78641
Add files via upload
soc1c Aug 14, 2019
877738a
adding speakers ;)
soc1c Aug 14, 2019
49a3d2d
Create README.md
soc1c Aug 14, 2019
3e3710f
add schedule
soc1c Aug 15, 2019
0f08671
fix COC links
soc1c Aug 15, 2019
16c41c7
Merge pull request #20 from Department-of-Decentralization/s1-schedule
soc1c Aug 15, 2019
899c1c5
Update details
Lililashka Aug 22, 2019
0bc0bc9
Update
mariapaulafn Aug 23, 2019
6d3bcd1
minor housekeeping
Mar 22, 2020
499655a
add ethberlin 3 redirect
q9f Jun 13, 2022
9edab24
Update index.html
q9f Sep 22, 2022
4e3f789
update title to 2019
q9f Sep 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Department of Decentralization
Copyright (c) 2019 Li Feyerabend

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# ETHBerlinZwei
ETHBerlin Zwei Website

- https://ethberlinzwei.com/
43 changes: 26 additions & 17 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,19 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="css/style.css">
<link rel="apple-touch-icon" sizes="180x180" href="img/favi/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="img/favi/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="img/favi/favicon-16x16.png">
<link rel="manifest" href="img/favi/site.webmanifest">
<link rel="mask-icon" href="img/favi/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">
<title>ETHBerlin</title>
<script type="text/javascript" src="dist/paper-full.js"></script>
<script type="text/paperscript" canvas="canvas">


//stroke red

//stroke red
var pathRed = new Path(new Point(2, 20), new Point(250, 50));
pathRed.style = {
strokeColor: 'red',
Expand All @@ -31,21 +38,21 @@
function onFrame(event) {
pathRed.rotate(1);
}

//hamburger menu

(function () {
var hamburger = {
navToggle: document.querySelector('.nav-toggle'),
nav: document.querySelector('nav'),

doToggle: function (e) {
e.preventDefault();
this.navToggle.classList.toggle('expanded');
this.nav.classList.toggle('expanded');
}
};

hamburger.navToggle.addEventListener('click', function (e) {
hamburger.doToggle(e);
});
Expand All @@ -56,7 +63,7 @@
e.stopPropagation();
});
}());


</script>
</head>
Expand All @@ -71,7 +78,7 @@
<li><a href="hack.html">hack</a></li>
<li><a href="speak.html">speak</a></li>
<li><a href="team.html">join</a></li>
<li><a href="sponsor.html">sponsor</a></li>
<li><a href="sponsor.html">sponsors</a></li>
<li><a href="https://www.dappcon.io/">dAppcon</a></li>
<li><a href="https://medium.com/ethberlin">blog</a></li>
</ul>
Expand All @@ -97,7 +104,7 @@
//
<li><h7>Part of the <a href="https://blockchainweek.berlin/" target="_blank">Berlin Blockchain Week<img class="external-link-small" src="img/external.svg" alt="external link to ethberlin Berlin Blockchain Week"></a></h7></li>
//
<li><h7><a href="https://github.com/Department-of-Decentralization/decentralala.com/blob/master/code-of-conduct.md" target="_blank">code of conduct<img class="external-link-small" src="img/external.svg" alt="external link to code of conduct"></a></h7></li>
<li><h7><a href="https://ethberlinzwei.github.io/KnowledgeBase/code-of-conduct.html" target="_blank">code of conduct<img class="external-link-small" src="img/external.svg" alt="external link to code of conduct"></a></h7></li>
//
<li><h7><a href="imprint.html">imprint</a></h7></li>
//
Expand All @@ -109,9 +116,11 @@
</div>
<hr>
<div class="content">
<div class="title"><h6>about + FAQs</h6></div>
<div class="title"><h6>f.a.q.</h6></div>
<h4 style="text-align:center">Questions? Head straight to the <a href="https://ethberlinzwei.github.io/KnowledgeBase/index.html">knowledge base</a>!<br />TL;DR? Ok, here's the <a href="https://docs.google.com/spreadsheets/d/1RAPeTP1WurV57uwzm8YS9MRn2lnQ5XK9rRlfJ3cPYDc">schedule</a>!</h4>
<div class="title"><h6>about</h6></div>
<h4>ETHBerlinZwei is a hackathon, a culture festival, an educational event,
a platform for hacktivism, and a community initiative to push the decentralized ecosystem forward.
a platform for hacktivism, and a community initiative to push the decentralized ecosystem forward.
After a successful <a href="https://ethberlin.com/photos/" target="_blank">2018 event</a>,
ETHBerlin decided to reaffirm its commitment with the ecosystem and founded <a href="https://decentralala.com" target="_blank">the Department of Decentralization</a>,
responsible for initiatives that go beyond organizing a hackathon
Expand All @@ -122,16 +131,16 @@ <h4>ETHBerlin 2018 sought to marry the culture and values of Berlin with those o
and most importantly, a hub where builders will be able to get their creative juices flowing
by discovering various cultural and educational experiences spread across almost a week.
ETHBerlinZwei’s talks and panels will be held at <a href="https://www.dappcon.io/" target="_blank">dAppcon Berlin</a>
so all participants will have access to the two-day conference before diving deep into the Zwei experience.</h4>
so all participants will have access to the conference before diving deep into the Zwei experience.</h4>
<h4><strong>Who we are (in alphabetical order):</strong><h4>
<h4>Adeola - Afri - Alex - Ben - Caspar - Chris - Daniel - Elias - exiledsurfer - Franzi - Guto - Hels - Herni - Lasse - Lili - Maya - Mareen - Maurice - MP - Phil - Raul - Simon - Stina - Trenton<h4>
<h4>Adeola - Afri - Alex - Ben - Carl - Carlos - Caspar - Chris - Chris - Daniel - Elias - exiledsurfer - Fanny - Federico - Franzi - Griffin - Guto - Helena - Herni - Katy - Lasse - Ligi - Lili - Mareen - Matthias - Maurice - Maya - MP - Nico - Phil - Raul - Simon - Stina - Trenton<h4>

<h4>Special thanks to our friends at Gnosis, Full Node, and dAppcon<h4>
<br>
<br>
<div class="title"><h6>concept</h6></div>
<h4>Our website design and 2019 image are inspired by the centennial of the Bauhaus school.</h4>

<h4>The Bauhaus, a German word meaning "house of building",
is a school founded in 1919 in Weimar, Germany by the architect Walter Gropius.
Its mission, according to Gropius, was to conceive and create the new building of the future,
Expand All @@ -140,7 +149,7 @@ <h4>The Bauhaus, a German word meaning "house of building",
In short, the Bauhaus trained students to be equally comfortable with design, craft, and methods of mass production.
The Bauhaus pioneers were fearless builders, that withstood persecution, criticism, had to be exiled, but in the end,
their legacy prevails as the most influential school of the last century.</h4>

<h4>ETHBerlin is a house of building, too.</h4>
<h4>Made by builders, for builders.
We don’t need to explain the parallelisms here. Feel free to dig into the site,
Expand All @@ -153,10 +162,10 @@ <h4>Design and development: <a href="https://twitter.com/lililashka" target="_b
Graphic design and architectural feedback: <a href="https://twitter.com/trent_vanepps" target="_blank">Trenton Van Epps</a><br />
Illustration and reconceptualization: Hernán Fernández<br />
Concept: <a href="https://twitter.com/MPtherealMVP" target="_blank">MP Fernández</a></h4>

</div>
<canvas id="canvas" style="background-color: rgb(255, 251, 239)" resize="true"></canvas>
</div>

</body>
</html>
81 changes: 74 additions & 7 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,15 @@ hr {
}

.main-subtext {
font-family: "bc-falster";
pointer-events: none;
position: absolute;
top: 85%;
left: 5%;
font-size: 1.6rem;
word-wrap: break-word;
margin-right: 8rem;

}


Expand All @@ -186,13 +191,60 @@ hr {
top: 4rem;
}

/* GRID: SPEAKERS */

.grid-container {
display: grid;
grid-template-columns: auto auto auto auto;
background-color: none;
padding: 10px;
}
.grid-item {
font-family: Arial, Helvetica, sans-serif;
font-size: 0.9rem !important;
padding: 20px;
font-size: 30px;
text-align: center;
}

img {
width: 7.5rem;
align-content: center;
}

/* GRID: SPONSORS */

.grid-container-sponsor-t1 {
display: grid;
grid-template-columns: auto auto;
background-color: none;
padding: 10px;
justify-content: space-around;
}

.grid-container-sponsor-t4 {
display: grid;
grid-template-columns: auto auto auto auto;
}

.grid-container-sponsor {
display: grid;
grid-template-columns: auto auto auto;
background-color: none;
padding: 10px;
}

.sponsor-t1 {
width: 18rem;
}



/* LINKS */

/* unvisited link */
a:link {
color: black;
color: red;
text-decoration: none;
}

Expand All @@ -212,12 +264,12 @@ a:hover {

/* selected link */
a:active {
color: yellow;
color: red;
text-decoration: none;

}

/* media queries */
/* media queries */

.nav {
-webkit-transition: left 0.1s ease;
Expand Down Expand Up @@ -316,7 +368,16 @@ a:active {
transform: rotate(-45deg);
}

@media only screen and (max-width: 600px) {
@media only screen and (max-width: 850px) {
.grid-container, .grid-container-sponsor, .grid-container-sponsor-t1, .grid-container-sponsor-t4 {
grid-template-columns: auto auto;
}
img {
padding-right: 0 !important;
}
}

@media only screen and (max-width: 700px) {
.nav-big {
display: none;
}
Expand All @@ -329,10 +390,16 @@ a:active {
width: 350px;
word-wrap: break-word;
}
.grid-container, .grid-container-sponsor, .grid-container-sponsor-t1, .grid-container-sponsor-t4 {
grid-template-columns: auto;
}
img {
padding-right: 0 !important;
}
}


@media only screen and (max-width: 600px) {
@media only screen and (max-width: 700px) {
#navList-horizontal {
display: none;
}
Expand All @@ -341,14 +408,14 @@ a:active {
}
}

@media only screen and (min-width: 601px) {
@media only screen and (min-width: 701px) {
.nav-mobile {
display: none;
}

}

@media only screen and (min-width: 601px) {
@media only screen and (min-width: 701px) {
.nav-big {
margin-left: 80%;
margin-right: 20%;
Expand Down
Loading