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

Proposed by Matthew Allen on 2016-01-27
Status: Merged
Merged at revision: 424
Proposed branch: lp:~whosdaz/ubuntu-qa-website/dev
Merge into: lp:ubuntu-qa-website
Diff against target: 44 lines (+1/-18)
3 files modified
modules/qatracker/user/qatracker.user.subscriptions.php (+1/-0)
modules/qawebsite/misc/qawebsite_fix1533472.css (+0/-3)
modules/qawebsite/qawebsite.module (+0/-15)
To merge this branch: bzr merge lp:~whosdaz/ubuntu-qa-website/dev
Reviewer Review Type Date Requested Status
Nicholas Skaggs 2016-01-27 Approve on 2016-02-03
Review via email: mp+284115@code.launchpad.net

Description of the Change

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

To post a comment you must log in.
Nicholas Skaggs (nskaggs) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/qatracker/user/qatracker.user.subscriptions.php'
2--- modules/qatracker/user/qatracker.user.subscriptions.php 2012-11-19 20:35:32 +0000
3+++ modules/qatracker/user/qatracker.user.subscriptions.php 2016-01-27 13:23:20 +0000
4@@ -71,6 +71,7 @@
5 );
6
7 return $items;
8+
9 }
10
11
12
13=== removed file 'modules/qawebsite/misc/qawebsite_fix1533472.css'
14--- modules/qawebsite/misc/qawebsite_fix1533472.css 2016-01-14 17:51:38 +0000
15+++ modules/qawebsite/misc/qawebsite_fix1533472.css 1970-01-01 00:00:00 +0000
16@@ -1,3 +0,0 @@
17-tbody {
18- color: #000;
19-}
20\ No newline at end of file
21
22=== modified file 'modules/qawebsite/qawebsite.module'
23--- modules/qawebsite/qawebsite.module 2016-01-20 21:13:07 +0000
24+++ modules/qawebsite/qawebsite.module 2016-01-27 13:23:20 +0000
25@@ -39,19 +39,4 @@
26 drupal_add_html_head($redirect, 'redirect');
27 }
28
29-
30-// Add custom css to ovveride coloring of tables - this is a workaround and shouldn't be a long term fix
31-// Fixes https://bugs.launchpad.net/ubuntu-qa-website/+bug/1533472
32-
33-$cssoverride = array(
34- '#tag' => 'link', // The #tag is the html tag - <link />
35- '#attributes' => array( // Set up an array of attributes inside the tag
36- 'rel' => 'stylesheet',
37- 'type' => 'text/css',
38- 'href' => '/modules/qawebsite/misc/qawebsite_fix1533472.css',
39- ),
40-);
41-
42-drupal_add_html_head($cssoverride, 'cssoverride');
43-
44 ?>

Subscribers

People subscribed via source and target branches