Merge branch 'refs/heads/develop' into desktop
Conflicts: version.py
This commit is contained in:
commit
acda664686
512 files changed
+18469
-60698
No files matched your search
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 29 KiB |
@@ -101,6 +101,9 @@ Page.Home = new Class({
|
||||
});
|
||||
});
|
||||
|
||||
// Suggest
|
||||
self.suggestion_list = new SuggestList();
|
||||
|
||||
// Still not available
|
||||
self.late_list = new MovieList({
|
||||
'navigation': false,
|
||||
@@ -121,25 +124,10 @@ Page.Home = new Class({
|
||||
self.el.adopt(
|
||||
$(self.available_list),
|
||||
$(self.soon_list),
|
||||
$(self.suggestion_list),
|
||||
$(self.late_list)
|
||||
);
|
||||
|
||||
// Suggest
|
||||
// self.suggestion_list = new MovieList({
|
||||
// 'navigation': false,
|
||||
// 'identifier': 'suggestions',
|
||||
// 'limit': 6,
|
||||
// 'load_more': false,
|
||||
// 'view': 'thumbs',
|
||||
// 'api_call': 'suggestion.suggest'
|
||||
// });
|
||||
// self.el.adopt(
|
||||
// new Element('h2', {
|
||||
// 'text': 'You might like'
|
||||
// }),
|
||||
// $(self.suggestion_list)
|
||||
// );
|
||||
|
||||
// Recent
|
||||
// Snatched
|
||||
// Renamed
|
||||
|
||||
@@ -168,6 +168,7 @@ body > .spinner, .mask{
|
||||
color: #FFF;
|
||||
}
|
||||
|
||||
.icon2.add:before { content: "\e05a"; color: #c2fac5; }
|
||||
.icon2.cog:before { content: "\e109"; }
|
||||
.icon2.eye-open:before { content: "\e09d"; }
|
||||
.icon2.search:before { content: "\e03e"; }
|
||||
|
||||
Reference in new issue
Block a user