Skip to content

Commit 898d6cc

Browse files
committed
Merge branch 'TheExpertNoob-development' into release-1.1.0
* TheExpertNoob-development: Revert the changes for the konami code Update index.html Update page_style.css Update nothing.html Create konami.js Update nothing.html Create nothing.html Update index.html
2 parents 6fb6de5 + d6dc8c4 commit 898d6cc

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

piratebox/piratebox/www_content/css/page_style.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,19 @@ header img, footer img {
136136
}
137137

138138
#logo {
139+
background-image: url('/content/img/piratebox-logo-horizontal-white.png');
140+
width: 215px;
141+
height: 36px;
139142
float: left;
140143
overflow: hidden;
141144
}
142145

143146
#menu-icon {
147+
background-image: url('/content/img/menu.png');
144148
float: right;
145149
width: 36px;
150+
height: 36px;
151+
overflow: hdden;
146152
-webkit-transition: all 0.5s ease-in-out;
147153
-moz-transition: all 0.5s ease-in-out;
148154
-o-transition: all 0.5s ease-in-out;

piratebox/piratebox/www_content/index.html

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@
1717

1818
<header id="header">
1919
<div class="container">
20-
<div id="logo">
21-
<h1>
22-
<a href="/">
23-
<img src="/content/img/piratebox-logo-horizontal-white.png" data-l10n-id="logoIMG" alt="PirateBox" title="PirateBox - Share Freely">
24-
</a>
25-
</h1>
26-
</div>
27-
<div id="menu-icon"><img src="/content/img/menu.png" alt="Menu"></div>
20+
<a href="/">
21+
<div id="logo" scrolling="no" >&nbsp;</div>
22+
</a>
23+
<div id="menu-icon"></div>
2824
<nav id="top-nav">
2925
<ul>
3026
<li><a href="/" class="current" data-l10n-id="navbarHome">Home</a></li>
@@ -48,7 +44,7 @@ <h2 data-l10n-id="welcomeWelcome">Welcome</h2>
4844
<div id="sidebar">
4945
<div id="upload" class="card">
5046
<h2 data-l10n-id="sidebarUpload">Upload</h2>
51-
<iframe width="100%" height="80" src='http://piratebox.lan:8080' data-l10n-id="sidebarIframeNotSupported">
47+
<iframe width="100%" height="80" src='http://piratebox.lan:8080' data-l10n-id="sidebarIframeNotSupported" scrolling="no">
5248
Your browser does not support iframes.. If you want to upload something, follow this <a href='http://piratebox.lan:8080' data-l10n-id="link">Link</a>.
5349
</iframe>
5450
<h3><a href="/Shared" data-l10n-id="sidebarBrowseFiles">Browse Files -></a></h3>

0 commit comments

Comments
 (0)