Merge branch 'master' of git://github.com/friendika/friendika

2 files changed, 25 insertions, 9 deletions

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 4f6d6c196..7ab85344d 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -16,7 +16,7 @@ body {
 }
 
 
-a, a:visited { color: #3465a4; text-decoration: none; }
+a, a:visited, a:link { color: #3465a4; text-decoration: none; }
 a:hover {text-decoration: underline; }
 
 input {
@@ -218,7 +218,7 @@ div.wall-item-content-wrapper.shiny {
 	cursor: pointer;
 }
 
-.fakelink, .fakelink:visited {
+.fakelink, .fakelink:visited, .fakelink:link {
 	color: #3465a4;
 	text-decoration: none;
 	cursor: pointer;
@@ -372,6 +372,7 @@ input#dfrn-url {
 }
 
 #settings-nick-wrapper {
+	margin-top: 20px;
 	margin-bottom: 30px;
 }
 
@@ -1843,7 +1844,7 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }
 
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
+#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
 	color: #8888FF;
 	text-decoration: none;
 	cursor: pointer;
@@ -2044,8 +2045,8 @@ a.mail-list-link {
 }
 
 
-#plugin-settings-link, #account-settings-link {
-	margin-bottom: 25px;
+#plugin-settings-link, #account-settings-link, #uexport-link {
+	margin-bottom: 10px;
 }
 
 /* end from defautlt */
@@ -2162,6 +2163,13 @@ a.mail-list-link {
 	clear: both;
 }
 
+.profile-match-wrapper {
+	float: left;
+	padding: 10px;
+}
+#profile-match-wrapper-end {
+	clear: both;
+}
 .side-link {
 	margin-bottom: 15px;
 }
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 49c83c83c..4d2ca6d63 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -505,7 +505,7 @@ input#dfrn-url {
 }
 
 #settings-nick-wrapper {
-	margin-bottom: 30px;
+	margin-bottom: 15px;
 }
 
 #settings-expire-end {
@@ -608,7 +608,7 @@ input#dfrn-url {
 }
 
 #settings-nick {
-	margin-bottom: 50px;
+	margin-bottom: 30px;
 }
 
 #cropimage-wrapper, #cropimage-preview-wrapper {
@@ -2079,8 +2079,8 @@ a.mail-list-link {
 }
 
 
-#plugin-settings-link, #account-settings-link {
-	margin-bottom: 25px;
+#plugin-settings-link, #account-settings-link, #uexport-link {
+	margin-bottom: 10px;
 }
 
 
@@ -2188,6 +2188,14 @@ a.mail-list-link {
 	clear: both;
 }
 
+.profile-match-wrapper {
+	float: left;
+	padding: 10px;
+}
+#profile-match-wrapper-end {
+	clear: both;
+}
+
 .side-link {
 	margin-bottom: 15px;
 }