Merge branch '2.6RC'2.6

7 files changed, 139 insertions, 61 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 1bb82f11c..a3a8ce0be 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -11,6 +11,7 @@ nav .badge {
 	nav .badge {
 		top: 0px;
 		left: 0px;
+		line-height: 0.75;
 	}
 }
 
@@ -38,7 +39,7 @@ nav .badge {
 }
 
 #navbar-collapse-1 i {
-	font-size: 1rem;
+	font-size: 1.0rem;
 }
 
 nav .dropdown-menu {
@@ -61,15 +62,11 @@ nav .dropdown-menu {
 	padding: 0.5rem 0.1rem;
 }
 
-.navbar-inverse .navbar-toggler {
+.navbar-dark .navbar-toggler {
 	color: rgba(255,255,255,1);
 }
 /* nav overrides end */
 
-.btn-outline-secondary {
-	color: #aaa;
-}
-
 .wall-item-tools .dropdown-menu {
 	min-width: auto;
 }
diff --git a/view/css/cdav_addressbook.css b/view/css/cdav_addressbook.css
new file mode 100644
index 000000000..038358e43
--- /dev/null
+++ b/view/css/cdav_addressbook.css
@@ -0,0 +1,103 @@
+.vcard-header {
+	cursor: pointer;
+	padding: 7px 10px;
+	margin-bottom: 3px;
+}
+
+.vcard-header:hover,
+.vcard-header.active {
+	background-color: rgb(238,238,238);
+	cursor: pointer;
+}
+
+.vcard-header.active:hover {
+	cursor: initial;
+}
+
+.vcard-add-field {
+	margin-top: 8px;
+	display: none;
+}
+
+.vcard-cancel {
+	margin: 6px 10px;
+	height: 32px;
+	line-height: 32px;
+	color: #777;
+	font-size: 16px;
+
+	cursor: pointer;
+	display: none;
+	float: right;
+}
+
+.vcard-info {
+	display: none;
+}
+
+.vcard-nophoto {
+	display: inline-block;
+	width: 32px;
+	height: 32px;
+	border-radius: 4px;
+	border: 1px solid #ccc;
+	text-align: center;
+	font-size: 20px;
+	color: #fff;
+	background-color: #ddd;
+}
+
+.vcard-photo {
+	width: 32px;
+	height: 32px;
+	border-radius: 4px;
+	border: 1px solid #ccc;
+	text-align: center;
+}
+
+.vcard-fn-preview,
+input.vcard-fn {
+	font-size: 16px !important;
+	margin-left: 5px;
+}
+
+.vcard-email-preview,
+.vcard-tel-preview {
+	color: #999;
+}
+
+
+.vcard-fn,
+#create_form,
+#more_block {
+	display: none;
+}
+
+input.vcard-fn,
+.vcard-fn-create input,
+.vcard-org input,
+.vcard-title input,
+.vcard-tel input,
+.vcard-email input,
+.vcard-impp input,
+.vcard-url input,
+.vcard-adr input,
+.vcard-note input {
+	padding: 0px;
+	margin-left: 5px;
+	border-width: 0px 0px 1px 0px;
+	border-radius: 0px;
+	background-color: transparent;
+	min-width: 160px;
+}
+
+#template-form-vcard-org,
+#template-form-vcard-title,
+#template-form-vcard-tel,
+#template-form-vcard-email,
+#template-form-vcard-impp,
+#template-form-vcard-url,
+#template-form-vcard-adr,
+#template-form-vcard-note {
+	display: none;
+}
diff --git a/view/css/cdav_calendar.css b/view/css/cdav_calendar.css
new file mode 100644
index 000000000..d68278a63
--- /dev/null
+++ b/view/css/cdav_calendar.css
@@ -0,0 +1,22 @@
+/* fix borders */
+
+.fc th:first-child,
+.fc td:first-child {
+    border-left-width: 0px;
+}
+
+.fc th:last-child,
+.fc td:last-child {
+    border-right-width: 0px;
+    border-bottom-width: 0px;
+}
+
+.fc-unthemed th,
+.fc-unthemed td,
+.fc-unthemed thead,
+.fc-unthemed tbody,
+.fc-unthemed .fc-divider,
+.fc-unthemed .fc-row,
+.fc-unthemed .fc-popover {
+	border-color: #ccc !important;
+}
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 08f23c4d0..d10e1e14e 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -77,7 +77,7 @@
 /* conv_item */
 
 .wall-item-head-new {
-	border-top: 0.2rem solid #0275d8;
+	border-top: 0.2rem solid #007bff;
 }
 
 .wall-item-info {
@@ -168,11 +168,11 @@ a.wall-item-name-link {
 }
 
 .ivoted {
-	color: #0275d8;
+	color: #007bff;
 }
 
 .item-highlight {
-	border-left: 0.2rem solid #0275d8;
+	border-left: 0.2rem solid #007bff;
 }
 
 .item-highlight .wall-item-head,
diff --git a/view/css/mod_help.css b/view/css/mod_help.css
index c0b0bafa3..643885c99 100644
--- a/view/css/mod_help.css
+++ b/view/css/mod_help.css
@@ -19,3 +19,11 @@
 	#doco-top-toc li {
 	padding: 3px 0px;
 }
+
+#doco-side-toc li {
+	padding-left: 10px;
+}
+
+#doco-side-toc {
+	padding-top: 10px;
+}
\ No newline at end of file
diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css
index 077b6b838..b08c90b62 100644
--- a/view/css/mod_manage.css
+++ b/view/css/mod_manage.css
@@ -4,10 +4,6 @@
 	text-decoration: none;
 }
 
-.new-notification {
-	color: #c60032;
-}
-
 .channel-photo-wrapper {
 	display: table-cell;
 	table-layout: fixed;
@@ -24,11 +20,3 @@
 	vertical-align: top;
 	padding-left: 10px;
 }
-
-.selected-channel {
-	color: green;
-}
-
-#all-channels-end {
-	margin-bottom: 20px;
-}
diff --git a/view/css/mod_setup.css b/view/css/mod_setup.css
deleted file mode 100644
index f0d91a0ae..000000000
--- a/view/css/mod_setup.css
+++ /dev/null
@@ -1,40 +0,0 @@
-#install-dbhost-label,
-#install-dbuser-label,
-#install-dbpass-label,
-#install-dbdata-label,
-#install-tz-desc {
-       float: left;
-       width: 250px;
-       margin-top: 10px;
-       margin-bottom: 10px;
-
-}
-
-#install-dbhost,
-#install-dbuser,
-#install-dbpass,
-#install-dbdata {
-       float: left;
-       width: 200px;
-       margin-left: 20px;
-}
-
-#install-dbhost-end,
-#install-dbuser-end,
-#install-dbpass-end,
-#install-dbdata-end,
-#install-tz-end {
-       clear: both;
-}
-
-#install-form select#timezone_select {
-       float: left;
-       margin-top: 18px;
-       margin-left: 20px;
-}
-
-main {
-	max-width: 790px;
-	margin-left: auto;
-	margin-right: auto;
-}