From bef7767a8bf2f471eff96e0aa86ff24a71d99803 Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Fri, 18 Dec 2015 07:06:12 -0500 Subject: [PATCH 1/2] Use jQuery to display images --- .gitattributes | 60 ++++++++--------- composer.json | 63 ++++++++++-------- .../template/event/overall_footer_after.html | 8 +++ .../overall_header_page_body_before.html | 3 - styles/prosilver/theme/hohohatcorner.css | 39 ++++++++--- styles/prosilver/theme/images/hohohatmini.png | Bin 0 -> 3230 bytes 6 files changed, 100 insertions(+), 73 deletions(-) create mode 100644 styles/prosilver/template/event/overall_footer_after.html delete mode 100644 styles/prosilver/template/event/overall_header_page_body_before.html create mode 100644 styles/prosilver/theme/images/hohohatmini.png diff --git a/.gitattributes b/.gitattributes index 2185b3a..5c34d47 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,31 +1,31 @@ -.gitattributes export-ignore -.gitignore export-ignore -.travis.yml export-ignore -README.md export-ignore -composer.lock export-ignore -composer.phar export-ignore -phpunit.xml.dist export-ignore -/travis export-ignore - -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain +.gitattributes export-ignore +.gitignore export-ignore +.travis.yml export-ignore +README.md export-ignore +composer.lock export-ignore +composer.phar export-ignore +phpunit.xml.dist export-ignore +/travis export-ignore + +# Auto detect text files and perform LF normalization +* text=false + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain *.RTF diff=astextplain \ No newline at end of file diff --git a/composer.json b/composer.json index 8d8f0da..13021fa 100755 --- a/composer.json +++ b/composer.json @@ -1,30 +1,35 @@ { - "name": "phpbbmodders/holidayflare", - "type": "phpbb-extension", - "description": "Allows an admin to display various seasonal holiday flares to their default style. The images/javascript can be enable/disabled in the ACP via EXTENSIONS --> Holiday Flare --> Settings", - "version": "2.0.0", - "license": "GPL-2.0", - "authors": [ - { - "name": "William (bonelifer)", - "role": "Developer" - }, - { - "name": "Matt (VSE)", - "role": "Extension conversion" - } - ], - "require": { - "php": ">=5.3.3", - "composer/installers": "~1.0" - }, - "require-dev": { - "phpbb/epv": "dev-master" - }, - "extra": { - "display-name": "Holiday Flare", - "soft-require": { - "phpbb/phpbb": ">=3.1.0-RC3,<3.2.*@dev" - } - } -} + "name": "phpbbmodders/holidayflare", + "type": "phpbb-extension", + "description": "Allows an admin to display various seasonal holiday flares to their default style. The images/javascript can be enable/disabled in the ACP via EXTENSIONS --> Holiday Flare --> Settings", + "version": "2.0.1", + "license": "GPL-2.0", + "authors": [ + { + "name": "William (bonelifer)", + "role": "Developer" + }, + { + "name": "Matt (VSE)", + "role": "Extension conversion" + } + ], + "require": { + "php": ">=5.3.3", + "composer/installers": "~1.0" + }, + "require-dev": { + "phpbb/epv": "dev-master" + }, + "extra": { + "display-name": "Holiday Flare", + "soft-require": { + "phpbb/phpbb": ">=3.1.0-RC3,<3.3.*@dev" + }, + "version-check": { + "host": "www.phpbb.com", + "directory": "/customise/db/extension/holiday_flare", + "filename": "version_check" + } + } +} \ No newline at end of file diff --git a/styles/prosilver/template/event/overall_footer_after.html b/styles/prosilver/template/event/overall_footer_after.html new file mode 100644 index 0000000..b3a45ca --- /dev/null +++ b/styles/prosilver/template/event/overall_footer_after.html @@ -0,0 +1,8 @@ + + + \ No newline at end of file diff --git a/styles/prosilver/template/event/overall_header_page_body_before.html b/styles/prosilver/template/event/overall_header_page_body_before.html deleted file mode 100644 index dc8e68d..0000000 --- a/styles/prosilver/template/event/overall_header_page_body_before.html +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/styles/prosilver/theme/hohohatcorner.css b/styles/prosilver/theme/hohohatcorner.css index 08eb51f..cc3e0f9 100644 --- a/styles/prosilver/theme/hohohatcorner.css +++ b/styles/prosilver/theme/hohohatcorner.css @@ -2,22 +2,39 @@ float: left; height: 96px; width: 96px; - margin: -159px 0 0 -36px; - position: relative; - z-index: 900; + margin-top: -8px; + margin-left: -35px; + position: absolute; + z-index: 2; background: transparent url(images/hohohat.png) 0 0 no-repeat; /* http://artdesigner.lv/licensing | http://artdesigner.lv/silent-night-10-christmas-icons */ display: block; } .rtl #banner-xmas { float: right; - height: 96px; - width: 96px; - margin: -159px -36px 0 0; - position: relative; - z-index: 900; - background: transparent url(images/hohohat.png) 0 0 no-repeat; + margin-right: -35px; + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + -webkit-transform: scaleX(-1); + transform: scaleX(-1); + filter: FlipH; + -ms-filter: "FlipH"; +} + +.forum-xmas { + background: transparent url("images/hohohatmini.png") 0 0 no-repeat; + position: absolute; + height: 50px; + width: 50px; + z-index: 2; display: block; + margin-left: -18px; + margin-top: -4px; +} + +.rtl .forum-xmas { + float: right; + margin-right: -18px; -moz-transform: scaleX(-1); -o-transform: scaleX(-1); -webkit-transform: scaleX(-1); @@ -27,5 +44,5 @@ } @media only screen and (max-width: 700px), only screen and (max-device-width: 700px) { - #banner-xmas { display: none } -} + #banner-xmas, .forum-xmas { display: none; } +} \ No newline at end of file diff --git a/styles/prosilver/theme/images/hohohatmini.png b/styles/prosilver/theme/images/hohohatmini.png new file mode 100644 index 0000000000000000000000000000000000000000..fd0e2d573db57405f06970850e78217c189c7873 GIT binary patch literal 3230 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 Qa{vGU07*qoM6N<$g1Q1X>Hq)$ literal 0 HcmV?d00001 From fc706ef0cba0cbc48ea050652ff9cc170252b415 Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Fri, 18 Dec 2015 07:41:28 -0500 Subject: [PATCH 2/2] Change z-index so as to to overlay on drop down of quick links --- styles/prosilver/theme/hohohatcorner.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/prosilver/theme/hohohatcorner.css b/styles/prosilver/theme/hohohatcorner.css index cc3e0f9..9f23a05 100644 --- a/styles/prosilver/theme/hohohatcorner.css +++ b/styles/prosilver/theme/hohohatcorner.css @@ -5,7 +5,7 @@ margin-top: -8px; margin-left: -35px; position: absolute; - z-index: 2; + z-index: 1; background: transparent url(images/hohohat.png) 0 0 no-repeat; /* http://artdesigner.lv/licensing | http://artdesigner.lv/silent-night-10-christmas-icons */ display: block; } @@ -26,7 +26,7 @@ position: absolute; height: 50px; width: 50px; - z-index: 2; + z-index: 1; display: block; margin-left: -18px; margin-top: -4px;