1
0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-12-19 21:07:03 +01:00

Merge branch 'master' of github.com:clipperz/password-manager

Conflicts:
	frontend/delta/scss/style/selectionPanel.scss

Reverted some settings to fix issues in the narrow view
This commit is contained in:
Giulio Cesare Solaroli
2015-02-08 11:11:06 +01:00
6 changed files with 126 additions and 136 deletions

View File

@@ -31,7 +31,8 @@ div.cardList {
border-bottom: 1px solid #eee;
background-color: white;
transition: margin-left 0.3s ease-in-out;
transition: margin-left 0.1s ease-in-out, padding-right 0.1s ease-in-out;
// padding-right:40px; // prevent new lines on selection
white-space: pre-wrap;
word-wrap: break-word;
@@ -44,8 +45,9 @@ div.cardList {
// background-color: brown;
// background-color: $clipperz-blue;
// color: white;
margin-left: 50px;
box-shadow: -3px 1px 3px 0 rgba(0, 0, 0, 0.2);
margin-left: 40px;
padding-right: 0px; // prevent new lines on selection
box-shadow: -4px 0px 3px -1px rgba(0, 0, 0, 0.2);
}
&.archived {
@@ -225,8 +227,8 @@ $cardViewBasePadding: 10px;
.cardField {
&:hover {
background-color: #eee;
}
}
}
}
}
}