Fix merge conflict

6 files changed, 30 insertions, 106 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 6c9d757b1..1e9930443 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -128,7 +128,7 @@ a.wall-item-name-link {
 }
 
 .wall-item-content img {
-    max-width: 95%;
+	max-width: 100%;
 }
 
 .wall-item-title h3 {
@@ -262,4 +262,4 @@ a.wall-item-name-link {
 .item-forged {
 	color: #FF0000;
 	font-size: 1.5em !important;
-}
\ No newline at end of file
+}
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index 5bf598062..e7b93a088 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -14,7 +14,7 @@
 	margin-bottom: 5px !important;
 }
 
-.abook-pending-contact, .abook-permschange {
+.abook-pending-contact, .abook-permschange, .abook-autotext {
 	background: orange;
 	font-weight: bold;
 	margin: 10px;
diff --git a/view/css/mod_locs.css b/view/css/mod_locs.css
new file mode 100644
index 000000000..95aee6aef
--- /dev/null
+++ b/view/css/mod_locs.css
@@ -0,0 +1,3 @@
+td {
+padding: 10px;
+}
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index c8cdab6c3..34bac51e9 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -3,112 +3,28 @@
 	margin-bottom: 25px;
 }
 
-.photo-item-tools {
+.photo-item-tools-left,
+.photo-item-tools-right {
 	padding: 7px 10px;
 }
 
-#photo-photo {
-    display: table;
-    margin: 0 auto;
-}
-
-#photo-photo-end {
-	clear: both;
-}
-
-#photo-album-end {
-	clear: both;
-	margin-bottom: 25px;
-}
-
-#photos-upload-newalbum-div {
-	float: left;
-	width: 175px;
-}
-
-#photos-upload-noshare {
-	margin-bottom: 10px;
+.photo-like-rotator {
+	margin-top: 23px;
+	margin-right: 5px;
 }
 
-#photos-upload-existing-album-text {
-	float: left;
-	width: 175px;
-}
-#photos-upload-newalbum {
-	float: left;
-}
-#photos-upload-album-select {
-	float: left;
-}
-
-#photos-upload-spacer {
-	margin-top: 25px;
-}
-#photos-upload-new-end, #photos-upload-exist-end {
-	clear: both;
-}
-#photos-upload-exist-end {
-	margin-bottom: 15px;
-}
-#photos-upload-submit {
-	margin-top: 15px;
-}
-
-
-#photos-upload-select-files-text {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label {
-	float: left;
-	width: 150px;
-}
-
-#photo-edit-perms-end {
-	margin-bottom: 15px;
-}
-
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate {
-	float: left;
-	margin-bottom: 25px;
-}
-#photo-edit-link-wrap {
-	margin-bottom: 15px;
-}
-
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
-	clear: both;
-}
-
-#photo-edit-rotate-end {
-	margin-bottom: 15px;
-}
-
-
-#photo-edit-edit {
-	padding: 7px 10px;
-	margin-bottom: 3px;
-}
-
-#photo-edit-end {
-	margin-bottom: 35px;
-}
-#photo-caption {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#photo-album-edit-submit, #photo-album-edit-drop {
-	margin-top: 15px;
-	margin-bottom: 15px;
+#photo-photo {
+	display: table;
+	margin: 0 auto;
 }
 
-#photo-album-edit-drop {
-	margin-left: 200px;
+#photo-edit,
+#photo-album-edit-wrapper,
+#photo-upload-form {
+	display: none;
 }
 
-#photos-usage-message {
-	line-height: 22px;
+#photos-upload-choose {
+	border: unset;
+	padding: unset;
 }
-
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 651167b47..b03023e21 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -12,6 +12,10 @@ ul#settings-privacy-macros {
 	margin-top: 15px;
 }
 
+#settings-default-perms {
+	margin-top: 15px;
+}
+
 #settings-perm-advanced {
 	margin-top: 15px;
 }
@@ -41,7 +45,7 @@ ul#settings-privacy-macros {
 	margin-left: 20px;
 	width: 330px;
 }
-#settings-notify-desc, #settings-activity-desc {
+#settings-notify-desc, #settings-activity-desc, #settings-vnotify-desc {
 	font-weight: bold;
 	margin-bottom: 15px;
 }
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 593e051da..d481a09d1 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -26,9 +26,6 @@
 /* search */
 
 #search-text {
-	border: 1px solid #ccc;
-	padding: 5px;
-	line-height: 1.5;
 	border-top-right-radius: 0px;
 	border-bottom-right-radius: 0px;
 }
@@ -77,6 +74,10 @@
 	margin-top: 2px;
 }
 
+#posted-date-selector-drop li:not(:first-child) {
+	margin-top: 2px;
+}
+
 /* categories */