1
0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-29 10:27:35 +01:00

Merged Import and Export branches, implemented Giulio's remarks on Import feature

This commit is contained in:
Dario Chiappetta
2015-05-21 14:32:51 +02:00
parent d1d5fae5de
commit 0126873868
43 changed files with 4494 additions and 1008 deletions

View File

@@ -209,9 +209,8 @@ html {
& > div {
@include flex(auto);
overflow: auto;
// overflow: auto;
@include overflow-scroll();
}
footer {
@@ -226,6 +225,20 @@ html {
height: 100%;
// background-color: rgba( 0, 0, 0, 0.95);
background-color: black;
.extraFeature {
// @include flexbox();
height: 100%;
h1 {
// @include flex(none);
}
.content {
// @include flex(auto);
height: 100%;
@include overflow-scroll();
}
}
}
}
@@ -529,7 +542,7 @@ div.dialogBox {
height: 100%;
.mask {
z-index: 12;
z-index: 25;
}
div.dialog {
@include flex(none);

View File

@@ -178,7 +178,7 @@ refer to http://www.clipperz.com.
}
@mixin overflow-scroll () {
overflow: scroll;
overflow: auto;
-webkit-overflow-scrolling: touch;
}

View File

@@ -126,6 +126,23 @@ div.overlay {
div.bar11 {@include transform(300deg, 0, -142%); @include animation-delay(-0.16670s);}
div.bar12 {@include transform(330deg, 0, -142%); @include animation-delay(-0.08330s);}
}
.progressBar {
// display: block;
width: 100%;
background-color: #222;
height: 4px;
margin-top: 86px;
@include border-radius(2px);
.progress {
background-color: #999;
// width: 70%;
height: 4px;
display: block;
@include border-radius(2px);
}
}
}
//========================================================