Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/Benjadahl/UDPlus-Plus
Browse files Browse the repository at this point in the history
…into development
  • Loading branch information
rkjar18 committed Apr 18, 2017
2 parents 2630cf4 + ef84082 commit 538e091
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
7 changes: 6 additions & 1 deletion options/indstillinger.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ <h3>Afleveringer</h3>
<h3>Lokal plads</h3>

<p>Plads brugt: <span id="usedStorage"></span> ud af de <span id="availableStorage"></span> som din browser har givet.</p>


<div style="visibility: hidden;" id="devOptions">
<h3>Udvikler indstillinger aktiveret</h3>
<p>Dette vil også ændre uddata's logo til "inddata-". hehe.</p>
<a id='openUnitTest' target="_blank">Lav unit test</a>
</div>

<h3 class="SnowOn">December</h3>
<input type="checkbox" name="SnowOn" id="SnowOn" class="SnowOn"></input><p class="SnowOn" style="display:inline;">Sne</p>
Expand Down
8 changes: 4 additions & 4 deletions options/options.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ <h3 class="SnowOn">December</h3>
<input type="checkbox" name="SnowOn" id="SnowOn" class="SnowOn"></input> <p class="SnowOn" style="display:inline;">Snow</p>
<input type="checkbox" name="xmashat" id="xmashat" class="xmashat"></input><p class="xmashat" style="display:inline;">ChristmasHat</p>

<div style="visibility: hidden;" id="devOptions">
<h3>Dev options</h3>
<a id='openUnitTest' target="_blank">Open Unit test</a>
</div>
<div style="visibility: hidden;" id="devOptions">
<h3>Dev options</h3>
<a id='openUnitTest' target="_blank">Open Unit test</a>
</div>

<script src="../themes.js"></script>
<script src="../resources/jquery-3.1.0.min.js"></script>
Expand Down

0 comments on commit 538e091

Please sign in to comment.