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
1=== modified file 'lib/views/stylesheet.less'
2--- lib/views/stylesheet.less 2012-11-07 18:25:14 +0000
3+++ lib/views/stylesheet.less 2012-11-07 20:25:39 +0000
4@@ -10,8 +10,8 @@
5 @charm-panel-deploy-button-color: #dd4814;
6 @charm-panel-deploy-button-bottom-gradient: #e65c19;
7 @charm-panel-deploy-button-shadow: #8a2d0c;
8-@charm-panel-cancel-button-color: #b8b8b8;
9-@charm-panel-cancel-button-bottom-gradient: #a3a39f;
10+@charm-panel-cancel-button-color: #93a39f;
11+@charm-panel-cancel-button-bottom-gradient: #818080;
12 @charm-panel-cancel-button-shadow: #515050;
13 @charm-panel-background-color: #eeeeee;
14 @charm-panel-border-color: #BEBEBE;
15@@ -37,14 +37,15 @@
16 background-image: linear-gradient(top, @gradient-start, @gradient-end);
17 background-repeat: repeat-x;
18 -moz-box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,
19- 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
20+ 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
21 -webkit-box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,
22- 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
23+ 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
24 box-shadow: 0 (@v-pos + 3) @blur -@blur @shadow-color inset,
25- 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
26- -moz-border-radius: ~"4px / 7px";
27- -webkit-border-radius: ~"4px / 7px";
28- border-radius: ~"4px / 7px";
29+ 2px 0 3px -2px @shadow-color inset, -2px 0 3px -2px @shadow-color inset;
30+ @border-radii: ~"6px / 7px";
31+ -moz-border-radius: @border-radii;
32+ -webkit-border-radius: @border-radii;
33+ border-radius: @border-radii;
34 border: none;
35 }
36
37@@ -805,13 +806,13 @@
38 .btn.deploy {
39 margin-top: 5px;
40 margin-left: 5px;
41- vertical-align: middle;
42+ text-shadow: none;
43 background-position: 0 0; /* Needed to defeat bootstrap btn:hover 0 -15px*/
44 .create-button(@charm-panel-deploy-button-color, @charm-panel-deploy-button-bottom-gradient,
45- @charm-panel-deploy-button-shadow, 0px);
46+ @charm-panel-deploy-button-shadow, 0px);
47 &:active {
48 .create-button(@charm-panel-deploy-button-color, @charm-panel-deploy-button-color,
49- @charm-panel-deploy-button-shadow, 1px);
50+ @charm-panel-deploy-button-shadow, 1px);
51 }
52 }
53
54@@ -820,7 +821,7 @@
55 }
56 .btn.cancel {
57 color: white;
58- text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.5);
59+ text-shadow: none;
60 margin-top: 5px;
61 background-repeat: no-repeat;
62 background-color: transparent;
63@@ -828,10 +829,10 @@
64 background-position: 0 0; /* Needed to defeat bootstrap btn:hover 0 -15px*/
65 background-image: url(/juju-ui/assets/images/cancel-button.png);
66 .create-button(@charm-panel-cancel-button-color, @charm-panel-cancel-button-bottom-gradient,
67- @charm-panel-cancel-button-shadow, 0px);
68+ @charm-panel-cancel-button-shadow, 0px);
69 &:active {
70 .create-button(@charm-panel-cancel-button-color, @charm-panel-cancel-button-color,
71- @charm-panel-cancel-button-shadow, 1px);
72+ @charm-panel-cancel-button-shadow, 1px);
73 }
74 }
75 .charm-panel-configure-buttons {

Subscribers

People subscribed via source and target branches