Merge pull request #1017 from nextcloud/enhancement/qrcode

Enhancement/qrcode
nextcloud · Mar 27, 2019 · ae80cf1 · ae80cf1
2 parents 2239568 + 28da4d7
commit ae80cf1
Show file tree

Hide file tree

Showing 6 changed files with 11,373 additions and 11,315 deletions.
diff --git a/css/ContactDetails.scss b/css/ContactDetails.scss
@@ -130,4 +130,15 @@
 	line-height: 44px;
 	color: var(--color-text-lighter);
 	opacity: .5;
+}
+
+#qrcode-modal {
+	.modal-container {
+		display: flex;
+		padding: 10px;
+		background-color: #fff;
+		.qrcode {
+			width: 100%;
+		}
+	}
 }
diff --git a/css/icons.scss b/css/icons.scss
@@ -24,6 +24,10 @@
 	@include icon-color('social', 'contacts', $color-black, 1);
 }
 
+.icon-qrcode {
+	@include icon-color('qrcode', 'contacts', $color-black, 2);
+}
+
 .icon-address-book {
 	@include icon-color('address-book', 'contacts', $color-black, 1);
 }

diff --git a/img/qrcode.svg b/img/qrcode.svg