Merge remote-tracking branch 'upstream/pull/4692'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c0f2a85bc5171517aa76e06b5fab9f532f3840c5..67813e1788029c06cf1c9deab81424d1e76717c0 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -802,10 +802,6 @@ tr.turn:hover {
 /* Rules for messages pages */
 
 .messages {
-  .inbox-row {
-    background: $offwhite;
-  }
-
   .inbox-row-unread td {
     background: #CBEEA7;
   }

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index e6c15a92014f8afc10fd25b7e61a2b202ee39dd7..3d66db5fbe65cb013289a6b61d6d60978794386f 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -2,7 +2,6 @@
 $lineheight: 20px;
 $typeheight: 14px;
 
-$offwhite: #f8f8ff;
 $blue: #7092FF;
 $secondary: #888;
 $lightblue: #B8C5F0;