Merge lp:~whosdaz/ubuntu-qa-website/dev into lp:ubuntu-qa-website

[Matthew Allen]

Commit message:

Removed the CSS Override file, that seems to be unneccesary as when disabled in chrome developer tools the issue it was added to fix is still resolved when the changes are reverted

[Nicholas Skaggs (nskaggs)]

Committing to test this out -- The hack shouldn't stay in prod, but if it fails, we'll rollback.

review: Approve

=== modified file 'modules/qatracker/user/qatracker.user.subscriptions.php'
--- modules/qatracker/user/qatracker.user.subscriptions.php	2012-11-19 20:35:32 +0000
+++ modules/qatracker/user/qatracker.user.subscriptions.php	2016-01-27 13:23:20 +0000
@@ -71,6 +71,7 @@
     );
 
     return $items;
+
 }
 
 
 
=== removed file 'modules/qawebsite/misc/qawebsite_fix1533472.css'
--- modules/qawebsite/misc/qawebsite_fix1533472.css	2016-01-14 17:51:38 +0000
+++ modules/qawebsite/misc/qawebsite_fix1533472.css	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-tbody {
-	color: #000;
-}
 \ No newline at end of file
 
=== modified file 'modules/qawebsite/qawebsite.module'
--- modules/qawebsite/qawebsite.module	2016-01-20 21:13:07 +0000
+++ modules/qawebsite/qawebsite.module	2016-01-27 13:23:20 +0000
@@ -39,19 +39,4 @@
 	drupal_add_html_head($redirect, 'redirect');
 }
 
-
-// Add custom css to ovveride coloring of tables - this is a workaround and shouldn't be a long term fix
-// Fixes https://bugs.launchpad.net/ubuntu-qa-website/+bug/1533472
-
-$cssoverride = array(
-	'#tag' => 'link', // The #tag is the html tag - <link />
-	'#attributes' => array( // Set up an array of attributes inside the tag
-	'rel' => 'stylesheet', 
-	'type' => 'text/css',
-	'href' => '/modules/qawebsite/misc/qawebsite_fix1533472.css',
-	),
-);
-
-drupal_add_html_head($cssoverride, 'cssoverride');
-
 ?>