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

Merge branch 'import'

Conflicts:
	frontend/delta/css/clipperz.css
	frontend/delta/css/clipperz.css.map
	frontend/delta/scss/core/layout.scss
	frontend/delta/scss/core/mixin.scss
This commit is contained in:
Giulio Cesare Solaroli
2015-06-27 18:38:06 +02:00
37 changed files with 6058 additions and 162 deletions

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);
}
}
}
//========================================================