diff options
| author | PayBas <contact@paybas.com> | 2014-06-22 22:40:07 +0200 |
|---|---|---|
| committer | PayBas <contact@paybas.com> | 2014-06-22 22:41:56 +0200 |
| commit | 1a3c1d5b9ad6def9da4186d79a32f583b892a7cd (patch) | |
| tree | 54416c350995f1f2326a026e2e1e74a3faf007ea /phpBB | |
| parent | c805e53da3fd7578205133b0749e5fd989ad7095 (diff) | |
| download | forums-1a3c1d5b9ad6def9da4186d79a32f583b892a7cd.tar forums-1a3c1d5b9ad6def9da4186d79a32f583b892a7cd.tar.gz forums-1a3c1d5b9ad6def9da4186d79a32f583b892a7cd.tar.bz2 forums-1a3c1d5b9ad6def9da4186d79a32f583b892a7cd.tar.xz forums-1a3c1d5b9ad6def9da4186d79a32f583b892a7cd.zip | |
[ticket/12608] Change CSS classes to prevent styling conflicts
PHPBB3-12608
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/notification/type/disapprove_post.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/disapprove_topic.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/report_pm.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/report_post.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 19 |
5 files changed, 15 insertions, 12 deletions
diff --git a/phpBB/phpbb/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php index 044658c016..7b18ed70ea 100644 --- a/phpBB/phpbb/notification/type/disapprove_post.php +++ b/phpBB/phpbb/notification/type/disapprove_post.php @@ -37,7 +37,7 @@ class disapprove_post extends \phpbb\notification\type\approve_post */ public function get_style_class() { - return 'reported'; + return 'notification-disapproved'; } /** diff --git a/phpBB/phpbb/notification/type/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php index 812045b352..3f87741807 100644 --- a/phpBB/phpbb/notification/type/disapprove_topic.php +++ b/phpBB/phpbb/notification/type/disapprove_topic.php @@ -37,7 +37,7 @@ class disapprove_topic extends \phpbb\notification\type\approve_topic */ public function get_style_class() { - return 'reported'; + return 'notification-disapproved'; } /** diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php index d3d91dcd54..2eb802eb4b 100644 --- a/phpBB/phpbb/notification/type/report_pm.php +++ b/phpBB/phpbb/notification/type/report_pm.php @@ -37,7 +37,7 @@ class report_pm extends \phpbb\notification\type\pm */ public function get_style_class() { - return 'reported'; + return 'notification-reported'; } /** diff --git a/phpBB/phpbb/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php index 5a8febe927..024c8d9d42 100644 --- a/phpBB/phpbb/notification/type/report_post.php +++ b/phpBB/phpbb/notification/type/report_post.php @@ -36,7 +36,7 @@ class report_post extends \phpbb\notification\type\post_in_queue */ public function get_style_class() { - return 'reported'; + return 'notification-reported'; } /** diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index dc22b54914..9565eb9967 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -235,14 +235,6 @@ p.post-notice.reported:before, p.post-notice.error:before { background-image: url("./images/icon_topic_reported.gif"); } -.notification_list p.notification-time { - color: #4C5D77; -} - -.notification_list .reported strong { - color: #D31141; -} - /* -------------------------------------------------------------- Colours and backgrounds for links.css @@ -1181,3 +1173,14 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist #minitabs .dropdown-contents { background-color: #F1F8FF; } + +/* Notifications +---------------------------------------- */ + +.notification_list p.notification-time { + color: #4C5D77; +} + +li.notification-reported strong, li.notification-disapproved strong { + color: #D31141; +} |