anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
Marty Alcala 2016-10-11 19:14:13 -04:00
commit 6bfdec29b3
44 changed files with 28907 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/sass/views/includes/modals/backup-confirm-modal.scss
View file

@ -1,3 +0,0 @@
#backup-confirm-modal{
}

12
src/sass/views/includes/modals/backup-needed-modal.scss Normal file
View file

@ -0,0 +1,12 @@
#backup-needed-modal{
.button.button-secondary {
font-size: 14px;
margin-top: 0;
}
.button {
display: block;
margin-right: auto;
margin-left: auto;
margin-top: 1rem;
}
}

2
src/sass/views/includes/modals/modals.scss
View file

@ -73,5 +73,5 @@
background: rgba(0, 0, 0, .8);
}
@import "backup-confirm-modal";
@import "backup-needed-modal";
@import "screenshot-warning-model";