[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

[Nirbheek Chauhan]

commit:     be703172149a11b0c17f77676171bfb3d58301f4
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 02:35:55 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 02:35:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=be703172

gnome-base/gnome-shell: theme fixes for message tray chat bubbles

---
 ...ighten-up-the-sent-message-color-clean-up.patch |   49 ++++++++++++++++++++
 ...2-messageTray-Reduce-the-scroll-view-fade.patch |   40 ++++++++++++++++
 ...ll-3.2.1.ebuild => gnome-shell-3.2.1-r1.ebuild} |    4 ++
 3 files changed, 93 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-shell/files/0001-theme-Lighten-up-the-sent-message-color-clean-up.patch b/gnome-base/gnome-shell/files/0001-theme-Lighten-up-the-sent-message-color-clean-up.patch
new file mode 100644
index 0000000..55052b7
--- /dev/null
+++ b/gnome-base/gnome-shell/files/0001-theme-Lighten-up-the-sent-message-color-clean-up.patch
@@ -0,0 +1,49 @@
+From 3294a6e1a7d7a6bea1cb02ec671aaa0d350b57f5 Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre@×××××××.net>
+Date: Fri, 2 Sep 2011 16:01:24 -0400
+Subject: [PATCH 1/2] theme: Lighten up the sent message color, clean up
+
+Properly apply "received" style and drop unused border-radius styles
+now that the messages have no background color
+
+https://bugzilla.gnome.org/show_bug.cgi?id=658096
+---
+ data/theme/gnome-shell.css |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
+index 4487159..0e09866 100644
+--- a/data/theme/gnome-shell.css
++++ b/data/theme/gnome-shell.css
+@@ -1329,9 +1329,8 @@ StTooltip StLabel {
+     padding: 8px 0;
+ }
+ 
+-.chat-sent {
++.chat-received {
+     padding-left: 4px;
+-    border-radius: 4px;
+ }
+ 
+ .chat-received:rtl {
+@@ -1341,8 +1340,7 @@ StTooltip StLabel {
+ 
+ .chat-sent {
+     padding-left: 18pt;
+-    border-radius: 4px;
+-    color: #7E7E7E;
++    color: #959595;
+ }
+ 
+ .chat-sent:rtl {
+@@ -1352,7 +1350,6 @@ StTooltip StLabel {
+ 
+ .chat-meta-message {
+     padding-left: 4px;
+-    border-radius: 4px;
+     font-size: 9pt;
+     color: #bbbbbb;
+ }
+-- 
+1.7.3.4
+

diff --git a/gnome-base/gnome-shell/files/0002-messageTray-Reduce-the-scroll-view-fade.patch b/gnome-base/gnome-shell/files/0002-messageTray-Reduce-the-scroll-view-fade.patch
new file mode 100644
index 0000000..22a4ce3
--- /dev/null
+++ b/gnome-base/gnome-shell/files/0002-messageTray-Reduce-the-scroll-view-fade.patch
@@ -0,0 +1,40 @@
+From 18541c447e30154e7bd5806e11e3fe70fb9d5887 Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre@×××××××.net>
+Date: Thu, 27 Oct 2011 13:52:17 -0400
+Subject: [PATCH 2/2] messageTray: Reduce the scroll view fade
+
+https://bugzilla.gnome.org/show_bug.cgi?id=662226
+---
+ data/theme/gnome-shell.css |    1 +
+ js/ui/messageTray.js       |    3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
+index 0e09866..ea81870 100644
+--- a/data/theme/gnome-shell.css
++++ b/data/theme/gnome-shell.css
+@@ -1217,6 +1217,7 @@ StTooltip StLabel {
+ 
+ #notification-scrollview {
+     max-height: 10em;
++    -st-vfade-offset: 24px;
+ }
+ 
+ #notification-scrollview > .top-shadow, #notification-scrollview > .bottom-shadow {
+diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
+index 75eb9f9..ca12fb1 100644
+--- a/js/ui/messageTray.js
++++ b/js/ui/messageTray.js
+@@ -597,8 +597,7 @@ Notification.prototype = {
+         this._table.add_style_class_name('multi-line-notification');
+         this._scrollArea = new St.ScrollView({ name: 'notification-scrollview',
+                                                vscrollbar_policy: this._scrollPolicy,
+-                                               hscrollbar_policy: Gtk.PolicyType.NEVER,
+-                                               style_class: 'vfade' });
++                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
+         this._table.add(this._scrollArea, { row: 1,
+                                             col: 2 });
+         this._updateLastColumnSettings();
+-- 
+1.7.3.4
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild
similarity index 95%
rename from gnome-base/gnome-shell/gnome-shell-3.2.1.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild
index d264034..603e49f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.2.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild
@@ -119,6 +119,10 @@ src_prepare() {
 	# Note: sed Makefile.in because it is generated from several Makefile.ams
 	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
 		-i src/Makefile.in browser-plugin/Makefile.in || die "sed failed"
+
+	# Two chat messageTray fixes taken from git master, not in gnome-3-2 yet
+	epatch "${FILESDIR}"/0001-theme-Lighten-up-the-sent-message-color-clean-up.patch
+	epatch "${FILESDIR}"/0002-messageTray-Reduce-the-scroll-view-fade.patch
 }
 
 src_install() {