diff options
| author | root | 2016-05-25 23:18:08 +0200 | 
|---|---|---|
| committer | root | 2016-05-25 23:18:08 +0200 | 
| commit | 7a98ce1ce5be6684bfadb6abbb0454cc33811bcf (patch) | |
| tree | 8609b58d1a3d8ee856902d3a0cbd8d6212cf7502 /configs/conferences | |
| parent | 01941566d26635116baf4eb79b3479b17dd55a3b (diff) | |
gpn16: style beautification
Diffstat (limited to '')
| -rw-r--r--[-rwxr-xr-x] | configs/conferences/31c3/download.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | configs/conferences/32c3/download.sh | 0 | ||||
| -rw-r--r-- | configs/conferences/afu/config.php | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | configs/conferences/chaosradio/download.sh | 0 | ||||
| -rw-r--r-- | configs/conferences/cryptocon16/config.php | 2 | ||||
| -rwxr-xr-x | configs/conferences/cryptocon16/download.sh | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | configs/conferences/datengarten/download.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | configs/conferences/eh16/download.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | configs/conferences/ffrl-routing-days-2016/download.sh | 0 | ||||
| -rw-r--r-- | configs/conferences/gpn16/config.php | 2 | ||||
| -rw-r--r-- | configs/conferences/gpn16/main.less | 21 | ||||
| -rw-r--r--[-rwxr-xr-x] | configs/conferences/minilac16/download.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | configs/conferences/nixcon15/download.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | configs/conferences/ppw15b/download.sh | 0 | ||||
| -rw-r--r-- | configs/conferences/sub7/config.php | 2 | 
15 files changed, 20 insertions, 11 deletions
| diff --git a/configs/conferences/31c3/download.sh b/configs/conferences/31c3/download.sh index 81d5ad7..81d5ad7 100755..100644 --- a/configs/conferences/31c3/download.sh +++ b/configs/conferences/31c3/download.sh diff --git a/configs/conferences/32c3/download.sh b/configs/conferences/32c3/download.sh index 26b1354..26b1354 100755..100644 --- a/configs/conferences/32c3/download.sh +++ b/configs/conferences/32c3/download.sh 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 index 5474658..5474658 100755..100644 --- a/configs/conferences/chaosradio/download.sh +++ b/configs/conferences/chaosradio/download.sh 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 index 5834c4b..5834c4b 100755..100644 --- a/configs/conferences/datengarten/download.sh +++ b/configs/conferences/datengarten/download.sh diff --git a/configs/conferences/eh16/download.sh b/configs/conferences/eh16/download.sh index 416e240..416e240 100755..100644 --- a/configs/conferences/eh16/download.sh +++ b/configs/conferences/eh16/download.sh diff --git a/configs/conferences/ffrl-routing-days-2016/download.sh b/configs/conferences/ffrl-routing-days-2016/download.sh index e6975b3..e6975b3 100755..100644 --- a/configs/conferences/ffrl-routing-days-2016/download.sh +++ b/configs/conferences/ffrl-routing-days-2016/download.sh 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 index d7be062..d7be062 100755..100644 --- a/configs/conferences/minilac16/download.sh +++ b/configs/conferences/minilac16/download.sh diff --git a/configs/conferences/nixcon15/download.sh b/configs/conferences/nixcon15/download.sh index a81b80c..a81b80c 100755..100644 --- a/configs/conferences/nixcon15/download.sh +++ b/configs/conferences/nixcon15/download.sh diff --git a/configs/conferences/ppw15b/download.sh b/configs/conferences/ppw15b/download.sh index 181655d..181655d 100755..100644 --- a/configs/conferences/ppw15b/download.sh +++ b/configs/conferences/ppw15b/download.sh 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 | 
