Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
63 changes: 34 additions & 29 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
8 changes: 8 additions & 0 deletions styles/prosilver/template/event/overall_footer_after.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<!-- IF S_ENABLE_HOHOHATCORNER -->
<script type="text/javascript">
(function($) {
$('<div id="banner-xmas"></div>').insertBefore("#page-header");
$('<div class="forum-xmas"></div>').insertBefore(".forabg, .forumbg");
})(jQuery);
</script>
<!-- ENDIF -->

This file was deleted.

39 changes: 28 additions & 11 deletions styles/prosilver/theme/hohohatcorner.css
Original file line number Diff line number Diff line change
Expand Up @@ -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: 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;
}

.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: 1;
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);
Expand All @@ -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; }
}
Binary file added styles/prosilver/theme/images/hohohatmini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.