yellow team mailing list archive

[Brad Crittenden <bac@xxxxxxxxxxxxx>]

Brad Crittenden has proposed merging lp:~bac/juju-gui/button-radii-2 into lp:juju-gui.

Requested reviews:
  Juju GUI Hackers (juju-gui)

For more details, see:
https://code.launchpad.net/~bac/juju-gui/button-radii-2/+merge/133339

Button corner CSS tweaks.

Changes suggested by Matt to get closer to image assets.

Self-reviewed.
-- 
https://code.launchpad.net/~bac/juju-gui/button-radii-2/+merge/133339
Your team Juju GUI Hackers is requested to review the proposed merge of lp:~bac/juju-gui/button-radii-2 into lp:juju-gui.

=== modified file 'lib/views/stylesheet.less'
--- lib/views/stylesheet.less	2012-11-07 18:25:14 +0000
+++ lib/views/stylesheet.less	2012-11-07 20:25:39 +0000
@@ -10,8 +10,8 @@
 @charm-panel-deploy-button-color: #dd4814;
 @charm-panel-deploy-button-bottom-gradient: #e65c19;
 @charm-panel-deploy-button-shadow: #8a2d0c;
-@charm-panel-cancel-button-color: #b8b8b8;
-@charm-panel-cancel-button-bottom-gradient: #a3a39f;
+@charm-panel-cancel-button-color: #93a39f;
+@charm-panel-cancel-button-bottom-gradient: #818080;
 @charm-panel-cancel-button-shadow: #515050;
 @charm-panel-background-color: #eeeeee;
 @charm-panel-border-color: #BEBEBE;
@@ -37,14 +37,15 @@
     background-image: linear-gradient(top, @gradient-start, @gradient-end);
     background-repeat: repeat-x;
     -moz-box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,
-	                 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
+                        2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
     -webkit-box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,
-	                    2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
+                           2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
     box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,
-	            2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
-    -moz-border-radius: ~"4px / 7px";
-    -webkit-border-radius: ~"4px / 7px";
-    border-radius: ~"4px / 7px";
+                   2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
+    @border-radii: ~"6px / 7px";
+    -moz-border-radius: @border-radii;
+    -webkit-border-radius: @border-radii;
+    border-radius: @border-radii;
     border: none;
 }
 
@@ -805,13 +806,13 @@
     .btn.deploy {
         margin-top: 5px;
         margin-left: 5px;
-        vertical-align: middle;
+        text-shadow: none;
         background-position: 0 0;     /* Needed to defeat bootstrap btn:hover 0 -15px*/
         .create-button(@charm-panel-deploy-button-color, @charm-panel-deploy-button-bottom-gradient,
-		       @charm-panel-deploy-button-shadow, 0px);
+                       @charm-panel-deploy-button-shadow, 0px);
         &:active {
             .create-button(@charm-panel-deploy-button-color, @charm-panel-deploy-button-color,
-			   @charm-panel-deploy-button-shadow, 1px);
+                           @charm-panel-deploy-button-shadow, 1px);
         }
     }
 
@@ -820,7 +821,7 @@
     }
     .btn.cancel {
         color: white;
-        text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.5);
+        text-shadow: none;
         margin-top: 5px;
         background-repeat: no-repeat;
         background-color: transparent;
@@ -828,10 +829,10 @@
         background-position: 0 0;     /* Needed to defeat bootstrap btn:hover 0 -15px*/
         background-image: url(/juju-ui/assets/images/cancel-button.png);
         .create-button(@charm-panel-cancel-button-color, @charm-panel-cancel-button-bottom-gradient,
-		       @charm-panel-cancel-button-shadow, 0px);
+                       @charm-panel-cancel-button-shadow, 0px);
         &:active {
             .create-button(@charm-panel-cancel-button-color, @charm-panel-cancel-button-color,
-			   @charm-panel-cancel-button-shadow, 1px);
+                           @charm-panel-cancel-button-shadow, 1px);
         }
     }
     .charm-panel-configure-buttons {