merged vue-share-addressbook branch

5 files changed, 83 insertions, 45 deletions

diff --git a/css/contacts.scss b/css/contacts.scss
index 9680e3dc..26f348dc 100644
--- a/css/contacts.scss
+++ b/css/contacts.scss
@@ -15,7 +15,9 @@ $grid-input-height-with-margin: #{$grid-height-unit - $grid-input-margin * 2};
 }
 
 @import 'settings-section';
-@import 'settings';
+@import 'settings/settings-addressbook';
+@import 'settings/settings-addressbook-shares';
+@import 'settings/settings-addressbook-sharee';
 @import 'details';
 @import './Properties/Properties';
 @import './Properties/PropertyTitle';
\ No newline at end of file
diff --git a/css/settings-section.scss b/css/settings-section.scss
index a2696d3a..c0786008 100644
--- a/css/settings-section.scss
+++ b/css/settings-section.scss
@@ -21,11 +21,6 @@
  *
  */
 
-
-@import 'settings/settings-addressbook';
-@import 'settings/settings-addressbook-shares';
-@import 'settings/settings-addressbook-sharee';
-
 // contacts settings section
 #app-settings-content {
 	.settings-section {
diff --git a/css/settings/settings-addressbook-sharee.scss b/css/settings/settings-addressbook-sharee.scss
index 9ea3bd0b..d11a5b6a 100644
--- a/css/settings/settings-addressbook-sharee.scss
+++ b/css/settings/settings-addressbook-sharee.scss
@@ -1,3 +1,26 @@
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * author Team Popcorn <teampopcornberlin@gmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 .addressbook__sharee {
 	padding: 0 5px;
 	display: inline-flex;
diff --git a/css/settings/settings-addressbook-shares.scss b/css/settings/settings-addressbook-shares.scss
index c8ea519e..917a87a4 100644
--- a/css/settings/settings-addressbook-shares.scss
+++ b/css/settings/settings-addressbook-shares.scss
@@ -1,42 +1,38 @@
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * author Team Popcorn <teampopcornberlin@gmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 .addressbook-shares {
 	width: 100%;
-	.dropdown-menu {
-		border: 1px solid #d1d1d1;
-		border-radius: 0 0 3px 3px;
-		max-height: 200px;
-		margin-top: -2px;
-		overflow-y: auto;
-		display: flex;
-		flex-wrap: wrap;
-		background-color: #fff;
-		position: relative;
-		width: 100%;
-		z-index: 500;
-		top: -2px;
-		left: 0px;
-		li {
-			width: 100%;
-			padding: 8px 9px 9px;
-			cursor: pointer;
-		}
-		li.active {
-			background: #f0f0f0;
-		}
-	}
-	&__input {
-		width: 100% !important;
-		margin-right: 0;
-		padding-right: 30px;
-		text-overflow: ellipsis;
-	}
 	&__list {
 		margin-top: 8px;
 		margin-bottom: 12px;
 		display: flex;
 		flex-direction: column;
 	}
-
-	.multiselect-vue {
+	&__shareematch--bold {
+		font-weight: bold;
+	}
+	.multiselect.multiselect-vue {
 		width: inherit;
 
 		.multiselect__tags:focus-within, 
@@ -45,12 +41,14 @@
 		}
 
 		.multiselect__content-wrapper {
+			display: none;
+		}
+	}
+	.multiselect.showContent {
+		.multiselect__content-wrapper {
+			display: inherit;
 			background: #f0f0f0;
 			width: inherit;
 		}
-
-		&__shareematch--bold {
-			font-weight: bold;
-		}
 	}
 }
\ No newline at end of file
diff --git a/css/settings/settings-addressbook.scss b/css/settings/settings-addressbook.scss
index bda520fa..6a72f935 100644
--- a/css/settings/settings-addressbook.scss
+++ b/css/settings/settings-addressbook.scss
@@ -1,4 +1,26 @@
-// BLOCK
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * author Team Popcorn <teampopcornberlin@gmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 .addressbook {
 	display: flex;
 	align-items: center;
@@ -26,6 +48,4 @@
 	&__share {
 		margin-left: auto;
 	}
-}
-
-// MODIFIER
\ No newline at end of file
+}
\ No newline at end of file