Merge branch 'master' of https://github.com/dario-chiappetta/password-manager

Conflicts:
	frontend/delta/css/clipperz.css.map

frontend/delta/scss/core/layout.scss

@@ -483,7 +483,7 @@ div.attachmentQueueStatus {
 				text-align: right;
 
 				.statusString {
-					font-size: .8em;
+					font-size: 14px;
 				}
 
 				.processIcon {
@@ -666,6 +666,8 @@ div.cardContent {
 			@include flex(auto);
 			@include mask();
 
+			width:100%;
+
 			@include flexbox();
 			& > div.edit {
 				@include flex(auto);

frontend/delta/scss/style/card.scss

@@ -536,6 +536,8 @@ $cardViewBasePadding: 10px;
 }
 
 .edit {
+	width:100%;
+	
 	.cardDetailToolbar {
 		&.commands {
 			div, ul {