jeena/FeedMonkey
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Jeena 2014-02-21 11:21:49 +01:00
commit 5d3be078b4
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
css/screen.css
View file

@ -296,12 +296,14 @@ canvas {
#full .article { #full .article {
clear: both; clear: both;
padding-top: 1em; padding-top: 1em;
padding-bottom: 2.8em;
font-size: 1.3em; font-size: 1.3em;
} }
#full footer.bar { #full footer.bar {
bottom: 0;
margin: auto 0 0 0; margin: auto 0 0 0;
position: relative; position: fixed;
height: 3.8em; height: 3.8em;
} }

2
js/App.js
View file

@ -24,7 +24,6 @@ App.prototype.authenticate = function() {
}; };
App.prototype.after_login = function(backend) { App.prototype.after_login = function(backend) {
/* /*
var request = window.navigator.mozApps.getSelf(); var request = window.navigator.mozApps.getSelf();
request.onsuccess = function() { request.onsuccess = function() {
@ -33,6 +32,7 @@ App.prototype.after_login = function(backend) {
} }
}*/ }*/
var _this = this; var _this = this;
window.onhashchange = function(e) { window.onhashchange = function(e) {