From 7a98ce1ce5be6684bfadb6abbb0454cc33811bcf Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 May 2016 23:18:08 +0200 Subject: gpn16: style beautification --- configs/conferences/31c3/download.sh | 0 configs/conferences/32c3/download.sh | 0 configs/conferences/afu/config.php | 2 +- configs/conferences/chaosradio/download.sh | 0 configs/conferences/cryptocon16/config.php | 2 +- configs/conferences/cryptocon16/download.sh | 2 ++ configs/conferences/datengarten/download.sh | 0 configs/conferences/eh16/download.sh | 0 .../conferences/ffrl-routing-days-2016/download.sh | 0 configs/conferences/gpn16/config.php | 2 +- configs/conferences/gpn16/main.less | 21 ++++++++++++++------- configs/conferences/minilac16/download.sh | 0 configs/conferences/nixcon15/download.sh | 0 configs/conferences/ppw15b/download.sh | 0 configs/conferences/sub7/config.php | 2 +- 15 files changed, 20 insertions(+), 11 deletions(-) mode change 100755 => 100644 configs/conferences/31c3/download.sh mode change 100755 => 100644 configs/conferences/32c3/download.sh mode change 100755 => 100644 configs/conferences/chaosradio/download.sh mode change 100755 => 100644 configs/conferences/datengarten/download.sh mode change 100755 => 100644 configs/conferences/eh16/download.sh mode change 100755 => 100644 configs/conferences/ffrl-routing-days-2016/download.sh mode change 100755 => 100644 configs/conferences/minilac16/download.sh mode change 100755 => 100644 configs/conferences/nixcon15/download.sh mode change 100755 => 100644 configs/conferences/ppw15b/download.sh (limited to 'configs') diff --git a/configs/conferences/31c3/download.sh b/configs/conferences/31c3/download.sh old mode 100755 new mode 100644 diff --git a/configs/conferences/32c3/download.sh b/configs/conferences/32c3/download.sh old mode 100755 new mode 100644 diff --git a/configs/conferences/afu/config.php b/configs/conferences/afu/config.php index 0eaaed1..2f22bba 100644 --- a/configs/conferences/afu/config.php +++ b/configs/conferences/afu/config.php @@ -117,7 +117,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array( * * Wird diese Zeile auskommentiert, wird der Link nicht angezeigt */ - //'RELIVE_JSON' => 'configs/conferences/afu/vod.json', + 'RELIVE_JSON' => 'configs/conferences/afu/relive.json', ); /** diff --git a/configs/conferences/chaosradio/download.sh b/configs/conferences/chaosradio/download.sh old mode 100755 new mode 100644 diff --git a/configs/conferences/cryptocon16/config.php b/configs/conferences/cryptocon16/config.php index e2aeea4..81974eb 100644 --- a/configs/conferences/cryptocon16/config.php +++ b/configs/conferences/cryptocon16/config.php @@ -101,7 +101,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array( * Wird beides aktiviert, hat der externe Link Vorrang! * Wird beides auskommentiert, wird der Link nicht angezeigt */ -// 'RELIVE_JSON' => '', + //'RELIVE_JSON' => 'configs/conferences/cryptocon16/vod.json', /** * APCU-Cache-Zeit in Sekunden diff --git a/configs/conferences/cryptocon16/download.sh b/configs/conferences/cryptocon16/download.sh index d0bf262..691b513 100755 --- a/configs/conferences/cryptocon16/download.sh +++ b/configs/conferences/cryptocon16/download.sh @@ -2,3 +2,5 @@ # fahrplan wget --no-check-certificate -q "https://events.sublab.io/en/CC16/public/schedule.xml" -O /tmp/cryptocon16-schedule.xml && mv /tmp/cryptocon16-schedule.xml schedule.xml + +wget -q "http://live.dus.c3voc.de/relive/cc16/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json diff --git a/configs/conferences/datengarten/download.sh b/configs/conferences/datengarten/download.sh old mode 100755 new mode 100644 diff --git a/configs/conferences/eh16/download.sh b/configs/conferences/eh16/download.sh old mode 100755 new mode 100644 diff --git a/configs/conferences/ffrl-routing-days-2016/download.sh b/configs/conferences/ffrl-routing-days-2016/download.sh old mode 100755 new mode 100644 diff --git a/configs/conferences/gpn16/config.php b/configs/conferences/gpn16/config.php index 1779539..cc0b3e3 100644 --- a/configs/conferences/gpn16/config.php +++ b/configs/conferences/gpn16/config.php @@ -26,7 +26,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array( * Der Boolean true ist aus Abwärtskompatibilitätsgründen äquivalent zu 'after'. False ist äquivalent * zu 'running'. */ - //'CLOSED' => false, + 'CLOSED' => false, /** * Titel der Konferenz (kann Leer- und Sonderzeichen enthalten) diff --git a/configs/conferences/gpn16/main.less b/configs/conferences/gpn16/main.less index 6e3c7c7..4debf3d 100644 --- a/configs/conferences/gpn16/main.less +++ b/configs/conferences/gpn16/main.less @@ -1,17 +1,24 @@ @import "../../../assets/css/_structure.less"; -@link-color: #00a066; -@panel-bg: #ddd; +@link-color: #ccc; +@panel-bg: hsla(201, 100%, 28%, 0.75); @well-bg: @panel-bg; -@panel-primary-border: #FFFFFF; -@panel-default-heading-bg: #333333; + +@panel-primary-border: #fff; +@panel-bg: lighten(@body-bg, 5%); + +@panel-default-heading-bg: hsla(201, 100%, 18%, 0.75); @panel-default-text: #FFFFFF; @navbar-default-link-color: #FFFFFF; +@nav-link-bg: #ff0000; @nav-link-hover-bg: #000000; -@navbar-default-bg: #ccc; +@navbar-default-bg: hsla(201, 100%, 28%, 0.75); + +@text-color: white; + // conference specific styles here @@ -24,7 +31,7 @@ } .navbar-brand { - color: transparent !important; +// color: transparent !important; height: 50px; // background-image: url('logo.png'); background-repeat: no-repeat; @@ -32,7 +39,7 @@ background-position: 15px -3px; .icon { - display: none !important; +// display: none !important; } } diff --git a/configs/conferences/minilac16/download.sh b/configs/conferences/minilac16/download.sh old mode 100755 new mode 100644 diff --git a/configs/conferences/nixcon15/download.sh b/configs/conferences/nixcon15/download.sh old mode 100755 new mode 100644 diff --git a/configs/conferences/ppw15b/download.sh b/configs/conferences/ppw15b/download.sh old mode 100755 new mode 100644 diff --git a/configs/conferences/sub7/config.php b/configs/conferences/sub7/config.php index def91b6..8d40cbd 100644 --- a/configs/conferences/sub7/config.php +++ b/configs/conferences/sub7/config.php @@ -101,7 +101,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array( * Wird beides aktiviert, hat der externe Link Vorrang! * Wird beides auskommentiert, wird der Link nicht angezeigt */ - 'RELIVE_JSON' => 'configs/conferences/sub7/relive.json', + //'RELIVE_JSON' => 'configs/conferences/sub7/relive.json', /** * APCU-Cache-Zeit in Sekunden -- cgit v1.2.3