Merge branch 'master' into ng-accounts-backup

2016-10-26 18:43:05 +02:00
parent e018739ba9 e449477f23
commit 6b2cffd312
76 changed files with 824 additions and 599 deletions
--- a/js/src/ui/Container/container.css
+++ b/js/src/ui/Container/container.css
@@ -15,15 +15,17 @@
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
 .container {
+  flex: 1;
  padding: 0em;
+  background: rgba(0, 0, 0, 0.8) !important;
 }

 .compact,
 .padded {
-  background: rgba(0, 0, 0, 0.8) !important;
  border-radius: 0 !important;
  position: relative;
  overflow: auto;
+  background-color: transparent !important;
 }

 .compact {