fix document

diff --git a/docs/index.rst b/docs/index.rst
index 2cf43517d6aa018c4d84b4f5c5d347f225c62eca..7d280f9b4a812721a1572ef17c082d54ed2bd8f6 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -161,11 +161,9 @@ Here is full list of supported command:
 \r
 **Direct Messages Commands**\r
 \r
--  ``inbox`` will show inbox messages. ``inbox 7`` will show newest 7\r
-   messages.\r
+-  ``inbox`` will show inbox messages. ``inbox 7`` will show newest 7 messages.\r
 \r
--  ``sent`` will show sent messages. ``sent 7`` will show newest 7\r
-   messages.\r
+-  ``thread 2`` will show full thread with [id=2].\r
 \r
 -  ``mes @dtvd88 hi`` will send a ``hi`` message to @dtvd88.\r
 \r

diff --git a/rainbowstream/colorset/larapaste.json b/rainbowstream/colorset/larapaste.json
index 5f1dc11a0f14fdaa3fe414f64e1e20ce4679a44d..9c7a509e4428c43790eb04b9c2144db1fb048040 100644 (file)
--- a/rainbowstream/colorset/larapaste.json
+++ b/rainbowstream/colorset/larapaste.json
@@ -38,8 +38,8 @@
     "MESSAGE" : {
         "partner"       : 37,
         "me"            : 37,
-        "me_frame"      : 202,
         "partner_frame" : 154,
+        "me_frame"      : 202,
         "sender"        : 37,
         "recipient"     : 37,
         "to"            : 154,

diff --git a/rainbowstream/colorset/monokai.json b/rainbowstream/colorset/monokai.json
index 7edabe2b56cc78081e7e837709a3a4d640d905ad..93036bc5b1d8c8bc526f3ea6c497b14430cb9d51 100644 (file)
--- a/rainbowstream/colorset/monokai.json
+++ b/rainbowstream/colorset/monokai.json
@@ -38,8 +38,8 @@
     "MESSAGE" : {
         "partner"       : 112,
         "me"            : 112,
-        "me_frame"      : 74,
         "partner_frame" : 198,
+        "me_frame"      : 74,
         "sender"        : 112,
         "recipient"     : 112,
         "to"            : 50,

diff --git a/rainbowstream/colorset/solarized.json b/rainbowstream/colorset/solarized.json
index 8cd7c5c558ea7a6c02e34d5b44ddff8f1af8bfe3..7cfee1e043ae9985b6421a93a2b0d35f8ea85007 100644 (file)
--- a/rainbowstream/colorset/solarized.json
+++ b/rainbowstream/colorset/solarized.json
@@ -38,8 +38,8 @@
     "MESSAGE" : {
         "partner"       : 64,
         "me"            : 64,
-        "me_frame"      : 23,
         "partner_frame" : 124,
+        "me_frame"      : 23,
         "sender"        : 64,
         "recipient"     : 64,
         "to"            : 130,

diff --git a/rainbowstream/colorset/tomorrow_night.json b/rainbowstream/colorset/tomorrow_night.json
index 084e7552e1af0e41b4c8aa815df32503635f455f..32b04d14d627ad433ff7347889cda206edabaed6 100644 (file)
--- a/rainbowstream/colorset/tomorrow_night.json
+++ b/rainbowstream/colorset/tomorrow_night.json
@@ -38,8 +38,8 @@
     "MESSAGE" : {
         "partner"       : 67,
         "me"            : 67,
-        "me_frame"      : 30,
         "partner_frame" : 166,
+        "me_frame"      : 30,
         "sender"        : 67,
         "recipient"     : 67,
         "to"            : 97,

diff --git a/theme.md b/theme.md
index 6a28446a43ed334beec6f8b24edde023b5ee2bf6..e5ecbab1124b2845866bb9db36e760a7dc04c0f2 100644 (file)
--- a/theme.md
+++ b/theme.md
@@ -25,21 +25,28 @@ Examples are available in
     "DECORATED_NAME" : 198,
     "CYCLE_COLOR" :[198,57,166,50,179,74,112],
     "TWEET" : {
-        "nick"      : 112,
-        "clock"     : 57,
-        "id"        : 166,
-        "favourite" : 50,
-        "rt"        : 179,
-        "link"      : 74,
-        "keyword"   : "on_light_green"
+        "nick"            : 112,
+        "clock"           : 57,
+        "id"              : 166,
+        "favorited"       : 50,
+        "retweet_count"   : 50,
+        "favorite_count"  : 198,
+        "rt"              : 179,
+        "link"            : 74,
+        "hashtag"         : 198,
+        "keyword"         : "on_light_green"
     },
 
     "MESSAGE" : {
-        "sender"    : 112,
-        "recipient" : 112,
-        "to"        : 50,
-        "clock"     : 57,
-        "id"        : 166
+        "partner"       : 112,
+        "me"            : 112,
+        "me_frame"      : 74,
+        "partner_frame" : 198,
+        "sender"        : 112,
+        "recipient"     : 112,
+        "to"            : 50,
+        "clock"         : 57,
+        "id"            : 166
     },
 
     "PROFILE" : {
@@ -61,6 +68,15 @@ Examples are available in
     "CAL" : {
         "days": 57,
         "today": "on_light_blue"
+    },
+
+    "GROUP" : {
+        "name": 112,
+        "member": 57,
+        "subscriber": 198,
+        "mode": 112,
+        "description": 166,
+        "clock": 57
     }
 }
 ```
@@ -120,17 +136,24 @@ Color reference can be found at
 * `TWEET`: colors of parts in a tweet's ouput.
   * `nick` : color for Twitter __username__.
   * `clock`: color for time of tweet.
-  * `id`: color for tweet's id
-  * `favorite`: color for the star symbol when a tweet is favorited by you
+  * `id`: color for tweet's id.
+  * `favorite`: color for the star symbol when a tweet is favorited by you.
+  * `retweet_count`: color for retweets count.
+  * `favorite_count`: color for favorites count.
   * `rt`: color for `RT` word in tweet's content.
-  * `link`: color for an url
-  * `keyword`: color for highlighted keyword (in tweets search)
+  * `link`: color for an url.
+  * `hashtag`: color for a hashtag.
+  * `keyword`: color for highlighted keyword (in tweets search).
 * `MESSAGE`: colors of parts in message's output.
+  * `partner`: color for __partner__.
+  * `me`: color for __authenticated user__.
+  * `partner_frame`: color for __partner's frame__.
+  * `me_frame`: color for __authenticated user's frame__.
   * `sender`: color for sender's __username__.
   * `recipient`: color for recipient's __username__.
   * `to`: color for the `>>>` symbol.
   * `clock`: color for time of message.
-  * `id`: color for message's id
+  * `id`: color for message's id.
 * `PROFILE`: colors for parts in profile's ouput.
   * `statuses_count`: color for statuses count.
   * `friends_count`: color for friends count.
@@ -144,8 +167,15 @@ Color reference can be found at
 * `TREND`: colors for trend's output:
   * `url`: color for trend's url.
 * `CAL`: colors for calendar's output:
-  * `days`: color for days in current month
+  * `days`: color for days in current month.
   * `today`: color for today.
+* `GROUP`: colors for twitter list output:
+  * `name`: color for twitter list's name.
+  * `member`: color member count.
+  * `subscriber`: color subscriber count.
+  * `mode`: color twitter list's mode.
+  * `description`: color twitter list's description.
+  * `clock`: color twitter list's created time.
 
 ### Theme usage
 While entered Rainbow Stream: