aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-10-18 19:20:54 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-10-18 19:20:54 -0500
commit2c06c2bd3646585a5b02e6269be655287352a667 (patch)
tree4b8930d2ba2ca54ccc8b29fc4549148af20773b1 /phpBB/styles
parentf96dac335287f2fd51ff6628facbc8b6af6a517f (diff)
downloadforums-2c06c2bd3646585a5b02e6269be655287352a667.tar
forums-2c06c2bd3646585a5b02e6269be655287352a667.tar.gz
forums-2c06c2bd3646585a5b02e6269be655287352a667.tar.bz2
forums-2c06c2bd3646585a5b02e6269be655287352a667.tar.xz
forums-2c06c2bd3646585a5b02e6269be655287352a667.zip
[ticket/11103] Declare $ for jQuery, check for instance of, newlines at eof
PHPBB3-11103
Diffstat (limited to 'phpBB/styles')
-rw-r--r--phpBB/styles/prosilver/theme/common.css2
-rw-r--r--phpBB/styles/subsilver2/template/overall_footer.html4
-rw-r--r--phpBB/styles/subsilver2/theme/stylesheet.css2
3 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 863feb576b..bf1f4edeea 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -736,4 +736,4 @@ p.rules a {
.notification_list ul.topiclist dt {
width: 88%;
-} \ No newline at end of file
+}
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 210159732e..11989feca6 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -15,6 +15,8 @@
<script type="text/javascript">
// <![CDATA[
<!-- IF S_NOTIFICATIONS_DISPLAY -->
+(function($) { // Avoid conflicts with other libraries
+
$(document).click(function(e) {
var target = e.target;
@@ -22,6 +24,8 @@ $(document).click(function(e) {
$('#notification_list').hide();
}
});
+
+})(jQuery); // Avoid conflicts with other libraries
<!-- ENDIF -->
// ]]>
</script>
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index b41860d130..c411edd367 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1182,4 +1182,4 @@ a.imageset {
#notification_list .footer > a {
display: block;
-} \ No newline at end of file
+}