aboutsummaryrefslogtreecommitdiff
path: root/configs/conferences
diff options
context:
space:
mode:
authorMaZderMind2015-12-28 22:45:27 +0100
committerMaZderMind2015-12-28 22:45:27 +0100
commitfb520d55b0598cd917fe0a4bda0b19225f008831 (patch)
treef3989113258017de91f8d8a7d55d5f7ed4a9ed40 /configs/conferences
parentda3c1d2cca11768f2e3f4edd8087a9b07e6d6698 (diff)
parentde21ef94cc0a529a8c7195994a56bb70772d9e4e (diff)
Merge branch 'master' of c3voc.de:streaming-website
Diffstat (limited to '')
-rw-r--r--configs/conferences/32c3/config.php7
-rw-r--r--configs/conferences/32c3/main.less4
2 files changed, 11 insertions, 0 deletions
diff --git a/configs/conferences/32c3/config.php b/configs/conferences/32c3/config.php
index f3556a8..9ec84a5 100644
--- a/configs/conferences/32c3/config.php
+++ b/configs/conferences/32c3/config.php
@@ -121,6 +121,7 @@ $GLOBALS['CONFIG']['OVERVIEW'] = array(
'ambient',
'dome',
'chaos-west',
+ 'radio',
),
'Live Podcasts' => array(
'sendezentrum',
@@ -505,6 +506,12 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
'MUSIC' => true,
'EMBED' => true,
),
+ 'radio' => array(
+ 'DISPLAY' => 'Radio Fairydust',
+ 'STREAM' => 'radio',
+ 'MUSIC' => true,
+ 'EMBED' => true,
+ ),
);
diff --git a/configs/conferences/32c3/main.less b/configs/conferences/32c3/main.less
index 1f9f6fa..012b8a4 100644
--- a/configs/conferences/32c3/main.less
+++ b/configs/conferences/32c3/main.less
@@ -152,3 +152,7 @@ nav .button-wrapper > .about {
color: @state-danger-text;
}
}
+
+body.multiview .cell {
+ color: black;
+}