Skip to content

Commit

Permalink
cobaltians/Cobalt#92: Update bar colors & page names
Browse files Browse the repository at this point in the history
  • Loading branch information
Sébastien Vitard committed Oct 6, 2016
1 parent 679928b commit e9e164d
Show file tree
Hide file tree
Showing 19 changed files with 48 additions and 47 deletions.
4 changes: 2 additions & 2 deletions appEvents.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
}
});

app.initPage('Using Events')
app.initPage('App events')

})
</script>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion callbacks.html
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ <h2>Some automatic testing</h2>
</script>

</body>
</html>
</html>
31 changes: 16 additions & 15 deletions cobalt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,40 @@
"default": {
"ios": "SimpleController",
"android": ".activities.SimpleHybridActivity",
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"dark": {
"ios": "SimpleController",
"android": ".activities.SimpleHybridActivity",
"backgroundColor": "#4a81a5",
"bars" : { "color": "#FFF"}
"backgroundColor": "#3498DB",
"bars" : { "color": "#FFF", "backgroundColor": "#3498DB"}
},
"callbacks": {
"ios": "CallbacksController",
"android": ".activities.CallbacksActivity",
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"events": {
"ios": "EventsController",
"android": ".activities.EventsActivity",
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"infiniteScroll": {
"ios": "SimpleController",
"android": ".activities.PullToRefreshActivity",
"infiniteScroll": true,
"iosScrollToTop": true,
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
} ,
"infiniteScrollNonActive": {
"ios": "SimpleController",
"android": ".activities.PullToRefreshActivity",
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"modalTest": {
"ios": "SimpleController",
"android": ".activities.ModalActivity",
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"nativeBars": {
"ios": "SimpleController",
Expand Down Expand Up @@ -95,44 +95,45 @@
"android": ".activities.PullToRefreshActivity",
"pullToRefresh": true,
"infiniteScroll": true,
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"pullToRefresh":{
"ios": "SimpleController",
"android": ".activities.PullToRefreshActivity",
"pullToRefresh": true,
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"coloredPullToRefresh":{
"ios": "SimpleController",
"android": ".activities.PullToRefreshActivity",
"pullToRefresh": true,
"backgroundColor":"#4a81a5",
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"pullToRefreshCustom": {
"ios": "CustomizedPulltoRefreshViewController",
"android": ".activities.PullToRefreshCustomActivity",
"pullToRefresh": true,
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"pullToRefreshNonActive": {
"ios": "SimpleController",
"android": "PullToRefreshActivity",
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"appEvents": {
"ios": "SimpleController",
"android": ".activities.PullToRefreshActivity",
"pullToRefresh": true,
"bars" : { "color": "#000", "backgroundColor": "#FFF"}
"bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
},
"plugins": {
"ios": "PluginsController",
"android": ".activities.PluginsActivity",
"bars": {
"visibility": { "top": true, "bottom" : false },
"backgroundColor": "#34db98"
"color": "#34DB98",
"backgroundColor": "#FFF"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions events.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
cobalt.sendEvent('hello');
});

app.initPage('Using Events')
app.initPage('Using events')

})
</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions infinitescroll.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
}
});

app.initPage('Infinite scroll');
app.initPage('Infinite Scroll');

while($("body").height() <= $(window).height()){
$('#list').append( someListItems );
Expand All @@ -71,4 +71,4 @@
</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions localstorage.html
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@



app.initPage('Local storage');
app.initPage('Local Storage');

})


</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions localstorage_page2.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@
cobalt.storage.clear();
});

app.initPage('Local storage page2');
app.initPage('Local Storage 2');

})


</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions nativeBars.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
}
});

app.initPage('native bars');
app.initPage('Native Bars');


app.touch('#showFooter', function () {
Expand Down Expand Up @@ -207,4 +207,4 @@
})
</script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions navigation.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
}
});

app.initPage('advanced navigation');
app.initPage('Advanced navigation');

app.touch('a.replace',function(){
cobalt.navigate.replace({
Expand Down Expand Up @@ -114,4 +114,4 @@
</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions navigation_popToController.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
debugInDiv:app.debugInDiv
});

app.initPage('navigation popTo');
app.initPage('Navigation PopTo');

})


</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions navigation_popTo_A.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
}
});

app.initPage('popTo, page A');
app.initPage('PopTo, Page A');

})


</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions navigation_popTo_B.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
}
});

app.initPage('popTo, page B');
app.initPage('PopTo, Page B');

})


</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions navigation_popTo_C.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
debugInDiv:app.debugInDiv
});

app.initPage('popTo, page C');
app.initPage('PopTo, Page C');

})


</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions navigation_pushedWithData.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}
});

app.initPage('advanced navigation');
app.initPage('Advanced navigation');

app.touch('#popWithData',function(){
cobalt.navigate.pop({ data : { ho : "yeah" }});
Expand All @@ -76,4 +76,4 @@
</script>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion plugins-pubsub2.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
debugInBrowser:app.debugInBrowser,
debugInDiv:false
});
app.initPage('PubSub Plugin page2')
app.initPage('PubSub Plugin 2')

$('#publish_dataChanged').on('click',function(){
cobalt.publish('dataChanged', { some : "other", random : "value" });
Expand Down
2 changes: 1 addition & 1 deletion plugins-webservices.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
}
});

app.initPage('Webservices Plugin');
app.initPage('WebServices Plugin');

app.touch('#try', function () {
$('#result').html();
Expand Down
4 changes: 2 additions & 2 deletions pulltorefresh.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
});


app.initPage('Pull to refresh');
app.initPage('Pull-to-refresh');

fillWithListItems();

Expand All @@ -83,4 +83,4 @@
</script>

</body>
</html>
</html>
4 changes: 2 additions & 2 deletions simple_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
debugInDiv:app.debugInDiv
});

app.initPage('Just a simple page');
app.initPage('Simple page');

})
</script>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion weblayers.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@
</script>

</body>
</html>
</html>

0 comments on commit e9e164d

Please sign in to comment.