App should be more aware of focus being regained and update if it's been an hour.

This commit is contained in:
Martin Donnelly 2018-03-08 11:48:28 +00:00
parent e6ce05cfda
commit 7bccbd8b89
6 changed files with 14 additions and 6 deletions

View File

@ -388,11 +388,16 @@ li {
} }
.cardLink { .cardLink {
color: mui-color('blue', '500') color: mui-color('blue', '500');
margin-top: 10px;
} }
.endbumper { .endbumper {
height:66px; height:66px;
} }
.seemore {
font-size:14px;
font-weight: 500;
}
@import "./src/css/weather"; @import "./src/css/weather";

View File

@ -3,7 +3,7 @@
background-size: cover; background-size: cover;
color:white; color:white;
font-family: 'Roboto'; font-family: 'Roboto';
font-weight: 100; font-weight: 200;
} }
.weatherDay { .weatherDay {
@ -66,7 +66,7 @@
.glassy { .glassy {
background-color: rgba(31, 28, 23, 0.4); background-color: rgba(31, 28, 23, 0.6);
-webkit-backdrop-filter: blur(5px); -webkit-backdrop-filter: blur(5px);
backdrop-filter: blur(2px); backdrop-filter: blur(2px);
} }

View File

@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
const CACHE_VERSION = { 'version': '0.0.205' }; const CACHE_VERSION = { 'version': '0.0.210' };
const dataCacheName = 'jubileeData-v1'; const dataCacheName = 'jubileeData-v1';
const cacheName = 'jubilee-final-1'; const cacheName = 'jubilee-final-1';
const filesToCache = [ const filesToCache = [

View File

@ -121,6 +121,8 @@ const NearbyView = Backbone.View.extend({
this.fsCollection.bind('reset', this.render, this); this.fsCollection.bind('reset', this.render, this);
this.eventBus.on('focused', this.focused, this); this.eventBus.on('focused', this.focused, this);
this.other = $('<div id="nearbyOther" class="cardLink"><i class="seemore material-icons mui--align-middle " >arrow_forward</i> <span class="seemore mui--align-middle">Other locations</span></div>');
}, },
'events': { 'events': {
'click .itemRow': 'doClick' 'click .itemRow': 'doClick'
@ -149,6 +151,7 @@ const NearbyView = Backbone.View.extend({
// this.$el.append(personView.el); // adding all the person objects. // this.$el.append(personView.el); // adding all the person objects.
}, this); }, this);
this.$el.append(this.other);
if (totalResults > 0) if (totalResults > 0)
this.$el.parent().show(); this.$el.parent().show();
else else

View File

@ -40,7 +40,7 @@ const weatherItemView = Backbone.View.extend({
For <%=city%> to <%= readdate %> For <%=city%> to <%= readdate %>
</div> </div>
<div id='wForecast' class="cardLink"> <div id='wForecast' class="cardLink">
<i class="small material-icons mui--align-middle " >arrow_forward</i> <span class="mui--align-middle">See forecast</span> <i class="seemore material-icons mui--align-middle " >arrow_forward</i> <span class="seemore mui--align-middle">See forecast</span>
</div> </div>
`), `),
'initialize': function() { 'initialize': function() {

View File

@ -16,7 +16,7 @@ const { ByMeModel, ByMeView } = require('./RightByMe');
var app = app || {}; var app = app || {};
const live = true; const live = live;
if (live) { if (live) {
window.loc = 'https://jubilee.silvrtree.co.uk'; window.loc = 'https://jubilee.silvrtree.co.uk';