Merge https://github.com/friendica/red into pending_merge

3 files changed, 22 insertions, 26 deletions

diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css
index 56f4c415b..7cbcc8807 100644
--- a/view/css/mod_cloud.css
+++ b/view/css/mod_cloud.css
@@ -2,7 +2,10 @@
 #files-upload-tools,
 [id^="perms-panel-"] {
 	display: none;
-	padding: 3px 10px 3px 10px !important;
+}
+
+[id^="perms-panel-"] {
+	padding: 3px 10px 0px 10px !important;
 }
 
 #attach-code,
@@ -14,19 +17,17 @@
 	width: 100%;
 }
 
-#cloud-index th {
-	padding-top: 7px;
-}
-
 #cloud-index td:nth-child(1){
 	padding: 7px 3px 7px 10px;
 }
 
+#cloud-index th:nth-child(8),
 #cloud-index td:nth-child(8){
 	padding: 7px 3px;
 	white-space: nowrap;
 }
 
+#cloud-index th:nth-child(9),
 #cloud-index td:nth-child(9){
 	padding: 7px 10px 7px 7px;
 	white-space: nowrap;
@@ -35,3 +36,7 @@
 .cloud-index-tool {
 	padding: 7px 10px;
 }
+
+#files-upload {
+    padding: 2px;
+}
diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css
index 161b46757..bb7ef566d 100644
--- a/view/css/mod_manage.css
+++ b/view/css/mod_manage.css
@@ -1,7 +1,6 @@
 #channels-selected {
 	color: #666666;
 	font-size: 0.8em;
-
 }
 
 #channels-desc {
@@ -14,33 +13,23 @@
 .channels-break {
 	margin-bottom: 15px;
 }
-#selected-channel {
-	float: left;
-	margin-left: 0;
-}
-
-.channels-end.selected {
-	clear: both;
-}
-
-#selected-channel .channel-selection {
-	clear: both;
-	margin: 0 auto 0 auto;
-}
 
 .channel-selection-default {
 	font-size: 0.8em;
 	margin-bottom: 10px;
 }
 
-#all-channels .channel-selection {
+.channel-selection {
 	width: 12em;
 	height: 16em;
 	float: left;
-	margin: 0 15px 15px 0;
+	text-align: center;
 }
-.channels-end {
-	clear: both;
+
+.channel-selection img {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
 }
 
 .channel-selection-name-link {
@@ -50,7 +39,6 @@
 
 .channel-selection-name-link .channel-name {
 	padding-top: 10px;
-	text-align: left;	
 	word-wrap: break-word;
 	overflow: hidden;
 }
@@ -59,3 +47,7 @@
 	clear: both;
 	padding-top: 10px;
 }
+
+.selected-channel img {
+	border: 2px solid #ff0000;
+}
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index 34bac51e9..6fefad8e4 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -25,6 +25,5 @@
 }
 
 #photos-upload-choose {
-	border: unset;
-	padding: unset;
+	padding: 2px;
 }