aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnqi Xu2012-06-24 06:04:16 -0400
committerAnqi Xu2012-06-24 06:04:16 -0400
commitefc4a3bc3b7aea3a60605fd812e0afe196b5bc8b (patch)
tree30d619626971df188bd18f59190d2d479f7fbc72
parent8bb66e15a05f26261ac0f20d55ce283c0950725b (diff)
parentf53f17326e4163a37c1d1520ef7f87c2c527b70c (diff)
downloadLikeFeed-efc4a3bc3b7aea3a60605fd812e0afe196b5bc8b.tar.bz2
Merge branch 'master' of github.com:teddywing/LikeFeed
-rw-r--r--README9
-rw-r--r--Resources/friendship/ui/ui.js2
2 files changed, 9 insertions, 2 deletions
diff --git a/README b/README
index 9aa6488..f5187aa 100644
--- a/README
+++ b/README
@@ -1,7 +1,14 @@
-FriendShip
+FriendShip --> Renamed to Sphnx
==========
# Development Setup
Titanium 1.6.2 SDK download link: http://builds.appcelerator.com.s3.amazonaws.com/mobile/1_6_X/mobilesdk-1.6.2-20110418144400-osx.zip
(from http://builds.appcelerator.com.s3.amazonaws.com/index.html)
+
+
+# Research
+
+- Infinite scrolling in Titanium: https://gist.github.com/810391
+- Infinite scrolling (only Android): https://gist.github.com/810171
+
diff --git a/Resources/friendship/ui/ui.js b/Resources/friendship/ui/ui.js
index 501d2f3..bcd5e1a 100644
--- a/Resources/friendship/ui/ui.js
+++ b/Resources/friendship/ui/ui.js
@@ -2,7 +2,7 @@
fs.ui = {};
fs.ui.styles = {
- navBarColour: '#ac0b24'
+ navBarColour: '#8c2a2a'
};
})();