Sharing design and cdav request

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

3 files changed, 37 insertions, 28 deletions

diff --git a/css/Settings/SettingsAddressbook.scss b/css/Settings/SettingsAddressbook.scss
index 680a7c7d..34d27e9e 100644
--- a/css/Settings/SettingsAddressbook.scss
+++ b/css/Settings/SettingsAddressbook.scss
@@ -28,6 +28,11 @@
 	white-space: nowrap;
 	text-overflow: ellipsis;
 
+	> a:first-of-type {
+		// put actions at the end
+		margin-left: auto;
+	}
+
 	&__name {
 		display: block;
 		flex: 0 1 auto;
@@ -47,7 +52,9 @@
 		}
 	}
 	&__share {
-		margin-left: auto;
+		&--shared {
+			opacity: .7;
+		}
 	}
 	&--disabled &__name {
 		opacity: .5;
diff --git a/css/Settings/SettingsAddressbookSharee.scss b/css/Settings/SettingsAddressbookSharee.scss
index 82fafebb..4abecd92 100644
--- a/css/Settings/SettingsAddressbookSharee.scss
+++ b/css/Settings/SettingsAddressbookSharee.scss
@@ -26,6 +26,19 @@
 	display: inline-flex;
 	align-items: center;
 	width: 100%;
+	
+	.icon {
+		margin-right: 5px;
+		opacity: 0.2;
+		width: 16px;
+		height: 16px;
+		display: inline-block;
+		margin-bottom: 2px;
+		&.icon-loading-small {
+			opacity: 1;
+		}
+	}
+
 	&__identifier {
 		width: 100%;
 		overflow: hidden;
@@ -35,6 +48,7 @@
 		vertical-align: top;
 		opacity: 0.7;
 	}
+
 	&__utils {
 		padding: 0 !important;
 		float: right;
@@ -43,6 +57,20 @@
 		align-items: center;
 		flex-shrink: 0;
 		height: 20px;
+		
+		.icon-delete {
+			display: inline-block;
+			width: 20px;
+			height: 20px;
+			opacity: 0.4;
+			margin-bottom: 2px;
+			margin-left: 4px;
+		}
+		
+		// loading state
+		&--disabled {
+			opacity: .2 !important;
+		}
 		.checkbox + label {
 			padding: 0 !important;
 		}
@@ -50,22 +78,4 @@
 			opacity: 0.7;
 		}
 	}
-	
-	.icon {
-		margin-right: 5px;
-		opacity: 0.2;
-		width: 16px;
-		height: 16px;
-		display: inline-block;
-		margin-bottom: 2px;
-	}
-	
-	.icon-delete {
-		display: inline-block;
-		width: 20px;
-		height: 20px;
-		opacity: 0.4;
-		margin-bottom: 2px;
-		margin-left: 4px;
-	}
 }
\ No newline at end of file
diff --git a/css/Settings/SettingsAddressbookShares.scss b/css/Settings/SettingsAddressbookShares.scss
index 87cf2f9c..f0bd169c 100644
--- a/css/Settings/SettingsAddressbookShares.scss
+++ b/css/Settings/SettingsAddressbookShares.scss
@@ -49,16 +49,8 @@
 			border-color: var(--color-primary-element);
 		}
 
-		.multiselect__content-wrapper {
+		&:not(.showContent) .multiselect__content-wrapper {
 			display: none;
 		}
 	}
-
-	.multiselect.showContent {
-		.multiselect__content-wrapper {
-			display: inherit;
-			background: #f0f0f0;
-			width: inherit;
-		}
-	}
 }
\ No newline at end of file