Merge conflick

2013-02-08 00:52:57 +01:00 · 2013-02-08 00:52:57 +01:00 · 914a5ec991
parent 069314313f
commit 914a5ec991
1 changed files with 2 additions and 1 deletions
--- a/css/questionset.css
+++ b/css/questionset.css
@ -102,7 +102,8 @@
 }

 .questionset-results {
-  background: transparent url(img/Paper-clean.png);
+  background-image: url(img/Paper-clean.png);
+  background-color: rgba(255, 255, 255, 0.75);

  padding: 10px;
  height: 480px;