Add project radio buttons

inc/project.php

@@ -85,13 +85,14 @@ class Project extends PhpObject {
 		if($iProjectId > 0) $asInfo['constraint'] = array(Db::getId(self::PROJ_TABLE)=>$iProjectId);
 		
 		$asProjects = $this->oDb->selectRows($asInfo, 'codename');
-		foreach($asProjects as &$asProject) {
+		foreach($asProjects as $sCodeName=>&$asProject) {
 			switch($asProject['mode']) {
 				case 0: $asProject['mode'] = self::MODE_PREVIZ; break;
 				case 1: $asProject['mode'] = self::MODE_BLOG; break;
 				case 2: $asProject['mode'] = self::MODE_HISTO; break;
 			}
 			$asProject['geofile'] = Spot::addTimestampToFilePath(self::GEO_FOLDER.$asProject['geofile']);
+			$asProject['codename'] = $sCodeName;
 		}
 		return $asProjects;
 	}

masks/project.html

@@ -1,15 +1,6 @@
 <div id="messages">
-	<div id="map">
-		<div class="loader fa fa-map"></div>
-	</div>
-	<div id="projects">
-		
-	</div>
-	<div id="legend">
-		<div class="line main">Trajet principal</div>
-		<div class="line off-track">Variante</div>
-		<div class="line hitchhiking">Hors rando</div>
-	</div>
+	<div class="loader fa fa-fw fa-map"></div>
+	<div id="map"></div>
 	<div id="feed">
 		<div id="posts">
 			<div id="poster"></div>
@@ -17,6 +8,13 @@
 			<div id="loading"></div>
 		</div>
 	</div>
+	<div id="elems">
+		<div id="legend" class="leaflet-control-layers leaflet-control leaflet-control-layers-expanded">
+			<div class="line main">Trajet principal</div>
+			<div class="line off-track">Variante</div>
+			<div class="line hitchhiking">Hors rando</div>
+		</div>
+	</div>
 </div>
 <script type="text/javascript" src="script/lightbox.min.js"></script>
 <script type="text/javascript">
@@ -24,37 +22,47 @@ self.onSamePageMove = function(asHash){
 	if(typeof self.tmp('map') != 'undefined') {
 		self.tmp('map').remove();
 		self.tmp('$Map').empty();
+		self.tmp('map', null);
 	}
-	self.pageInit(asHash);
+	initProject(asHash.items[0]);
 	return false;
 };
 
 oSpot.pageInit = function(asHash)
 {
 	//Set active project
-	if(asHash.items.length==0) {
-		self.setHash(asHash.page, [self.vars('default_project_codename')]);
-		return;
+	if(asHash.items.length==0) self.setHash(asHash.page, [self.vars('default_project_codename')]);
+	else {
+		self.tmp('$Map', $('#map'));
+		self.tmp('updatable', true);
+		self.tmp('out-of-data', false);
+		self.tmp('feed_width', $('#feed').outerWidth(true));
+		self.tmp('map_offset', -1 * self.tmp('feed_width') / $('body').outerWidth(true));
+		self.tmp('map_padding', 0.05);
+		self.tmp('tile_api', '?a=tile&id={id}&z={z}&x={x}&y={y}');
+		
+		//Assign Track Type Colors
+		self.tmp('track-type-styles', 'object');
+		$('#legend').find('.line').each(function(iKey, oLegend){
+			var $Legend = $(oLegend);
+			var sTrackType = $Legend.attr('class').replace('line', '').trim();
+			self.tmp(['track-type-styles', sTrackType], {weight: parseInt($Legend.css('line-height')), color: $Legend.css('border-top-color'), opacity: 1});
+		});
+		
+		//Scrollbar
+		self.tmp('simple-bar', new SimpleBar($('#posts')[0]));
+		self.tmp('simple-bar').getScrollElement().addEventListener('scroll', onFeedScroll);
+
+		//Add "Loading" Post
+		getPost({type: 'loading', formatted_time: '', relative_time: '', displayed_id: 'Chargement...'}).appendTo($('#loading'));
+
+		//project Bootstrap
+		initProject(asHash.items[0]);
 	}
-	self.vars('project', self.vars(['projects', asHash.items[0]]));
-	self.tmp('$Map', $('#map'));
-	self.tmp('track-type-styles', 'object');
+};
 
-	//Assign Track Type Colors
-	$('#legend').find('.line').each(function(iKey, oLegend){
-		var $Legend = $(oLegend);
-		var sTrackType = $Legend.attr('class').replace('line', '').trim();
-		self.tmp(['track-type-styles', sTrackType], {weight: parseInt($Legend.css('line-height')), color: $Legend.css('border-top-color'), opacity: 1});
-	});
-	
-	//Add "Loading" Post
-	var asLoading = {
-		type: 'loading',
-		formatted_time: '',
-		relative_time: '',
-		displayed_id: 'Chargement...'
-	};
-	getPost(asLoading).appendTo($('#loading'));
+function initProject(sProjectCodeName){
+	self.vars('project', self.vars(['projects', sProjectCodeName]));
 	
 	//Spot Messages
 	$.when(
@@ -76,20 +84,9 @@ oSpot.pageInit = function(asHash)
 	//Posts
 	updateFeed(true);
 	initPosts();
-};
+}
 
-function buildSpotMessages(aoMessages, aoTracks){
-	
-	//Build Feed
-	self.tmp('updatable', true);
-	self.tmp('out-of-data', 'boolean');
-	self.tmp('simple-bar', new SimpleBar($('#posts')[0]));
-	self.tmp('simple-bar').getScrollElement().addEventListener('scroll', onFeedScroll);
-	self.tmp('infowindow', 'boolean');
-	self.tmp('feed_width', $('#feed').outerWidth(true));
-	self.tmp('map_offset', -1 * self.tmp('feed_width') / $('body').outerWidth(true));
-	self.tmp('map_padding', 0.05);
-	self.tmp('tile_api', '?a=tile&id={id}&z={z}&x={x}&y={y}');
+function buildSpotMessages(aoMessages, aoTracks) {
 	
 	//Tile layers
 	var oMapBoxSat		= L.tileLayer(self.tmp('tile_api'), {id: 'mapbox.satellite', minZoom: 0, maxZoom: 19}),
@@ -215,29 +212,46 @@ function buildSpotMessages(aoMessages, aoTracks){
 	
 	//Legend
 	var oLegend = L.control({position: 'bottomleft'});
-	oLegend.onAdd = function(oMap) {return L.DomUtil.get('legend');};
+	oLegend.onAdd = function(oMap) {return $('#legend').clone()[0];};
 	oLegend.addTo(oMap);
 	
 	//Projects
 	var oProjects = L.control({position: 'bottomleft'});
-	oProjects.onAdd = function(oMap) {return L.DomUtil.get('projects');};
+	oProjects.onAdd = function(oMap) {
+		
+		var $Labels = $('<div>', {'class': 'leaflet-control-layers-base'});
+		$.each(self.vars('projects'), function(sCodeName, asProject){
+			var asRadioAttrs = {'type': 'radio', 'class': 'leaflet-control-layers-selector', 'name':'project', 'value': sCodeName};
+			if(asProject.id == self.vars(['project', 'id'])) asRadioAttrs.checked = 'checked';
+			var $Radio =$('<input>', asRadioAttrs).change(function(){
+				self.setHash(self.vars('page'), [$(this).val()]);
+			});
+			
+			var $Label = $('<label>').append($('<div>')
+				.append($Radio)
+				.append($('<span>').text(' '+asProject.name))
+			);
+			$Labels.append($Label);
+		});
+		
+		return $('<div>', {'class':'leaflet-control-layers leaflet-control leaflet-control-layers-expanded'}).append($('<section>').append($Labels))[0];
+	};
 	oProjects.addTo(oMap);
 }
 
 function initPosts() {
-	if(self.vars(['project', 'mode'])==self.consts.modes.histo) $('#poster').hide();
+	var $Poster = $('#poster').empty();
+	if(self.vars(['project', 'mode'])==self.consts.modes.histo) $Poster.hide();
 	else {
 		var asPoster = {
 			type: 'poster',
 			formatted_time: '',
 			relative_time: 'Nouveau message'
 		};
-		getPost(asPoster).appendTo($('#poster'));
+		getPost(asPoster).appendTo($Poster);
 		
-		//$('#name').defaultVal('Nom...');
-		//$('#post').defaultVal('Ton message...');
 		$('#submit').click(function(){
-			if($('#poster').checkForm())
+			if($Poster.checkForm())
 			{
 				self.get(
 					'add_post',
@@ -343,7 +357,7 @@ function updateFeed(bFirstChunk)
 
 function getPost(asPost) {
 	var $Post = $('<div>', {'class':'post '+asPost.type});
-	var sRelTime = (self.vars(['project', 'mode'])==self.consts.modes.histo)?asPost.formatted_time.substr(0, 10):asPost.relative_time;
+	var sRelTime = (asPost.relative_time!='')?((self.vars(['project', 'mode'])==self.consts.modes.histo)?asPost.formatted_time.substr(0, 10):asPost.relative_time):'';
 	var sAbsTime = asPost.formatted_time;
 	var $Body = {};
 	switch(asPost.type)

style/_fa.scss

@@ -1,7 +1,7 @@
 $fa-font-path: "fa/fonts";
 $fa-css-prefix: fa;
 
-@import 'fa/light';
+@import 'fa/solid';
 @import 'fa/mixins';
 @import 'fa/core';
 @import 'fa/larger';
@@ -13,7 +13,7 @@ $fa-css-prefix: fa;
 @import 'fa/stacked';
 
 .fa {
-	@extend .fal;
+	@extend .fas;
 	
 	&.push {
 		margin-right: 0.5em;

style/spot.css

@@ -1,2 +1,2 @@
-@CHARSET "UTF-8";@font-face{font-family:'Font Awesome 5 Pro';font-style:normal;font-weight:300;src:url("fa/fonts/fa-light-300.eot");src:url("fa/fonts/fa-light-300.eot?#iefix") format("embedded-opentype"),url("fa/fonts/fa-light-300.woff2") format("woff2"),url("fa/fonts/fa-light-300.woff") format("woff"),url("fa/fonts/fa-light-300.ttf") format("truetype"),url("fa/fonts/fa-light-300.svg#fontawesome") format("svg")}.fal,.fa{font-family:'Font Awesome 5 Pro';font-weight:300}.fa,.fas,.far,.fal,.fa,.fab{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.3333333333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw,.info-window i{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:solid 0.08em #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fas.fa-pull-left,.far.fa-pull-left,.fal.fa-pull-left,.fa-pull-left.fa,.fab.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fas.fa-pull-right,.far.fa-pull-right,.fal.fa-pull-right,.fa-pull-right.fa,.fab.fa-pull-right{margin-left:.3em}.fa-spin{animation:fa-spin 2s infinite linear}.fa-pulse{animation:fa-spin 1s infinite steps(8)}@keyframes fa-spin{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";transform:scale(1, -1)}.fa-flip-horizontal.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";transform:scale(-1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa.push{margin-right:0.5em}.fa-post:before{content:"\f075"}.fa-poster:before{content:"\f4ae"}.fa-message:before{content:"\f14e"}.fa-map:before{content:"\f59f"}.fa-time:before{content:"\f017"}.fa-picture:before{content:"\f332"}.fa-send:before{content:"\f1d8"}.fa-spinner:before{content:"\f110"}.fa-tasks:before{content:"\f0ae"}.fa-track-off-track:before{content:"\f6ec"}.fa-track-main:before{content:"\f6ec"}.fa-track-hitchhiking:before{content:"\f5e4"}html.lb-disable-scrolling{overflow:hidden;position:fixed;height:100vh;width:100vw}.lightboxOverlay{position:absolute;top:0;left:0;z-index:9999;background-color:black;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);opacity:0.8;display:none}.lightbox{position:absolute;left:0;width:100%;z-index:10000;text-align:center;line-height:0;font-weight:normal}.lightbox .lb-image{display:block;height:auto;max-width:inherit;max-height:none;border-radius:3px;border:4px solid white}.lightbox a img{border:none}.lb-outerContainer{position:relative;*zoom:1;width:250px;height:250px;margin:0 auto;border-radius:4px;background-color:white}.lb-outerContainer:after{content:"";display:table;clear:both}.lb-loader{position:absolute;top:43%;left:0;height:25%;width:100%;text-align:center;line-height:0}.lb-cancel{display:block;width:32px;height:32px;margin:0 auto;background:url(../images/loading.gif) no-repeat}.lb-nav{position:absolute;top:0;left:0;height:100%;width:100%;z-index:10}.lb-container>.nav{left:0}.lb-nav a{outline:none;background-image:url("data:image/gif;base64,R0lGODlhAQABAPAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==")}.lb-prev,.lb-next{height:100%;cursor:pointer;display:block}.lb-nav a.lb-prev{width:34%;left:0;float:left;background:url(../images/prev.png) left 48% no-repeat;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=0);opacity:0;-webkit-transition:opacity 0.6s;-moz-transition:opacity 0.6s;-o-transition:opacity 0.6s;transition:opacity 0.6s}.lb-nav a.lb-prev:hover{filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=100);opacity:1}.lb-nav a.lb-next{width:64%;right:0;float:right;background:url(../images/next.png) right 48% Line truncated
+@CHARSET "UTF-8";@font-face{font-family:'Font Awesome 5 Pro';font-style:normal;font-weight:900;src:url("fa/fonts/fa-solid-900.eot");src:url("fa/fonts/fa-solid-900.eot?#iefix") format("embedded-opentype"),url("fa/fonts/fa-solid-900.woff2") format("woff2"),url("fa/fonts/fa-solid-900.woff") format("woff"),url("fa/fonts/fa-solid-900.ttf") format("truetype"),url("fa/fonts/fa-solid-900.svg#fontawesome") format("svg")}.fa,.fas,.fa{font-family:'Font Awesome 5 Pro';font-weight:900}.fa,.fas,.fa,.far,.fal,.fab{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.3333333333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw,.info-window i{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:solid 0.08em #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fas.fa-pull-left,.fa-pull-left.fa,.far.fa-pull-left,.fal.fa-pull-left,.fab.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fas.fa-pull-right,.fa-pull-right.fa,.far.fa-pull-right,.fal.fa-pull-right,.fab.fa-pull-right{margin-left:.3em}.fa-spin{animation:fa-spin 2s infinite linear}.fa-pulse{animation:fa-spin 1s infinite steps(8)}@keyframes fa-spin{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";transform:scale(1, -1)}.fa-flip-horizontal.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";transform:scale(-1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa.push{margin-right:0.5em}.fa-post:before{content:"\f075"}.fa-poster:before{content:"\f4ae"}.fa-message:before{content:"\f14e"}.fa-map:before{content:"\f59f"}.fa-time:before{content:"\f017"}.fa-picture:before{content:"\f332"}.fa-send:before{content:"\f1d8"}.fa-spinner:before{content:"\f110"}.fa-tasks:before{content:"\f0ae"}.fa-track-off-track:before{content:"\f6ec"}.fa-track-main:before{content:"\f6ec"}.fa-track-hitchhiking:before{content:"\f5e4"}html.lb-disable-scrolling{overflow:hidden;position:fixed;height:100vh;width:100vw}.lightboxOverlay{position:absolute;top:0;left:0;z-index:9999;background-color:black;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);opacity:0.8;display:none}.lightbox{position:absolute;left:0;width:100%;z-index:10000;text-align:center;line-height:0;font-weight:normal}.lightbox .lb-image{display:block;height:auto;max-width:inherit;max-height:none;border-radius:3px;border:4px solid white}.lightbox a img{border:none}.lb-outerContainer{position:relative;*zoom:1;width:250px;height:250px;margin:0 auto;border-radius:4px;background-color:white}.lb-outerContainer:after{content:"";display:table;clear:both}.lb-loader{position:absolute;top:43%;left:0;height:25%;width:100%;text-align:center;line-height:0}.lb-cancel{display:block;width:32px;height:32px;margin:0 auto;background:url(../images/loading.gif) no-repeat}.lb-nav{position:absolute;top:0;left:0;height:100%;width:100%;z-index:10}.lb-container>.nav{left:0}.lb-nav a{outline:none;background-image:url("data:image/gif;base64,R0lGODlhAQABAPAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==")}.lb-prev,.lb-next{height:100%;cursor:pointer;display:block}.lb-nav a.lb-prev{width:34%;left:0;float:left;background:url(../images/prev.png) left 48% no-repeat;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=0);opacity:0;-webkit-transition:opacity 0.6s;-moz-transition:opacity 0.6s;-o-transition:opacity 0.6s;transition:opacity 0.6s}.lb-nav a.lb-prev:hover{filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=100);opacity:1}.lb-nav a.lb-next{width:64%;right:0;float:right;background:url(../images/next.png) right Line truncated
 /*# sourceMappingURL=spot.css.map */

style/spot.css.map

@@ -1,7 +1,7 @@
 {
 "version": 3,
-"mappings": "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 truncated
-"sources": ["spot.scss","fa/light.scss","fa/_core.scss","fa/_larger.scss","fa/_fixed-width.scss","fa/_variables.scss","fa/_list.scss","fa/_bordered-pulled.scss","fa/_animated.scss","fa/_rotated-flipped.scss","fa/_mixins.scss","fa/_stacked.scss","_fa.scss","_lightbox.scss","_simplebar.scss","_leaflet.scss","_common.scss"],
+"mappings": "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 truncated
+"sources": ["spot.scss","fa/solid.scss","fa/_core.scss","fa/_larger.scss","fa/_fixed-width.scss","fa/_variables.scss","fa/_list.scss","fa/_bordered-pulled.scss","fa/_animated.scss","fa/_rotated-flipped.scss","fa/_mixins.scss","fa/_stacked.scss","_fa.scss","_lightbox.scss","_simplebar.scss","_leaflet.scss","_common.scss"],
 "names": [],
 "file": "spot.css"
 }

style/spot.scss

@@ -8,6 +8,15 @@
 
 #messages {
 
+	.loader {
+		position: absolute;
+		font-size: 3em;
+		top: calc(50% - 0.5em);
+		left: calc(35% - 0.66666em);
+		color: #666;
+		@extend .flicker;
+	}
+	
 	#map {
 		position: absolute;
 		left: 0;
@@ -16,17 +25,6 @@
 		width: 100%;
 		background: #EEE;
 		
-		.loader {
-			position: absolute;
-			font-size: 3em;
-			width: 1em;
-			height: 1em;
-			top: calc(50% - 0.5em);
-			left: calc(50% - 0.5em);
-			color: #666;
-			@extend .flicker;
-		}
-	
 		.track_tooltip {
 			p {
 				margin: 0;
@@ -42,13 +40,23 @@
 		}
 	}
 
-	#legend, #projects, .leaflet-control-layers.leaflet-control {
-		background-color: rgba(255, 255, 255, 0.5);
+	.leaflet-control-layers.leaflet-control {
+		background-color: rgba(255, 255, 255, 0.6);
 		font-family: Roboto, Arial, sans-serif;
 		border-radius: 3px;
 		border: none;
 		margin: 1em;
+		
+		&.leaflet-control-layers-expanded {
+			color: #000000;
+			width: calc(100% - 2em - 16px);
+		}
+		
+		&+.leaflet-control-layers.leaflet-control {
+			margin-top: 0;
+		}
 	}
+
 	#legend {
 		//right: 30vw;
 					
@@ -74,6 +82,10 @@
 	}
 }
 
+#elems {
+	display: none;
+}
+
 #feed {
 	position: absolute;
 	right: 0;