juju-gui

Merge lp:~bac/juju-gui/button-radii-2 into lp:juju-gui/experimental

  1. button-radii-2
  2. Merge into trunk
Proposed by Brad Crittenden
Status: Merged
Merged at revision: 229
Proposed branch: lp:~bac/juju-gui/button-radii-2
Merge into: lp:juju-gui/experimental
Diff against target: 75 lines (+15/-14)
1 file modified
lib/views/stylesheet.less (+15/-14)
To merge this branch: bzr merge lp:~bac/juju-gui/button-radii-2
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+133339@code.launchpad.net

Description of the change

Button corner CSS tweaks.

Changes suggested by Matt to get closer to image assets.

Self-reviewed.

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) wrote :

Please take a look.

Revision history for this message
Brad Crittenden (bac) wrote :

*** Submitted:

Button corner CSS tweaks.

Changes suggested by Matt to get closer to image assets.

Self-reviewed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
10@charm-panel-deploy-button-color: #dd4814;10@charm-panel-deploy-button-color: #dd4814;
11@charm-panel-deploy-button-bottom-gradient: #e65c19;11@charm-panel-deploy-button-bottom-gradient: #e65c19;
12@charm-panel-deploy-button-shadow: #8a2d0c;12@charm-panel-deploy-button-shadow: #8a2d0c;
13@charm-panel-cancel-button-color: #b8b8b8;13@charm-panel-cancel-button-color: #93a39f;
14@charm-panel-cancel-button-bottom-gradient: #a3a39f;14@charm-panel-cancel-button-bottom-gradient: #818080;
15@charm-panel-cancel-button-shadow: #515050;15@charm-panel-cancel-button-shadow: #515050;
16@charm-panel-background-color: #eeeeee;16@charm-panel-background-color: #eeeeee;
17@charm-panel-border-color: #BEBEBE;17@charm-panel-border-color: #BEBEBE;
@@ -37,14 +37,15 @@
37 background-image: linear-gradient(top, @gradient-start, @gradient-end);37 background-image: linear-gradient(top, @gradient-start, @gradient-end);
38 background-repeat: repeat-x;38 background-repeat: repeat-x;
39 -moz-box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,39 -moz-box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,
40 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;40 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
41 -webkit-box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,41 -webkit-box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,
42 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;42 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
43 box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,43 box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,
44 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;44 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
45 -moz-border-radius: ~"4px / 7px";45 @border-radii: ~"6px / 7px";
46 -webkit-border-radius: ~"4px / 7px";46 -moz-border-radius: @border-radii;
47 border-radius: ~"4px / 7px";47 -webkit-border-radius: @border-radii;
48 border-radius: @border-radii;
48 border: none;49 border: none;
49}50}
5051
@@ -805,13 +806,13 @@
805 .btn.deploy {806 .btn.deploy {
806 margin-top: 5px;807 margin-top: 5px;
807 margin-left: 5px;808 margin-left: 5px;
808 vertical-align: middle;809 text-shadow: none;
809 background-position: 0 0; /* Needed to defeat bootstrap btn:hover 0 -15px*/810 background-position: 0 0; /* Needed to defeat bootstrap btn:hover 0 -15px*/
810 .create-button(@charm-panel-deploy-button-color, @charm-panel-deploy-button-bottom-gradient,811 .create-button(@charm-panel-deploy-button-color, @charm-panel-deploy-button-bottom-gradient,
811 @charm-panel-deploy-button-shadow, 0px);812 @charm-panel-deploy-button-shadow, 0px);
812 &:active {813 &:active {
813 .create-button(@charm-panel-deploy-button-color, @charm-panel-deploy-button-color,814 .create-button(@charm-panel-deploy-button-color, @charm-panel-deploy-button-color,
814 @charm-panel-deploy-button-shadow, 1px);815 @charm-panel-deploy-button-shadow, 1px);
815 }816 }
816 }817 }
817818
@@ -820,7 +821,7 @@
820 }821 }
821 .btn.cancel {822 .btn.cancel {
822 color: white;823 color: white;
823 text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.5);824 text-shadow: none;
824 margin-top: 5px;825 margin-top: 5px;
825 background-repeat: no-repeat;826 background-repeat: no-repeat;
826 background-color: transparent;827 background-color: transparent;
@@ -828,10 +829,10 @@
828 background-position: 0 0; /* Needed to defeat bootstrap btn:hover 0 -15px*/829 background-position: 0 0; /* Needed to defeat bootstrap btn:hover 0 -15px*/
829 background-image: url(/juju-ui/assets/images/cancel-button.png);830 background-image: url(/juju-ui/assets/images/cancel-button.png);
830 .create-button(@charm-panel-cancel-button-color, @charm-panel-cancel-button-bottom-gradient,831 .create-button(@charm-panel-cancel-button-color, @charm-panel-cancel-button-bottom-gradient,
831 @charm-panel-cancel-button-shadow, 0px);832 @charm-panel-cancel-button-shadow, 0px);
832 &:active {833 &:active {
833 .create-button(@charm-panel-cancel-button-color, @charm-panel-cancel-button-color,834 .create-button(@charm-panel-cancel-button-color, @charm-panel-cancel-button-color,
834 @charm-panel-cancel-button-shadow, 1px);835 @charm-panel-cancel-button-shadow, 1px);
835 }836 }
836 }837 }
837 .charm-panel-configure-buttons {838 .charm-panel-configure-buttons {

Subscribers

People subscribed via source and target branches