Skip to content

Commit

Permalink
Fix flattr loading. Bump 0.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
kepi committed Mar 14, 2014
1 parent 8bd1a6c commit 97ddca3
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 10 deletions.
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

0.1.5 - 14. 3. 2014
-------------------
* Fix flattr loading

0.1.4 - 14. 3. 2014
-------------------
* Fix misplaced Save button
Expand Down
8 changes: 6 additions & 2 deletions icinga.css
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,12 @@ a#refresh-data {
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fdfdfd), to(#e6f2cb));
}

#footer span#flattrbutton {
float: left;
#footer div#flattrbutton {
float: left;
}

#footer div#footerbuttons {
float: right;
}

#footer a {
Expand Down
6 changes: 5 additions & 1 deletion inc/flattr/load.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Icinga Status",
"version": "0.1.4",
"version": "0.1.5",
"description": "Icinga Status is simple open source extension for Google Chrome™ that helps you watch over your Icinga or Nagios instance.",

"background": {
Expand Down
4 changes: 2 additions & 2 deletions options.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<script src="inc/jquery-ui/js/jquery-ui-1.10.4.custom.min.js"></script>

<link href="inc/jquery-ui/css/smoothness/jquery-ui-1.10.4.custom.css" rel="stylesheet" type="text/css"/>
<link href="icinga.css?0.1.0" rel="stylesheet" type="text/css"/>
<link href="inc/options/options.css?0.1.0" rel="stylesheet" type="text/css"/>
<link href="icinga.css?0.1.5" rel="stylesheet" type="text/css"/>
<link href="inc/options/options.css?0.1.5" rel="stylesheet" type="text/css"/>
<script src="inc/options/options.js" type="text/javascript"></script>
<script src="inc/jquery.lazyload.min.js" type="text/javascript"></script>

Expand Down
10 changes: 6 additions & 4 deletions popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link href="inc/jquery-ui/css/smoothness/jquery-ui-1.10.4.custom.css" rel="stylesheet" type="text/css"/>
<script src="inc/jquery-ui/js/jquery-ui-1.10.4.custom.min.js"></script>

<link href="icinga.css?0.1.0" rel="stylesheet" type="text/css"/>
<link href="icinga.css?0.1.5" rel="stylesheet" type="text/css"/>
<script src="icinga.js"></script>
<script src="inc/popup.js"></script>
<script src="inc/flattr/load.js" async></script>
Expand Down Expand Up @@ -49,16 +49,18 @@ <h3>Icinga Status</h3>
</div>

<div id="footer">
<span id="flattrbutton">
<div id="flattrbutton">
<a class="FlattrButton"
style="display:none;"
title="Flattr Icinga Status"
data-flattr-url="https://chrome.google.com/webstore/detail/imaieifkljkcdepgaeommbdgihollphm"
data-flattr-popout="0"
data-flattr-button="compact"
href="https://flattr.com/thing/381395">Flattr Icinga Status</a>
</span>
<a class="ext" href="options.html">Options</a>
</div>
<div id="footer-buttons">
<a class="ext" href="options.html">Options</a>
</div>
</div>

</body>
Expand Down

0 comments on commit 97ddca3

Please sign in to comment.