Merge lp:~rockstar/phazr/images into lp:phazr

Proposed by Paul Hummer
Status: Merged
Approved by: Paul Hummer
Approved revision: 11
Merged at revision: 5
Proposed branch: lp:~rockstar/phazr/images
Merge into: lp:phazr
Prerequisite: lp:~rockstar/phazr/close-overlay
Diff against target: 65 lines (+19/-4)
3 files modified
src/css/phazr.css (+16/-1)
src/js/formplugin/formplugin.js (+2/-2)
src/js/modalplugin/modalplugin.js (+1/-1)
To merge this branch: bzr merge lp:~rockstar/phazr/images
Reviewer Review Type Date Requested Status
Deryck Hodge code Approve
Review via email: mp+54460@code.launchpad.net

Commit message

Add images for okay, cancel, and close

Description of the change

This branch adds the images and css for Okay, Cancel, and Close. These images are a bit dark, and probably need some work (they didn't shrink from their original 128x128 size very well). I wanted to stick them in, and if we have time to come back and fix them before release, we can do that.

To post a comment you must log in.
Revision history for this message
Deryck Hodge (deryck) wrote :

I'm ok with this. I agree that the images could be touched up perhaps. And there's some weird spacing between the cancel and save icons when sat beside each other. But as a first pass to cleanup later, I think it's fine.

At some point, we should add docs about how to easily re-skin or use different images. Images are such a personal issue. I like these, but not every project will want them.

Cheers,
deryck

review: Approve (code)
Revision history for this message
Paul Hummer (rockstar) wrote :

The prerequisite lp:~rockstar/phazr/close-overlay has not yet been merged into lp:phazr.

Revision history for this message
Paul Hummer (rockstar) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'src/css/images'
2=== added file 'src/css/images/cancel.png'
3Binary files src/css/images/cancel.png 1970-01-01 00:00:00 +0000 and src/css/images/cancel.png 2011-04-05 03:50:53 +0000 differ
4=== added file 'src/css/images/close.png'
5Binary files src/css/images/close.png 1970-01-01 00:00:00 +0000 and src/css/images/close.png 2011-04-05 03:50:53 +0000 differ
6=== added file 'src/css/images/okay.png'
7Binary files src/css/images/okay.png 1970-01-01 00:00:00 +0000 and src/css/images/okay.png 2011-04-05 03:50:53 +0000 differ
8=== modified file 'src/css/phazr.css'
9--- src/css/phazr.css 2011-03-22 04:38:18 +0000
10+++ src/css/phazr.css 2011-04-05 03:50:53 +0000
11@@ -36,9 +36,24 @@
12 text-align: right;
13 }
14 div.yui3-overlay div.yui3-overlay-controls a {
15- margin-left: 4px;
16+ display: inline-block;
17+ height: 32px;
18+ width: 32px;
19+}
20+div.yui3-overlay div.yui3-overlay-controls a#save-control {
21+ background: url('images/okay.png') 0 0 no-repeat;
22+}
23+div.yui3-overlay div.yui3-overlay-controls a#cancel-control {
24+ background: url('images/cancel.png') 0 0 no-repeat;
25 }
26 div.yui3-overlay div.yui3-overlay-close {
27 float: right;
28 margin: 5px 5px 0 0;
29 }
30+div.yui3-overlay div.yui3-overlay-close a.yui3-overlay-close-button {
31+ background: url('images/close.png') 0 0 no-repeat;
32+ cursor: pointer;
33+ display: inline-block;
34+ height: 20px;
35+ width: 20px;
36+}
37
38=== modified file 'src/js/formplugin/formplugin.js'
39--- src/js/formplugin/formplugin.js 2011-03-21 20:14:02 +0000
40+++ src/js/formplugin/formplugin.js 2011-04-05 03:50:53 +0000
41@@ -16,9 +16,9 @@
42 renderUI: function() {
43 var host = this.get('host'),
44 saveButton = Y.Node.create(
45- '<a class="clickable" id="save-control">Save</a>'),
46+ '<a class="clickable" id="save-control"></a>'),
47 cancelButton = Y.Node.create(
48- '<a class="clickable" id="cancel-control">Cancel</a>'),
49+ '<a class="clickable" id="cancel-control"></a>'),
50 controls = Y.Node.create('<div></div>');
51 controls.addClass(host.getClassName() + '-controls');
52 controls.appendChild(saveButton);
53
54=== modified file 'src/js/modalplugin/modalplugin.js'
55--- src/js/modalplugin/modalplugin.js 2011-03-22 04:36:17 +0000
56+++ src/js/modalplugin/modalplugin.js 2011-04-05 03:50:53 +0000
57@@ -7,7 +7,7 @@
58 },
59 renderUI: function() {
60 var host = this.get('host'),
61- closeButton = Y.Node.create('<a>close</a>'),
62+ closeButton = Y.Node.create('<a></a>'),
63 closeContainer = Y.Node.create('<div></div>'),
64 className = host.getClassName();
65 closeButton.addClass(className + '-close-button');

Subscribers

People subscribed via source and target branches

to all changes: