clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-29 10:27:35 +01:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
parent 4535b8b129 7e53a85082
commit 2d4bb33be4
6 changed files with 126 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/delta/scss/style/card.scss
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;
}
}
}
}
}
}

8
frontend/delta/scss/style/dialogBox.scss
View File

@@ -14,16 +14,14 @@ div.dialog {
div.answers {
div.button {
@include border-radius(4);
// border: 1px solid black;
border: 1px solid black;
margin-left: 10px;
padding: 5px 15px;
background-color: #ddd;
padding: 5px 10px;
&.isDefault {
font-weight: bold;
color: white;
background-color: #666;
background-color: blue;
}
}
}

35
frontend/delta/scss/style/selectionPanel.scss
View File

@@ -2,7 +2,7 @@
background-color: $main-alternate-color;
color: $main-alternate-text-color;
font-size: 18pt;
// @include overflow-scroll;
@include overflow-scroll;
// height: 100%;
$iconColumnWidth: 40px;
@@ -43,15 +43,19 @@
.search {
form {
padding:2px;
position:relative;
box-sizing:border-box;
width:95%;
input {
font-family: "clipperz-font";
color: #999;
font-size: 18pt;
padding: 0px 30px;
margin: 0px 5px;
// width: $selectionPanelWidth - $iconColumnWidth - 10px;
width: $selectionPanelWidth - ($spacing * 2);
vertical-align: middle;
width: 100%;
box-sizing:border-box;
}
label {
@@ -59,17 +63,20 @@
font-size: 18pt;
padding-left: $spacing;
// padding-right:5px;
margin-left: -$selectionPanelWidth + $spacing;
position:absolute;
top:9px;
left:9px;
color: #666;
vertical-align: sub;
}
.searchClear {
@include icon-font();
@include border-radius(4px);
@include border-radius(50%);
background-color: #aaa;
color: white;
margin-left: $selectionPanelWidth - $iconColumnWidth - 30px;
position:absolute;
right:9px;
top:9px;
cursor: pointer;
padding: 5px;
font-size: 10pt;
@@ -138,7 +145,7 @@
padding: 10px;
font-size: 12pt;
input {
@include flex(none);
}
@@ -156,17 +163,17 @@
}
}
span.count {
background-color: gray;
font-size: 10pt;
span.count {
background-color: gray;
font-size: 10pt;
margin-right: 12px;
padding: 3px 5px;
@include border-radius(4px);
@include border-radius(4px);
color: white;
font-weight: 300;
vertical-align: middle;
}
}
//$selectionColor: yellow;