Merge remote-tracking branch 'bitpay-wallet/ref/design' into feature/settings-polish

This commit is contained in:
Jason Dreyzehner 2016-10-12 22:04:02 -04:00
commit ff45e1dbc8
9 changed files with 62 additions and 51 deletions

View file

@ -35,7 +35,8 @@ $button-secondary-active-border: transparent;
@include button-outline($button-primary-bg);
}
&.button-primary,
&.button-secondary {
&.button-secondary,
&.button-assertive {
&.button-standard {
@extend %button-standard;
& + .button-standard {

View file

@ -1,7 +1,13 @@
.copayers-secret {
overflow-wrap: break-word;
word-wrap: break-word;
text-align: center;
font-size: 14px;
font-size: 12px;
margin: 10px;
white-space: -moz-pre-wrap !important;
white-space: -pre-wrap;
white-space: -o-pre-wrap;
white-space: pre-wrap;
word-wrap: break-word;
white-space: -webkit-pre-wrap;
word-break: break-all;
white-space: normal;
}