Merge branch 'master' into 3.6

for master updates

Conflicts:
	lo.js
	twittperator.js

1 files changed, 23 insertions, 0 deletions

diff --git a/twittperator/twsidebar/chrome/content/twsidebar.css b/twittperator/twsidebar/chrome/content/twsidebar.css
index 7081ea2..e431b3b 100644
--- a/twittperator/twsidebar/chrome/content/twsidebar.css
+++ b/twittperator/twsidebar/chrome/content/twsidebar.css
@@ -52,3 +52,26 @@
 .tw-anekos-sb-plugin-tweet-follow-my {
   background-color: lightsalmon !important;
 }
+
+.tw-anekos-sb-plugin-item-name {
+  font-weight: bold;
+}
+
+.tw-anekos-sb-plugin-item-text {
+  word-break: break-all;
+}
+
+.tw-anekos-sb-plugin-item-sub {
+  background-color: pink;
+  font-size: 80%;
+}
+
+.tw-anekos-sb-plugin-item-time {
+  font-size: 80%;
+}
+
+.tw-anekos-sb-plugin-item-time-and-sub {
+  font-size: 80%;
+  display: none;
+}
+