Merge lp:~christhehorton/salience/round_glossy_buttons_branch into lp:salience

[Christopher Kyle Horton]

Make buttons have rounded ends, apply gloss to anything clickable, and reduce border contrast.

Buttons in this branch now have:
* Rounded ends
* Gloss (applied to anything meant to be clickable)
* Less noticeable borders (reduction in contrast for a subtler look)

This branch represents a major style change from the current look in trunk.

[lp:~christhehorton/salience/round_glossy_buttons_branch]

103. By Christopher Kyle Horton on 2012-09-03

Change GTK+3 sliders to look more like the GTK+2 ones, without using an image.

104. By Christopher Kyle Horton on 2012-09-03

Remove seemingly useless border code for now.

105. By Christopher Kyle Horton on 2012-09-03

Slightly tone down button gloss a bit more.

106. By Christopher Kyle Horton on 2012-09-03

Use square buttons in Calculator.

107. By Christopher Kyle Horton on 2012-09-03

Give the entry area in Calculator an indented look.

[Christopher Kyle Horton (christhehorton)]

review: Disapprove

[Aditya V (kroq-gar78)]

Wait, why disapprove?

[Christopher Kyle Horton (christhehorton)]

I eventually came to the conclusion that these changes just didn't quite
fit our overall vision for Salience. The disapproval merely indicates that
we will not accept these particular changes.

I am turning my attention back to trunk and the bug fix branches.
On Sep 6, 2012 6:31 PM, "kroq-gar78" <email address hidden> wrote:

> Wait, why disapprove?
>
> --
>
> https://code.launchpad.net/~christhehorton/salience/round_glossy_buttons_branch/+merge/122424
> You are the owner of
> lp:~christhehorton/salience/round_glossy_buttons_branch.
>

[Aditya V (kroq-gar78)]

Ah I see. If you want, you can also set it to "Work in progress".

Sincerely,
kroq-gar78

On Thu, Sep 6, 2012 at 6:10 PM, Christopher Kyle Horton <
<email address hidden>> wrote:

> I eventually came to the conclusion that these changes just didn't quite
> fit our overall vision for Salience. The disapproval merely indicates that
> we will not accept these particular changes.
>
> I am turning my attention back to trunk and the bug fix branches.
> On Sep 6, 2012 6:31 PM, "kroq-gar78" <email address hidden> wrote:
>
> > Wait, why disapprove?
> >
> > --
> >
> >
> https://code.launchpad.net/~christhehorton/salience/round_glossy_buttons_branch/+merge/122424
> > You are the owner of
> > lp:~christhehorton/salience/round_glossy_buttons_branch.
> >
>
> --
>
> https://code.launchpad.net/~christhehorton/salience/round_glossy_buttons_branch/+merge/122424
> Your team Salience Team is subscribed to branch lp:salience.
>

Unmerged revisions

107. By Christopher Kyle Horton on 2012-09-03

Give the entry area in Calculator an indented look.

106. By Christopher Kyle Horton on 2012-09-03

Use square buttons in Calculator.

105. By Christopher Kyle Horton on 2012-09-03

Slightly tone down button gloss a bit more.

104. By Christopher Kyle Horton on 2012-09-03

Remove seemingly useless border code for now.

103. By Christopher Kyle Horton on 2012-09-03

Change GTK+3 sliders to look more like the GTK+2 ones, without using an image.

102. By Christopher Kyle Horton on 2012-09-02

Merge from trunk (scale trough contrast adjustment).

101. By Christopher Kyle Horton on 2012-09-02

Merge from trunk (updated GTK+2 scales).

100. By Christopher Kyle Horton on 2012-09-02

Make entry box borders less noticeable.

99. By Christopher Kyle Horton on 2012-09-02

Unround GTK+2 spinbuttons.

98. By Christopher Kyle Horton on 2012-09-02

Merge from trunk (GTK+2 link color).

=== modified file 'gtk-2.0/Range/slider-bg-hover.svg'
--- gtk-2.0/Range/slider-bg-hover.svg	2012-07-08 23:19:26 +0000
+++ gtk-2.0/Range/slider-bg-hover.svg	2012-09-03 20:38:20 +0000
@@ -8,156 +8,184 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="20"
    height="20"
-   id="svg2">
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="slider-normal.svg">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3825"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3813">
-      <stop
-         id="stop3815"
-         style="stop-color:#ff4200;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3831"
-         style="stop-color:#ff4200;stop-opacity:0.49803922"
-         offset="0.91025639" />
-      <stop
-         id="stop3829"
-         style="stop-color:#ff4200;stop-opacity:0"
-         offset="1" />
+       id="linearGradient3877">
+      <stop
+         style="stop-color:#f13e00;stop-opacity:1;"
+         offset="0"
+         id="stop3879" />
+      <stop
+         id="stop3887"
+         offset="0.89999998"
+         style="stop-color:#f13e00;stop-opacity:1;" />
+      <stop
+         style="stop-color:#f13e00;stop-opacity:0;"
+         offset="1"
+         id="stop3881" />
     </linearGradient>
     <linearGradient
        id="linearGradient3796">
       <stop
-         id="stop3798"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         style="stop-color:#c8c8c8;stop-opacity:1;"
+         offset="0"
+         id="stop3798" />
+      <stop
+         id="stop3776"
+         offset="0.45269749"
+         style="stop-color:#505050;stop-opacity:1;" />
       <stop
          id="stop3800"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0.54000002" />
-      <stop
-         id="stop3802"
-         style="stop-color:#3c3c3c;stop-opacity:1"
-         offset="0.70255846" />
+         offset="0.46212858"
+         style="stop-color:#505050;stop-opacity:1;" />
+      <stop
+         style="stop-color:#1e1e1e;stop-opacity:1;"
+         offset="0.49503547"
+         id="stop3772" />
+      <stop
+         id="stop3778"
+         offset="0.63788778"
+         style="stop-color:#2b2b2b;stop-opacity:1;" />
+      <stop
+         style="stop-color:#505050;stop-opacity:1;"
+         offset="0.73210955"
+         id="stop3802" />
     </linearGradient>
     <linearGradient
        id="linearGradient3779">
       <stop
          id="stop3781"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="0" />
+         offset="0"
+         style="stop-color:#c8c8c8;stop-opacity:1;" />
       <stop
-         id="stop3792"
-         style="stop-color:#969696;stop-opacity:1"
-         offset="0.25071225" />
+         style="stop-color:#969696;stop-opacity:1;"
+         offset="0.25071225"
+         id="stop3792" />
       <stop
          id="stop3783"
-         style="stop-color:#141414;stop-opacity:1"
-         offset="0.44444442" />
+         offset="0.44444442"
+         style="stop-color:#141414;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3757">
       <stop
-         id="stop3759"
-         style="stop-color:#3c3c3c;stop-opacity:1"
-         offset="0" />
+         style="stop-color:#1e1e1e;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
       <stop
-         id="stop3761"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="0.625" />
+         style="stop-color:#969696;stop-opacity:1;"
+         offset="0.49833888"
+         id="stop3761" />
     </linearGradient>
     <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3775"
        x1="10"
        y1="18"
        x2="10"
        y2="2"
-       id="linearGradient3775"
-       xlink:href="#linearGradient3757"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3779"
+       id="radialGradient3777"
        cx="10"
        cy="6.9316244"
-       r="8.5"
        fx="10"
        fy="6.9316244"
-       id="radialGradient3777"
-       xlink:href="#linearGradient3779"
+       r="8.5"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.5294118,0,0,1.5294117,-5.2941179,-3.6013072)" />
     <filter
-       color-interpolation-filters="sRGB"
-       id="filter3785">
+       id="filter3785"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
       <feFlood
-         result="flood"
+         id="feFlood3787"
+         flood-opacity="0.5"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.5"
-         id="feFlood3787" />
+         result="flood" />
       <feComposite
+         id="feComposite3789"
          in2="SourceGraphic"
+         in="flood"
          operator="in"
-         in="flood"
-         result="composite1"
-         id="feComposite3789" />
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
+         id="feGaussianBlur3791"
+         in="composite"
          stdDeviation="2"
-         id="feGaussianBlur3791" />
+         result="blur" />
       <feOffset
-         result="offset"
+         id="feOffset3793"
+         dx="-2.47025e-15"
          dy="1"
-         dx="-2.47025e-15"
-         id="feOffset3793" />
+         result="offset" />
       <feComposite
+         id="feComposite3795"
          in2="offset"
+         in="SourceGraphic"
          operator="over"
-         in="SourceGraphic"
-         result="composite2"
-         id="feComposite3795" />
+         result="composite2" />
     </filter>
     <radialGradient
-       cx="10"
-       cy="6.8078303"
-       r="8.5"
-       fx="10"
-       fy="6.8078303"
+       inkscape:collect="always"
+       xlink:href="#linearGradient3796"
        id="radialGradient3788"
-       xlink:href="#linearGradient3796"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3772074,0,0,1.3418481,-3.7720742,-2.3011865)" />
-    <radialGradient
-       cx="10"
-       cy="10"
-       r="10"
-       fx="10"
-       fy="10"
-       id="radialGradient3819"
-       xlink:href="#linearGradient3813"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="10"
-       cy="10"
-       r="10"
-       fx="10"
-       fy="10"
-       id="radialGradient3827"
-       xlink:href="#linearGradient3813"
+       gradientTransform="matrix(2.3807487,0,0,2.3196239,-13.807487,-5.4353683)"
+       cx="10"
+       cy="3.2054198"
+       fx="10"
+       fy="3.2054198"
+       r="8.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3877"
+       id="radialGradient3885"
+       cx="10"
+       cy="10"
+       fx="10"
+       fy="10"
+       r="10"
        gradientUnits="userSpaceOnUse" />
   </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="10"
+     inkscape:cy="10"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="1"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -171,19 +199,39 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer2">
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1032.3622)">
     <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3885);fill-opacity:1.0;stroke:#fa7600;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3875"
+       sodipodi:cx="10"
+       sodipodi:cy="10"
+       sodipodi:rx="10"
+       sodipodi:ry="10"
        d="M 20,10 A 10,10 0 1 1 0,10 10,10 0 1 1 20,10 z"
-       id="path3811"
-       style="fill:url(#radialGradient3827);fill-opacity:1;stroke:url(#radialGradient3819);stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.39215686;stroke-dasharray:none" />
-  </g>
-  <g
-     transform="translate(0,-1032.3622)"
-     id="layer1">
-    <path
-       d="M 18,10 A 8,8 0 1 1 2,10 8,8 0 1 1 18,10 z"
+       transform="translate(0,1032.3622)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3788);fill-opacity:1;stroke:url(#linearGradient3775);stroke-width:0.80000000000000004;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2987"
+       sodipodi:cx="10"
+       sodipodi:cy="10"
+       sodipodi:rx="8"
+       sodipodi:ry="8"
+       d="m 18,10 c 0,4.418278 -3.581722,8 -8,8 -4.418278,0 -8,-3.581722 -8,-8 0,-4.418278 3.581722,-8 8,-8 4.418278,0 8,3.581722 8,8 z"
+       transform="translate(0,1032.3622)" />
+    <path
        transform="translate(0,1032.3622)"
-       id="path2987"
-       style="fill:url(#radialGradient3788);fill-opacity:1;stroke:url(#linearGradient3775);stroke-width:0.80000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       d="m 18,10 c 0,4.418278 -3.581722,8 -8,8 -4.418278,0 -8,-3.581722 -8,-8 0,-4.418278 3.581722,-8 8,-8 4.418278,0 8,3.581722 8,8 z"
+       sodipodi:ry="8"
+       sodipodi:rx="8"
+       sodipodi:cy="10"
+       sodipodi:cx="10"
+       id="path3799"
+       style="fill:#ffffff;fill-opacity:0.09803922;stroke:url(#linearGradient3775);stroke-width:0.80000000000000004;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
   </g>
 </svg>
 
=== modified file 'gtk-2.0/Range/slider-bg.svg'
--- gtk-2.0/Range/slider-bg.svg	2012-07-08 23:13:17 +0000
+++ gtk-2.0/Range/slider-bg.svg	2012-09-03 20:38:20 +0000
@@ -8,112 +8,159 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="20"
    height="20"
-   id="svg2">
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="slider-normal.svg">
   <defs
      id="defs4">
     <linearGradient
        id="linearGradient3796">
       <stop
-         id="stop3798"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         style="stop-color:#c8c8c8;stop-opacity:1;"
+         offset="0"
+         id="stop3798" />
+      <stop
+         id="stop3776"
+         offset="0.45269749"
+         style="stop-color:#505050;stop-opacity:1;" />
       <stop
          id="stop3800"
-         style="stop-color:#383838;stop-opacity:1"
-         offset="0.54000002" />
-      <stop
-         id="stop3802"
-         style="stop-color:#1e1e1e;stop-opacity:1"
-         offset="0.70255846" />
+         offset="0.46212858"
+         style="stop-color:#505050;stop-opacity:1;" />
+      <stop
+         style="stop-color:#1e1e1e;stop-opacity:1;"
+         offset="0.49503547"
+         id="stop3772" />
+      <stop
+         id="stop3778"
+         offset="0.63788778"
+         style="stop-color:#2b2b2b;stop-opacity:1;" />
+      <stop
+         style="stop-color:#505050;stop-opacity:1;"
+         offset="0.73210955"
+         id="stop3802" />
     </linearGradient>
     <linearGradient
        id="linearGradient3779">
       <stop
          id="stop3781"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="0" />
+         offset="0"
+         style="stop-color:#c8c8c8;stop-opacity:1;" />
       <stop
-         id="stop3792"
-         style="stop-color:#969696;stop-opacity:1"
-         offset="0.25071225" />
+         style="stop-color:#969696;stop-opacity:1;"
+         offset="0.25071225"
+         id="stop3792" />
       <stop
          id="stop3783"
-         style="stop-color:#141414;stop-opacity:1"
-         offset="0.44444442" />
+         offset="0.44444442"
+         style="stop-color:#141414;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3757">
       <stop
-         id="stop3759"
-         style="stop-color:#1e1e1e;stop-opacity:1"
-         offset="0" />
+         style="stop-color:#1e1e1e;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
       <stop
-         id="stop3761"
-         style="stop-color:#969696;stop-opacity:1"
-         offset="0.625" />
+         style="stop-color:#969696;stop-opacity:1;"
+         offset="0.49833888"
+         id="stop3761" />
     </linearGradient>
     <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3775"
        x1="10"
        y1="18"
        x2="10"
        y2="2"
-       id="linearGradient3775"
-       xlink:href="#linearGradient3757"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3779"
+       id="radialGradient3777"
        cx="10"
        cy="6.9316244"
-       r="8.5"
        fx="10"
        fy="6.9316244"
-       id="radialGradient3777"
-       xlink:href="#linearGradient3779"
+       r="8.5"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.5294118,0,0,1.5294117,-5.2941179,-3.6013072)" />
     <filter
-       color-interpolation-filters="sRGB"
-       id="filter3785">
+       id="filter3785"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
       <feFlood
-         result="flood"
+         id="feFlood3787"
+         flood-opacity="0.5"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.5"
-         id="feFlood3787" />
+         result="flood" />
       <feComposite
+         id="feComposite3789"
          in2="SourceGraphic"
+         in="flood"
          operator="in"
-         in="flood"
-         result="composite1"
-         id="feComposite3789" />
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
+         id="feGaussianBlur3791"
+         in="composite"
          stdDeviation="2"
-         id="feGaussianBlur3791" />
+         result="blur" />
       <feOffset
-         result="offset"
+         id="feOffset3793"
+         dx="-2.47025e-15"
          dy="1"
-         dx="-2.47025e-15"
-         id="feOffset3793" />
+         result="offset" />
       <feComposite
+         id="feComposite3795"
          in2="offset"
+         in="SourceGraphic"
          operator="over"
-         in="SourceGraphic"
-         result="composite2"
-         id="feComposite3795" />
+         result="composite2" />
     </filter>
     <radialGradient
-       cx="10"
-       cy="6.8078303"
-       r="8.5"
-       fx="10"
-       fy="6.8078303"
+       inkscape:collect="always"
+       xlink:href="#linearGradient3796"
        id="radialGradient3788"
-       xlink:href="#linearGradient3796"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3772074,0,0,1.3418481,-3.7720742,-2.3011865)" />
+       gradientTransform="matrix(2.3807487,0,0,2.3196239,-13.807487,-5.4353683)"
+       cx="10"
+       cy="3.2054198"
+       fx="10"
+       fy="3.2054198"
+       r="8.5" />
   </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="10"
+     inkscape:cy="10"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="1"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -127,12 +174,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     transform="translate(0,-1032.3622)"
-     id="layer1">
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1032.3622)">
     <path
-       d="M 18,10 A 8,8 0 1 1 2,10 8,8 0 1 1 18,10 z"
-       transform="translate(0,1032.3622)"
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3788);fill-opacity:1;stroke:url(#linearGradient3775);stroke-width:0.80000000000000004;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="path2987"
-       style="fill:url(#radialGradient3788);fill-opacity:1;stroke:url(#linearGradient3775);stroke-width:0.80000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       sodipodi:cx="10"
+       sodipodi:cy="10"
+       sodipodi:rx="8"
+       sodipodi:ry="8"
+       d="m 18,10 c 0,4.418278 -3.581722,8 -8,8 -4.418278,0 -8,-3.581722 -8,-8 0,-4.418278 3.581722,-8 8,-8 4.418278,0 8,3.581722 8,8 z"
+       transform="translate(0,1032.3622)" />
   </g>
 </svg>
 
=== modified file 'gtk-2.0/gtkrc'
--- gtk-2.0/gtkrc	2012-09-02 20:28:51 +0000
+++ gtk-2.0/gtkrc	2012-09-03 20:38:20 +0000
@@ -119,10 +119,10 @@
 	{
 		animation               = TRUE
 		arrowstyle              = 1
-		border_shades		    = { 1.15, 0.85 }
+		border_shades		        = { 1.1, 0.9 }
 		colorize_scrollbar	    = TRUE
 		contrast                = 1.1
-		default_button_color	= shade (1.05, @bg_color)
+		default_button_color	  = shade (1.05, @bg_color)
 		focusstyle              = 3
 		glazestyle              = 0
 		gradient_shades         = {1.26,1.09,1.08,0.80}
@@ -202,16 +202,23 @@
 	bg[INSENSITIVE]		    = shade (0.95, @bg_color)
 	
 	engine "murrine" {
-		border_shades           = {0.66, 0.32}
+		border_shades           = {0.9, 0.8}
 		contrast                = 1.20
-		gradient_shades         = {1.18,1.01,1.02,0.78}
+		gradient_shades         = {1.25,1.05,0.9,1.1}
 		lightborderstyle	= 1
 		lightborder_shade	= 1.26
+		roundness = 12
 		textstyle		= 4
 		text_shade		= 0.05		
 	}
 }
 
+style "murrine-spinbutton" = "murrine-button" {
+  engine "murrine" {
+    roundness = 3
+  }
+}
+
 style "murrine-button-content" = "murrine-wider" {
 
 	GtkWidget	::focus-line-width	= 0
@@ -287,7 +294,7 @@
 	GtkWidget	::focus-padding		= 1
 
 	bg[ACTIVE]				    = @bg_color
-	bg[NORMAL]				    = shade(0.5, @bg_color)
+	bg[NORMAL]				    = shade(0.9, @bg_color)
 	bg[PRELIGHT]				    = shade (1.13, @selected_bg_color)
 	bg[SELECTED]				    = shade (1.08, @selected_bg_color)
 	bg[INSENSITIVE]				    = @bg_color
@@ -678,7 +685,7 @@
 class "GtkInfoBar"                               style "murrine-default"
 class "GtkIconView"                              style "murrine-default"
 
-class "GtkSpinButton"                            style "murrine-button"
+class "GtkSpinButton"                            style "murrine-spinbutton"
 
 class "GtkScale"                                 style "murrine-scale"
 class "GtkVScale"                                style "murrine-scale"
 
=== added file 'gtk-3.0/apps/gcalctool.css'
--- gtk-3.0/apps/gcalctool.css	1970-01-01 00:00:00 +0000
+++ gtk-3.0/apps/gcalctool.css	2012-09-03 20:38:20 +0000
@@ -0,0 +1,18 @@
+/*************
+* Calculator *
+**************/
+
+/* gcalctool should have square buttons, not rounded */
+
+MathWindow .button {
+  border-radius:               3px;
+  -unico-focus-border-radius:  3;
+}
+
+MathDisplay {
+  background-image: -gtk-gradient (linear,
+    left top,
+    left bottom,
+    color-stop (0, shade (@bg_color, 0.9)),
+    color-stop (1, shade (@bg_color, 1.1)));
+}
 
=== modified file 'gtk-3.0/button.css'
--- gtk-3.0/button.css	2012-07-18 00:19:01 +0000
+++ gtk-3.0/button.css	2012-09-03 20:38:20 +0000
@@ -21,39 +21,45 @@
     background-image: -gtk-gradient (linear,
         left top,
         left bottom,
-        from (shade (@bg_dark_color, 0.86)),
-        to (shade (@bg_dark_color, 0.52)));
+        color-stop (0, mix (#ffffff, @bg_color, 0.8)),
+        color-stop (0.5, mix (#ffffff, @bg_color, 0.95)),
+        color-stop (0.55, @bg_color),
+        color-stop (0.8, shade (@bg_color, 0.9)),
+        color-stop (1, shade (@bg_color, 1.1)));
 
     -unico-border-gradient: -gtk-gradient (linear,
         left top, left bottom,
-        from (shade (@bg_color, 0.72)),
-        to (shade (@bg_color, 0.50)));
+        from (shade (@bg_color, 0.9)),
+        to (shade (@bg_color, 0.7)));
 }
 
 .button:hover {
 
     background-image: -gtk-gradient (linear,
-		     left top,
-		     left bottom,
-         from (shade (@bg_dark_color, 0.96)),
-         to (shade (@bg_dark_color, 0.62)));
+        left top,
+        left bottom,
+        color-stop (0, shade (mix (#ffffff, @bg_color, 0.8), 1.2)),
+        color-stop (0.5, shade (mix (#ffffff, @bg_color, 0.95), 1.2)),
+        color-stop (0.55, shade (@bg_color, 1.2)),
+        color-stop (0.8, shade (shade (@bg_color, 0.9), 1.2)),
+        color-stop (1, shade (shade (@bg_color, 1.1), 1.2)));
     
     -unico-border-gradient: -gtk-gradient (linear,
         left top, left bottom,
-        from (shade (@bg_color, 0.82)),
-        to (shade (@bg_color, 0.60)));
+        from (shade (@bg_color, 0.8)),
+        to (shade (@bg_color, 0.6)));
     
     color:	   @selected_fg_color;
     text-shadow:   0 -1 alpha (#000, 0.5),
-                   -1 -1 alpha (@selected_fg_color, 0.1),
-                   1 -1 alpha (@selected_fg_color, 0.1),
-                   -1 1 alpha (@selected_fg_color, 0.1),
-                   1 1 alpha (@selected_fg_color, 0.1);
+                   -1 -1 alpha (@selected_fg_color, 0.2),
+                   1 -1 alpha (@selected_fg_color, 0.2),
+                   -1 1 alpha (@selected_fg_color, 0.2),
+                   1 1 alpha (@selected_fg_color, 0.2);
     icon-shadow:   0 -1 alpha (#000, 0.5),
-                   -1 -1 alpha (@selected_fg_color, 0.1),
-                   1 -1 alpha (@selected_fg_color, 0.1),
-                   -1 1 alpha (@selected_fg_color, 0.1),
-                   1 1 alpha (@selected_fg_color, 0.1);
+                   -1 -1 alpha (@selected_fg_color, 0.2),
+                   1 -1 alpha (@selected_fg_color, 0.2),
+                   -1 1 alpha (@selected_fg_color, 0.2),
+                   1 1 alpha (@selected_fg_color, 0.2);
 }
 
 .button:active,
@@ -62,15 +68,18 @@
 .button:hover:active:focused {
 
     background-image: -gtk-gradient (linear,
-		     left top,
-		     left bottom,
-                     from (shade (@selected_bg_color, 0.75)),
-                     to (shade (@selected_bg_color, 1.24)));
+        left top,
+        left bottom,
+        color-stop (0, mix (#ffffff, @selected_bg_color, 0.8)),
+        color-stop (0.5, mix (#ffffff, @selected_bg_color, 0.95)),
+        color-stop (0.55, @selected_bg_color),
+        color-stop (0.8, shade (@selected_bg_color, 0.9)),
+        color-stop (1, shade (@selected_bg_color, 1.1)));
 
     -unico-border-gradient: -gtk-gradient (linear,
-                     left top, left bottom,
-                     from (shade (@bg_color, 0.54)),
-                     to (shade (@bg_color, 0.68)));
+        left top, left bottom,
+        from (shade (@selected_bg_color, 0.9)),
+        to (shade (@selected_bg_color, 0.7)));
 
     -unico-inner-stroke-width: 1px;
     -unico-inner-stroke-gradient: -gtk-gradient (linear,
@@ -80,15 +89,15 @@
 
     color: @selected_fg_color;
     text-shadow:   0 -1 alpha (#000, 0.5),
-                   -1 -1 alpha (@selected_fg_color, 0.1),
-                   1 -1 alpha (@selected_fg_color, 0.1),
-                   -1 1 alpha (@selected_fg_color, 0.1),
-                   1 1 alpha (@selected_fg_color, 0.1);
+                   -1 -1 alpha (@selected_fg_color, 0.2),
+                   1 -1 alpha (@selected_fg_color, 0.2),
+                   -1 1 alpha (@selected_fg_color, 0.2),
+                   1 1 alpha (@selected_fg_color, 0.2);
     icon-shadow:   0 -1 alpha (#000, 0.5),
-                   -1 -1 alpha (@selected_fg_color, 0.1),
-                   1 -1 alpha (@selected_fg_color, 0.1),
-                   -1 1 alpha (@selected_fg_color, 0.1),
-                   1 1 alpha (@selected_fg_color, 0.1);
+                   -1 -1 alpha (@selected_fg_color, 0.2),
+                   1 -1 alpha (@selected_fg_color, 0.2),
+                   -1 1 alpha (@selected_fg_color, 0.2),
+                   1 1 alpha (@selected_fg_color, 0.2);
 }
 
 .button:insensitive,
@@ -98,7 +107,7 @@
     background-color: transparent;
 
     -unico-outer-stroke-width: 0;
-    -unico-border-color: shade (@bg_color, 0.60);
+    -unico-border-color: shade (@bg_color, 0.7);
 }
 
 .button:active:insensitive,
@@ -129,16 +138,25 @@
 		    
     -unico-border-gradient: -gtk-gradient (linear,
                     left top, left bottom,
-                    from (shade (@bg_color, 0.76)),
-                    to (shade (@bg_color, 0.68)));
+                    from (shade (@bg_color, 0.9)),
+                    to (shade (@bg_color, 0.7)));
     
 }
 
 
 .toolbar .button {
-    padding:       2.5px;
-    text-shadow:   0 -1 alpha (#000, 0.75);
-    icon-shadow:   none;
+    padding:                    2.5px;
+    text-shadow:                0 -1 alpha (#000, 0.75);
+    icon-shadow:                none;
+    border-radius:              3px;
+    -unico-focus-border-radius: 3;
+}
+
+.toolbar .button:hover {
+    icon-shadow: -1 -1 alpha (@selected_fg_color, 0.2),
+                 1 -1 alpha (@selected_fg_color, 0.2),
+                 -1 1 alpha (@selected_fg_color, 0.2),
+                 1 1 alpha (@selected_fg_color, 0.2);
 }
 
 /*************************** 
@@ -231,3 +249,11 @@
                      from (#dd3b27),
                      to (#791235));
 }
+
+/* Don't round combobox buttons */
+
+GtkComboBox.combobox-entry .button, 
+GtkComboBoxText.combobox-entry .button {
+    -unico-focus-border-radius: 3;
+    border-radius:  3px;
+}
 
=== modified file 'gtk-3.0/gtk-widgets.css'
--- gtk-3.0/gtk-widgets.css	2012-08-04 07:53:52 +0000
+++ gtk-3.0/gtk-widgets.css	2012-09-03 20:38:20 +0000
@@ -9,9 +9,9 @@
     -GtkWidget-separator-height: 2;
 
     -unico-focus-border-color:             alpha (@selected_bg_color, 0.9);
-    -unico-focus-border-radius:              2;
-    -unico-focus-fill-color:                alpha (#FFF, 0.0);
-    -unico-focus-outer-stroke-color:        alpha (@selected_bg_color, 0.45);
+    -unico-focus-border-radius:            3;
+    -unico-focus-fill-color:               alpha (#FFF, 0.0);
+    -unico-focus-outer-stroke-color:       alpha (@selected_bg_color, 0.45);
 
     -GtkWindow-resize-grip-height: 0;
     -GtkWindow-resize-grip-width: 0;
@@ -218,26 +218,31 @@
 .view,
 column-header .button {
         border-radius:                              0;
+        -unico-focus-border-radius:            0;
 }
 
 /* Slightly rounded */
-.button,
 .check,
 .entry,
 .notebook,
 .notebook tab .button,
-GtkProgressBar,
+GtkSpinButton.button,
 GtkSwitch,
 GtkSwitch.slider,
-GtkSwitch.trough {
-        border-radius:                              2.5px;
+GtkSwitch.trough,
+GtkProgressBar {
+        border-radius:                              3px;
+        -unico-focus-border-radius:            3;
 }
 
 /* Round */
+.button,
 .help_button,
 .radio,
-GtkScale.trough {
+GtkScale.trough,
+GtkScale.slider {
         border-radius:                              12px;
+        -unico-focus-border-radius:            12;
 }
 
 /*************
@@ -1223,6 +1228,8 @@
 @import url("sidebar.css");
 @import url("scale.css");
 @import url("scrollbar.css");
+@import url("spin_button.css");
+@import url("switch.css");
 @import url("toolbar.css");
 @import url("infobar.css");
 @import url("panel.css");
@@ -1231,6 +1238,7 @@
 @import url("check_and_radio.css");
 @import url("unity.css");
 @import url("unity-greeter.css");
+@import url("apps/gcalctool.css");
 @import url("apps/contacts.css");
 @import url("apps/gnome-terminal.css");
 @import url("apps/nautilus.css");
 
=== modified file 'gtk-3.0/scale.css'
--- gtk-3.0/scale.css	2012-07-06 04:45:53 +0000
+++ gtk-3.0/scale.css	2012-09-03 20:38:20 +0000
@@ -3,18 +3,32 @@
  ************/
 GtkScale {
     border-width:               1px;
-    -GtkScale-slider-length:     20;
-    -GtkRange-slider-width:     20;
+    -GtkScale-slider-length:     18;
+    -GtkRange-slider-width:     18;
     -GtkRange-trough-border:    1;
 }
 
 GtkScale.slider {
-    background-image: url("assets/scale-slider.svg");
+    background-image: -gtk-gradient (linear,
+        left top,
+        left bottom,
+        color-stop (0, mix (#ffffff, @bg_color, 0.8)),
+        color-stop (0.5, mix (#ffffff, @bg_color, 0.95)),
+        color-stop (0.55, @bg_color),
+        color-stop (0.8, shade (@bg_color, 0.9)),
+        color-stop (1, shade (@bg_color, 1.1)));
 }
 
 .menubar .menuitem GtkScale.slider:hover,
 GtkScale.slider:hover {
-    background-image: url("assets/scale-slider-hover.svg");
+    background-image: -gtk-gradient (linear,
+        left top,
+        left bottom,
+        color-stop (0, shade (mix (#ffffff, @bg_color, 0.8), 1.2)),
+        color-stop (0.5, shade (mix (#ffffff, @bg_color, 0.95), 1.2)),
+        color-stop (0.55, shade (@bg_color, 1.2)),
+        color-stop (0.8, shade (shade (@bg_color, 0.9), 1.2)),
+        color-stop (1, shade (shade (@bg_color, 1.1), 1.2)));
 }
 
 GtkScale.scale-has-marks-below.slider.horizontal {
 
=== added file 'gtk-3.0/spin_button.css'
--- gtk-3.0/spin_button.css	1970-01-01 00:00:00 +0000
+++ gtk-3.0/spin_button.css	2012-09-03 20:38:20 +0000
@@ -0,0 +1,50 @@
+/**************
+* Spin button *
+***************/
+
+GtkSpinButton.button,
+.spinbutton.button,
+.spinbutton.button:focused {
+    background-image: -gtk-gradient (linear,
+        left top,
+        left bottom,
+        color-stop (0, mix (#ffffff, @bg_color, 0.75)),
+        color-stop (0.5, mix (#ffffff, @bg_color, 0.95)),
+        color-stop (0.55, @bg_color),
+        color-stop (0.8, shade (@bg_color, 0.9)),
+        color-stop (1, shade (@bg_color, 1.1)));
+}
+
+GtkSpinButton.button:hover,
+.spinbutton.button:hover {
+    background-image: -gtk-gradient (linear,
+        left top,
+        left bottom,
+        color-stop (0, shade (mix (#ffffff, @bg_color, 0.75), 1.2)),
+        color-stop (0.5, shade (mix (#ffffff, @bg_color, 0.95), 1.2)),
+        color-stop (0.55, shade (@bg_color, 1.2)),
+        color-stop (0.8, shade (shade (@bg_color, 0.9), 1.2)),
+        color-stop (1, shade (shade (@bg_color, 1.1), 1.2)));
+}
+
+GtkSpinButton.button:active,
+GtkSpinButton.button:active:focused,
+GtkSpinButton.button:hover:active,
+GtkSpinButton.button:hover:active:focused {
+    background-image: -gtk-gradient (linear,
+        left top,
+        left bottom,
+        color-stop (0, mix (#ffffff, @selected_bg_color, 0.75)),
+        color-stop (0.5, mix (#ffffff, @selected_bg_color, 0.95)),
+        color-stop (0.55, @selected_bg_color),
+        color-stop (0.8, shade (@selected_bg_color, 0.9)),
+        color-stop (1, shade (@selected_bg_color, 1.1)));
+}
+
+.spinbutton.button* {
+  border-radius: 0 0 0 0;
+}
+
+.spinbutton.button:nth-child(last) {
+  border-radius: 0 3px 3px 0;
+}
 
=== added file 'gtk-3.0/switch.css'
--- gtk-3.0/switch.css	1970-01-01 00:00:00 +0000
+++ gtk-3.0/switch.css	2012-09-03 20:38:20 +0000
@@ -0,0 +1,43 @@
+/*********
+* Switch *
+**********/
+
+GtkSwitch {
+    -unico-focus-border-radius: 3;
+}
+
+GtkSwitch.slider {
+    background-image: -gtk-gradient (linear,
+        left top,
+        left bottom,
+        color-stop (0, mix (#ffffff, @bg_color, 0.75)),
+        color-stop (0.5, mix (#ffffff, @bg_color, 0.95)),
+        color-stop (0.55, @bg_color),
+        color-stop (0.8, shade (@bg_color, 0.9)),
+        color-stop (1, shade (@bg_color, 1.1)));
+}
+
+GtkSwitch.slider:hover {
+    background-image: -gtk-gradient (linear,
+        left top,
+        left bottom,
+        color-stop (0, shade (mix (#ffffff, @bg_color, 0.75), 1.2)),
+        color-stop (0.5, shade (mix (#ffffff, @bg_color, 0.95), 1.2)),
+        color-stop (0.55, shade (@bg_color, 1.2)),
+        color-stop (0.8, shade (shade (@bg_color, 0.9), 1.2)),
+        color-stop (1, shade (shade (@bg_color, 1.1), 1.2)));
+}
+
+GtkSwitch.slider:active,
+GtkSwitch.slider:active:focused,
+GtkSwitch.slider:hover:active,
+GtkSwitch.slider:hover:active:focused {
+    background-image: -gtk-gradient (linear,
+        left top,
+        left bottom,
+        color-stop (0, mix (#ffffff, @selected_bg_color, 0.75)),
+        color-stop (0.5, mix (#ffffff, @selected_bg_color, 0.95)),
+        color-stop (0.55, @selected_bg_color),
+        color-stop (0.8, shade (@selected_bg_color, 0.9)),
+        color-stop (1, shade (@selected_bg_color, 1.1)));
+}
 
=== modified file 'metacity-1/close.png'
 Binary files metacity-1/close.png	2012-07-23 05:03:37 +0000 and metacity-1/close.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/close_focused_prelight.png'
 Binary files metacity-1/close_focused_prelight.png	2012-07-23 05:03:37 +0000 and metacity-1/close_focused_prelight.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/close_focused_pressed.png'
 Binary files metacity-1/close_focused_pressed.png	2012-07-23 05:03:37 +0000 and metacity-1/close_focused_pressed.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/maximize.png'
 Binary files metacity-1/maximize.png	2012-06-25 05:36:11 +0000 and metacity-1/maximize.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/maximize_focused_prelight.png'
 Binary files metacity-1/maximize_focused_prelight.png	2012-06-25 05:36:11 +0000 and metacity-1/maximize_focused_prelight.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/maximize_focused_pressed.png'
 Binary files metacity-1/maximize_focused_pressed.png	2012-06-25 05:36:11 +0000 and metacity-1/maximize_focused_pressed.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/minimize.png'
 Binary files metacity-1/minimize.png	2012-06-25 05:36:11 +0000 and metacity-1/minimize.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/minimize_focused_prelight.png'
 Binary files metacity-1/minimize_focused_prelight.png	2012-06-25 05:36:11 +0000 and metacity-1/minimize_focused_prelight.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/minimize_focused_pressed.png'
 Binary files metacity-1/minimize_focused_pressed.png	2012-06-25 05:36:11 +0000 and metacity-1/minimize_focused_pressed.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/unmaximize.png'
 Binary files metacity-1/unmaximize.png	2012-06-25 05:36:11 +0000 and metacity-1/unmaximize.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/unmaximize_focused_prelight.png'
 Binary files metacity-1/unmaximize_focused_prelight.png	2012-06-25 05:36:11 +0000 and metacity-1/unmaximize_focused_prelight.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'metacity-1/unmaximize_focused_pressed.png'
 Binary files metacity-1/unmaximize_focused_pressed.png	2012-06-25 05:36:11 +0000 and metacity-1/unmaximize_focused_pressed.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'unity/close.png'
 Binary files unity/close.png	2012-07-23 05:03:37 +0000 and unity/close.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'unity/close_focused_prelight.png'
 Binary files unity/close_focused_prelight.png	2012-07-23 05:03:37 +0000 and unity/close_focused_prelight.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'unity/close_focused_pressed.png'
 Binary files unity/close_focused_pressed.png	2012-07-23 05:03:37 +0000 and unity/close_focused_pressed.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'unity/minimize.png'
 Binary files unity/minimize.png	2012-06-25 05:19:52 +0000 and unity/minimize.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'unity/minimize_focused_prelight.png'
 Binary files unity/minimize_focused_prelight.png	2012-06-25 05:19:52 +0000 and unity/minimize_focused_prelight.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'unity/minimize_focused_pressed.png'
 Binary files unity/minimize_focused_pressed.png	2012-06-25 05:19:52 +0000 and unity/minimize_focused_pressed.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'unity/unmaximize.png'
 Binary files unity/unmaximize.png	2012-06-25 05:19:52 +0000 and unity/unmaximize.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'unity/unmaximize_focused_prelight.png'
 Binary files unity/unmaximize_focused_prelight.png	2012-06-25 05:19:52 +0000 and unity/unmaximize_focused_prelight.png	2012-09-03 20:38:20 +0000 differ
=== modified file 'unity/unmaximize_focused_pressed.png'
 Binary files unity/unmaximize_focused_pressed.png	2012-06-25 05:19:52 +0000 and unity/unmaximize_focused_pressed.png	2012-09-03 20:38:20 +0000 differ