Merge branch 'master' of https://github.com/friendica/red into mod-profpicperm

4 files changed, 86 insertions, 24 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index ae4e48315..7e439137e 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -58,12 +58,14 @@
 
 .thread-wrapper.toplevel_item {
 	width: 90%;
+	margin-bottom: 10px;
 }
 
 /* conv_item */
 
 .hide-comments-outer {
-	margin-left: 10px;
+	margin-left: 60px;
+	padding: 15px 10px 15px 10px;
 }
 
 .wall-item-content-wrapper {
@@ -213,6 +215,11 @@
 .wall-item-tools {
 	clear: both;
 	padding: 5px 10px;
+	margin-left: 60px;
+}
+
+.comment .wall-item-tools {
+	margin-left: 0;
 }
 
 .item-tool {
@@ -345,7 +352,7 @@
 }
 
 .comment-edit-submit {
-	margin: 10px 0px 10px 110px;
+	margin: 10px 0px 10px 52px;
 }
 
 .comment-preview-icon {
diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index 6fd666845..097027179 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -1,4 +1,9 @@
 
+.search-input {
+	padding: 4px 12px;
+	margin: 3px;
+}
+
 .field_abook_help {
 	color: #000;
 }
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 5b0105204..651167b47 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -1,3 +1,13 @@
+
+ul#settings-privacy-macros {
+	list-style-type: none;
+	margin: 0 0 10px 0;
+	padding: 0;
+}
+#settings-privacy-macros li {
+	margin-top: 5px;
+}
+
 #settings-permissions-wrapper {
 	margin-top: 15px;
 }
@@ -29,6 +39,7 @@
 
 #settings-notifications label {
 	margin-left: 20px;
+	width: 330px;
 }
 #settings-notify-desc, #settings-activity-desc {
 	font-weight: bold;
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 7c2a03c3b..0b9a1cd13 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -1,6 +1,13 @@
+
+/* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */
+
 .widget {
-	padding: 8px;
-	margin-top: 5px;
+	margin-left: 10px;
+	padding: 0 8px 8px 8px;
+}
+
+.widget h3 {
+	margin-left: -10px;
 }
 
 /* suggest */
@@ -33,6 +40,15 @@
 
 /* saved searches */
 
+
+#netsearch-box #search-submit {
+	margin: 10px 0 7px 0;
+}
+
+#search-save {
+	margin: 10px 0 7px 5px;
+}
+
 .saved-search-li {
 	margin-top: 3px;
 }
@@ -45,24 +61,34 @@
 	opacity: 1;
 }
 
+.saved-search-icon {
+	float: right;
+}
+
 .savedsearchterm {
-	margin-left: 10px;
+	display: block;
+	width: 150px;
+	overflow: hidden;
 }
 
-/* fileas */
+/* peoplefind */
 
-.fileas-ul li {
-	margin-top: 10px;
+#peoplefind-sidebar .btn {
+	margin: 10px 0 10px 0;
 }
 
-.fileas-link {
-	margin-left: 24px;
+#side-peoplefind-url {
+	margin-top: 5px;
 }
 
-.fileas-all {
-	margin-left: 0px;
+#side-peoplefind-url {
+	font-size: 1em;
 }
 
+
+/* fileas */
+
+
 /* posted date */
 
 #datebrowse-sidebar select {
@@ -73,17 +99,6 @@
 
 /* categories */
 
-.categories-ul li {
-	margin-top: 10px;
-}
-
-.categories-link {
-	margin-left: 24px;
-}
-
-.categories-all {
-	margin-left: 0px;
-}
 
 /* group */
 
@@ -91,18 +106,36 @@
 	margin-bottom: 10px;
 }
 
+#sidebar-new-group {
+	margin-bottom: 10px;
+}
+
 #sidebar-group-list .icon, #sidebar-group-list .iconspacer {
 	display: inline-block;
 	height: 12px;
 	width: 12px;
 }
 
+.sidebar-group-name {
+	display: block;
+	width: 170px;
+	overflow: hidden;
+}
+
+#sidebar-group-ul {
+	margin-bottom: 10px;
+}
+
 #sidebar-group-list li {
 	margin-top: 3px;
 }
 
+.sidebar-group-li input {
+	float: right;
+}
+
 .groupsideedit {
-	margin-right: 10px;
+	float: right;
 }
 
 .group-edit-icon {
@@ -124,3 +157,9 @@ li:hover .group-edit-icon {
 	margin-top: 10px;
 	margin-bottom: 45px;
 }
+
+/* photo albums */
+
+#photo-albums-upload-link {
+	margin-top: 10px;
+}
\ No newline at end of file