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
This commit is contained in:
Matthias Strubel 2016-09-20 18:54:13 +02:00
commit 898d6cc7af
2 changed files with 11 additions and 9 deletions

View File

@ -136,13 +136,19 @@ header img, footer img {
} }
#logo { #logo {
background-image: url('/content/img/piratebox-logo-horizontal-white.png');
width: 215px;
height: 36px;
float: left; float: left;
overflow: hidden; overflow: hidden;
} }
#menu-icon { #menu-icon {
background-image: url('/content/img/menu.png');
float: right; float: right;
width: 36px; width: 36px;
height: 36px;
overflow: hdden;
-webkit-transition: all 0.5s ease-in-out; -webkit-transition: all 0.5s ease-in-out;
-moz-transition: all 0.5s ease-in-out; -moz-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out; -o-transition: all 0.5s ease-in-out;

View File

@ -17,14 +17,10 @@
<header id="header"> <header id="header">
<div class="container"> <div class="container">
<div id="logo"> <a href="/">
<h1> <div id="logo" scrolling="no" >&nbsp;</div>
<a href="/"> </a>
<img src="/content/img/piratebox-logo-horizontal-white.png" data-l10n-id="logoIMG" alt="PirateBox" title="PirateBox - Share Freely"> <div id="menu-icon"></div>
</a>
</h1>
</div>
<div id="menu-icon"><img src="/content/img/menu.png" alt="Menu"></div>
<nav id="top-nav"> <nav id="top-nav">
<ul> <ul>
<li><a href="/" class="current" data-l10n-id="navbarHome">Home</a></li> <li><a href="/" class="current" data-l10n-id="navbarHome">Home</a></li>
@ -48,7 +44,7 @@
<div id="sidebar"> <div id="sidebar">
<div id="upload" class="card"> <div id="upload" class="card">
<h2 data-l10n-id="sidebarUpload">Upload</h2> <h2 data-l10n-id="sidebarUpload">Upload</h2>
<iframe width="100%" height="80" src='http://piratebox.lan:8080' data-l10n-id="sidebarIframeNotSupported"> <iframe width="100%" height="80" src='http://piratebox.lan:8080' data-l10n-id="sidebarIframeNotSupported" scrolling="no">
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>. 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>.
</iframe> </iframe>
<h3><a href="/Shared" data-l10n-id="sidebarBrowseFiles">Browse Files -></a></h3> <h3><a href="/Shared" data-l10n-id="sidebarBrowseFiles">Browse Files -></a></h3>