Merge branch 'master' into touchdown
Conflicts: static/js/app.js static/partials/organizations.html test/data/test.db
This commit is contained in:
commit
c630d7e948
65 changed files with 1843 additions and 273 deletions
|
@ -500,6 +500,18 @@ i.toggle-icon:hover {
|
|||
color: black;
|
||||
}
|
||||
|
||||
.billing-options-element .current-card .expires:before {
|
||||
content: "Expires:";
|
||||
color: #aaa;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
|
||||
.billing-options-element .current-card .expires {
|
||||
margin-left: 20px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.billing-options-element .current-card img {
|
||||
margin-right: 10px;
|
||||
vertical-align: middle;
|
||||
|
|
Reference in a new issue