Merge branch 'develop' into screensharing

2018-04-10 14:40:58 +02:00
parent a1caff2af3 126a5f2df4
commit b661aa1923
6 changed files with 138 additions and 29 deletions
@@ -1,10 +1,11 @@
 [data-component='Peers'] {
 	min-height: 100%;
 	width: 100%;
+	height: 100%;

 	+desktop() {
 		width: 100%;
-		padding: 40px 0 140px 0;
+		padding: 0px 0 0px 0;
 		display: flex;
 		flex-direction: row;
 		flex-wrap: wrap;
@@ -29,8 +30,6 @@

 		+desktop() {
 			flex: 0 0 auto;
-			height: 382px;
-			width: 450px;
 			margin: 6px;
 			border: 1px solid rgba(#fff, 0.15);
 			box-shadow: 0px 5px 12px 2px rgba(#111, 0.5);