adjust green to match maia

3 files changed, 30 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5696b4364c3..666c5ebc7267 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 5.0.1
-# Mon Aug  1 18:40:38 UTC 2016
+# Wed Aug  3 06:18:17 UTC 2016
 pkgbase = compiz-manjaro
 	pkgdesc = OpenGL compositing window manager. Includes friendly defaults, GWD theme selector and autostart for Xfce & MATE.
 	pkgver = 0.9.13.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://launchpad.net/compiz
 	install = compiz-manjaro.install
 	arch = i686
@@ -74,7 +74,7 @@ pkgbase = compiz-manjaro
 	sha256sums = f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b
 	sha256sums = 16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9
 	sha256sums = 01e94ac52cd39eb5462a8505c7df61c7b14b05159de64f8700dfadb524bdb2ce
-	sha256sums = 4615d380f9b310877d9c86279be0cf30271bb67640fc90a979ba5fb07019f828
+	sha256sums = b635bfbefd558cd255d6cb119378b01d9b3815b8f5f6b3a03dfe736c0cd5746b
 	sha256sums = 149213e0b29e34744b6e8e51cdaccc4011fd29c5f9475c59aa7482f3fe4a68af
 	sha256sums = aca18e14854a466262f876bf7463d786c88453820abc89027608d732bb79a542
 	sha256sums = 0faaf9e9df28d2857108ccd0910d50ba631c34c2b1659b8860da8c2b552fc889
diff --git a/PKGBUILD b/PKGBUILD
index 00957ecdaafe..991f6aca6e7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _name=compiz
 pkgname=compiz-manjaro
 _series=0.9.13
 pkgver=${_series}.0
-pkgrel=2
+pkgrel=3
 _greybirdver=1.6.2
 pkgdesc="OpenGL compositing window manager. Includes friendly defaults, GWD theme selector and autostart for Xfce & MATE."
 arch=('i686' 'x86_64')
@@ -39,7 +39,7 @@ sha256sums=('f08eb54d578be559e3e723f3fe4291a56f5c96b2fdfb9c9e74ebb6596a1ca702'
             'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
             '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
             '01e94ac52cd39eb5462a8505c7df61c7b14b05159de64f8700dfadb524bdb2ce'
-            '4615d380f9b310877d9c86279be0cf30271bb67640fc90a979ba5fb07019f828'
+            'b635bfbefd558cd255d6cb119378b01d9b3815b8f5f6b3a03dfe736c0cd5746b'
             '149213e0b29e34744b6e8e51cdaccc4011fd29c5f9475c59aa7482f3fe4a68af'
             'aca18e14854a466262f876bf7463d786c88453820abc89027608d732bb79a542'
             '0faaf9e9df28d2857108ccd0910d50ba631c34c2b1659b8860da8c2b552fc889'
diff --git a/compiz-manjaro-defaults.patch b/compiz-manjaro-defaults.patch
index 9bc2f4363185..5595213e5b23 100644
--- a/compiz-manjaro-defaults.patch
+++ b/compiz-manjaro-defaults.patch
@@ -1,6 +1,6 @@
 diff -Naur a/metadata/core.xml.in b/metadata/core.xml.in
 --- a/metadata/core.xml.in	2016-07-01 21:39:57.000000000 +1000
-+++ b/metadata/core.xml.in	2016-08-01 23:38:46.288603212 +1000
++++ b/metadata/core.xml.in	2016-08-03 15:58:02.119855486 +1000
 @@ -215,7 +215,7 @@
  			<option name="window_menu_button" type="button">
  			<_short>Window Menu</_short>
@@ -29,7 +29,7 @@ diff -Naur a/metadata/core.xml.in b/metadata/core.xml.in
  			</option>
 diff -Naur a/plugins/composite/composite.xml.in b/plugins/composite/composite.xml.in
 --- a/plugins/composite/composite.xml.in	2016-07-01 21:39:57.000000000 +1000
-+++ b/plugins/composite/composite.xml.in	2016-08-01 23:46:14.894372779 +1000
++++ b/plugins/composite/composite.xml.in	2016-08-03 15:58:02.119855486 +1000
 @@ -24,7 +24,7 @@
  	    <option name="unredirect_fullscreen_windows" type="bool">
  		<_short>Unredirect Fullscreen Windows</_short>
@@ -41,7 +41,7 @@ diff -Naur a/plugins/composite/composite.xml.in b/plugins/composite/composite.xm
  		<_short>Unredirect Match</_short>
 diff -Naur a/plugins/expo/expo.xml.in b/plugins/expo/expo.xml.in
 --- a/plugins/expo/expo.xml.in	2016-07-01 21:39:57.000000000 +1000
-+++ b/plugins/expo/expo.xml.in	2016-08-02 01:51:06.822360083 +1000
++++ b/plugins/expo/expo.xml.in	2016-08-03 16:02:18.653546597 +1000
 @@ -26,7 +26,7 @@
  		<option name="expo_key" type="key">
  		    <_short>Expo Key</_short>
@@ -81,15 +81,15 @@ diff -Naur a/plugins/expo/expo.xml.in b/plugins/expo/expo.xml.in
 -			    <red>0xfbfb</red>
 -			    <green>0x8b8b</green>
 -			    <blue>0x0</blue>
-+			    <red>0x5f5f</red>
-+			    <green>0x8080</green>
-+			    <blue>0x4444</blue>
++			    <red>0x1616</red>
++			    <green>0xa0a0</green>
++			    <blue>0x8585</blue>
  			    <alpha>0xffff</alpha>
  			</default>
  		    </option>
 diff -Naur a/plugins/grid/grid.xml.in b/plugins/grid/grid.xml.in
 --- a/plugins/grid/grid.xml.in	2016-07-01 21:39:57.000000000 +1000
-+++ b/plugins/grid/grid.xml.in	2016-08-01 23:52:57.166278657 +1000
++++ b/plugins/grid/grid.xml.in	2016-08-03 16:06:15.480336146 +1000
 @@ -566,16 +566,16 @@
  		<option name="animation_duration" type="int">
  			<_short>Preview Animation Duration</_short>
@@ -105,9 +105,9 @@ diff -Naur a/plugins/grid/grid.xml.in b/plugins/grid/grid.xml.in
 -			    <red>0xfbfb</red>
 -			    <green>0x8b8b</green>
 -			    <blue>0x0</blue>
-+			    <red>0x8c8c</red>
-+			    <green>0xbcbc</green>
-+			    <blue>0x6565</blue>
++			    <red>0x1616</red>
++			    <green>0xa0a0</green>
++			    <blue>0x8585</blue>
  			    <alpha>0x9f9f</alpha>
  			</default>
  		</option>
@@ -118,15 +118,15 @@ diff -Naur a/plugins/grid/grid.xml.in b/plugins/grid/grid.xml.in
 -			    <red>0xfbfb</red>
 -			    <green>0x8b8b</green>
 -			    <blue>0x0</blue>
-+			    <red>0x8c8c</red>
-+			    <green>0xbcbc</green>
-+			    <blue>0x6565</blue>
++			    <red>0x1616</red>
++			    <green>0xa0a0</green>
++			    <blue>0x8585</blue>
  			    <alpha>0x4f4f</alpha>
  			</default>
  		</option>
 diff -Naur a/plugins/place/place.xml.in b/plugins/place/place.xml.in
 --- a/plugins/place/place.xml.in	2016-07-01 21:39:57.000000000 +1000
-+++ b/plugins/place/place.xml.in	2016-08-02 00:15:31.803962135 +1000
++++ b/plugins/place/place.xml.in	2016-08-03 15:58:02.123188823 +1000
 @@ -84,21 +84,33 @@
  			<_short>Positioned windows</_short>
  			<_long>Windows that should be positioned by default</_long>
@@ -163,7 +163,7 @@ diff -Naur a/plugins/place/place.xml.in b/plugins/place/place.xml.in
  		<subgroup>
 diff -Naur a/plugins/resize/resize.xml.in b/plugins/resize/resize.xml.in
 --- a/plugins/resize/resize.xml.in	2016-07-01 21:39:57.000000000 +1000
-+++ b/plugins/resize/resize.xml.in	2016-08-02 01:18:15.838169153 +1000
++++ b/plugins/resize/resize.xml.in	2016-08-03 16:06:14.100335645 +1000
 @@ -17,7 +17,7 @@
  		<option name="initiate_button" type="button">
  		    <_short>Initiate Window Resize</_short>
@@ -189,22 +189,24 @@ diff -Naur a/plugins/resize/resize.xml.in b/plugins/resize/resize.xml.in
 -		    <red>0xfbfb</red>
 -		    <green>0x8b8b</green>
 -		    <blue>0x0</blue>
-+		    <red>0x5f5f</red>
-+		    <green>0x8080</green>
-+		    <blue>0x4444</blue>
++		    <red>0x1616</red>
++		    <green>0xa0a0</green>
++		    <blue>0x8585</blue>
  		    <alpha>0x9f9f</alpha>
  		</default>
  	    </option>
-@@ -72,9 +72,9 @@
+@@ -72,10 +72,10 @@
  		<_short>Fill Color</_short>
  		<_long>Fill color used for rectangle resize mode</_long>
  		<default>
 -		    <red>0xfbfb</red>
 -		    <green>0x8b8b</green>
 -		    <blue>0x0</blue>
-+		    <red>0x3939</red>
-+		    <green>0x4c4c</green>
-+		    <blue>0x2929</blue>
- 		    <alpha>0x1919</alpha>
+-		    <alpha>0x1919</alpha>
++		    <red>0x1616</red>
++		    <green>0xa0a0</green>
++		    <blue>0x8585</blue>
++		    <alpha>0x4f4f</alpha>
  		</default>
  	    </option>
+ 	    <subgroup>