Skip to content

Commit

Permalink
Update design for 37c3
Browse files Browse the repository at this point in the history
  • Loading branch information
@GladOSkar
GladOSkar committed Dec 18, 2023
1 parent bd57813 commit aeb633c
Show file tree
Hide file tree
Showing 7 changed files with 255 additions and 46 deletions.
4 changes: 3 additions & 1 deletion app/fahrplan.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
var C3T_ROOM_MAP = {
'Fireshonks-Stream': document.querySelector('#fireshonks .talkinfo'),
'Saal 1': document.querySelector('#Saal_1 .talkinfo'),
'Saal Grace': document.querySelector('#Saal_Grace .talkinfo'),
'Saal Zuse': document.querySelector('#Saal_Zuse .talkinfo'),
}

function updateUI(room, day, cday, time, title, started) {
Expand Down
68 changes: 68 additions & 0 deletions app/img/channels/Saal_1.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 72 additions & 0 deletions app/img/channels/Saal_Grace.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 72 additions & 0 deletions app/img/channels/Saal_Zuse.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 24 additions & 4 deletions app/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,35 @@ <h2>Wähle zum Starten unten deinen Kanal aus</h2>
<!--<p><b>Translation 1</b> ist Englisch or Deutsch, je nachdem, was
nicht die Originalsprache ist. Unter <b>Translation 2</b> gibt es
manchmal eine weitere Sprache (z.B. Französisch).</p>-->
</section>
</section>m
</div>
</div>
<div id="halls">
<div id="fireshonks">
<img src="./img/channels/fireshonks.svg" alt="FireShonks 🦈💥">
<div id="Saal_1">
<img src="./img/channels/Saal_1.svg" alt="Saal_1">
<div class="talkinfo"></div>
<ul>
<li><a href="./stream.html?channel=37c3/Saal_1/Saal_1-original">Original</a></li>
<li><a href="./stream.html?channel=37c3/Saal_1/Saal_1-translation-1">English–German</a></li>
<li><a href="./stream.html?channel=37c3/Saal_1/Saal_1-translation-2">Other Language</a></li>
</ul>
</div>
<div id="Saal_Grace">
<img src="./img/channels/Saal_Grace.svg" alt="Saal_Grace">
<div class="talkinfo"></div>
<ul>
<li><a href="./stream.html?channel=37c3/Saal_Grace/Saal_Grace-original">Original</a></li>
<li><a href="./stream.html?channel=37c3/Saal_Grace/Saal_Grace-translation-1">English–German</a></li>
<li><a href="./stream.html?channel=37c3/Saal_Grace/Saal_Grace-translation-2">Other Language</a></li>
</ul>
</div>
<div id="Saal_Zuse">
<img src="./img/channels/Saal_Zuse.svg" alt="Saal_Zuse">
<div class="talkinfo"></div>
<ul>
<li><a href="./stream.html?channel=fireshonks/translation-channel-1">English–German</a></li>
<li><a href="./stream.html?channel=37c3/Saal_Zuse/Saal_Zuse-original">Original</a></li>
<li><a href="./stream.html?channel=37c3/Saal_Zuse/Saal_Zuse-translation-1">English–German</a></li>
<li><a href="./stream.html?channel=37c3/Saal_Zuse/Saal_Zuse-translation-2">Other Language</a></li>
</ul>
</div>
</div>
Expand Down
55 changes: 14 additions & 41 deletions app/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ main > #halls {

.talkinfo {
flex-grow: 1;
padding: 0 1em 0.5em;
padding: 0.5em 1em;
}

.talkinfo h4 {
Expand Down Expand Up @@ -240,45 +240,18 @@ body[lang] .sep {
display: none;
}

#halls > div:nth-child(4n+1) {
outline: 1px solid #B239FF;
color: #B239FF;
}
#halls > div:nth-child(4n+2) {
outline: 1px solid #835CFF;
color: #835CFF;
}
#halls > div:nth-child(4n+3) {
outline: 1px solid #05B9EC;
color: #05B9EC;
}
#halls > div:nth-child(4n+4) {
outline: 1px solid #02FAE0;
color: #02FAE0;
}
#halls > div:nth-child(3n+1) { outline: 1px solid #29ffff; color: #29ffff; }
#halls > div:nth-child(3n+2) { outline: 1px solid #de4040; color: #de4040; }
#halls > div:nth-child(3n+3) { outline: 1px solid #f6f675; color: #f6f675; }

#halls > div:nth-child(4n+1) li a {
border-top: 1px solid #B239FF;
}
#halls > div:nth-child(4n+2) li a {
border-top: 1px solid #835CFF;
}
#halls > div:nth-child(4n+3) li a {
border-top: 1px solid #05B9EC;
}
#halls > div:nth-child(4n+4) li a {
border-top: 1px solid #02FAE0;
}
#halls > div:nth-child(3n+1) img { border-bottom: 1px solid #29ffff; }
#halls > div:nth-child(3n+2) img { border-bottom: 1px solid #de4040; }
#halls > div:nth-child(3n+3) img { border-bottom: 1px solid #f6f675; }

#halls > div:nth-child(4n+1) li a:hover {
background-color: #B239FF;
}
#halls > div:nth-child(4n+2) li a:hover {
background-color: #835CFF;
}
#halls > div:nth-child(4n+3) li a:hover {
background-color: #05B9EC;
}
#halls > div:nth-child(4n+4) li a:hover {
background-color: #02FAE0;
}
#halls > div:nth-child(3n+1) li a { border-top: 1px solid #29ffff; }
#halls > div:nth-child(3n+2) li a { border-top: 1px solid #de4040; }
#halls > div:nth-child(3n+3) li a { border-top: 1px solid #f6f675; }

#halls > div:nth-child(3n+1) li a:hover { background-color: #29ffff; }
#halls > div:nth-child(3n+2) li a:hover { background-color: #de4040; }
#halls > div:nth-child(3n+3) li a:hover { background-color: #f6f675; }
2 changes: 2 additions & 0 deletions app/stream.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ <h2>This makes us sad because we can't deliver our translations :(</h2>
'english-german': 'English–German',
'third-language': 'Other Language',
'translation': 'English–German',
'translation-1': 'English–German',
'translation-2': 'Other Language',
}[lang] || lang
document.write('<h1>' + decodeURIComponent(room) + '</h1>')
document.write('<h2>' + decodeURIComponent(lang) + '</h2>')
Expand Down

0 comments on commit aeb633c

Please sign in to comment.