Merge branch 'master' into feature/05-new-design
Conflicts: js/services/video.js
This commit is contained in:
commit
e24a88dca1
15 changed files with 217 additions and 55 deletions
|
|
@ -261,7 +261,7 @@ hr { margin: 2.25rem 0;}
|
|||
.br100 {border-radius: 100%;}
|
||||
.lh {line-height: 0;}
|
||||
.oh {overflow:hidden;}
|
||||
|
||||
.lh {line-height: 0;}
|
||||
.signin input.ng-dirty.ng-invalid {
|
||||
border: 2px red solid;
|
||||
}
|
||||
|
|
@ -285,6 +285,11 @@ hr { margin: 2.25rem 0;}
|
|||
padding: 0.5rem;
|
||||
}
|
||||
|
||||
.tx-copayers {
|
||||
overflow: hidden;
|
||||
padding: 0.5rem;
|
||||
}
|
||||
|
||||
.box-copayers {
|
||||
padding: 0.5rem 2rem 0.5rem 1rem;
|
||||
float: left;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue