phazr

Merge lp:~rockstar/phazr/css-builder into lp:phazr

  1. css-builder
  2. Merge into phazr
Proposed by Paul Hummer
Status: Merged
Merged at revision: 14
Proposed branch: lp:~rockstar/phazr/css-builder
Merge into: lp:phazr
Diff against target: 461 lines (+54/-341)
8 files modified
Makefile (+3/-3)
assets/cancel.svg (+0/-90)
assets/close.svg (+0/-90)
assets/ok.svg (+0/-90)
src/css/phazr.css (+0/-67)
src/phazroverlay/assets/phazroverlay-core.css (+49/-0)
src/phazroverlay/build.properties (+1/-0)
src/phazroverlay/js/overlay.js (+1/-1)
To merge this branch: bzr merge lp:~rockstar/phazr/css-builder
Reviewer Review Type Date Requested Status
Deryck Hodge code Approve
Review via email: mp+72825@code.launchpad.net

Description of the change

This branch adds support for using the YUI Builder on the CSS. While working on the CSS, I found lots of CSS rules that I wasn't using.

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

Looks good. Builds fine locally for me.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2011-08-24 22:33:33 +0000
+++ Makefile 2011-08-25 04:51:23 +0000
@@ -5,13 +5,13 @@
5builder: ../builder5builder: ../builder
66
7phazr-overlay: src/phazroverlay/build.properties src/phazroverlay/js/overlay.js builder7phazr-overlay: src/phazroverlay/build.properties src/phazroverlay/js/overlay.js builder
8 cd src/phazroverlay; ant build8 cd src/phazroverlay; ant build deploybuild deployassets
99
10phazr-editable: src/editableplugin/build.properties src/editableplugin/js/editable.js builder10phazr-editable: src/editableplugin/build.properties src/editableplugin/js/editable.js builder
11 cd src/editableplugin; ant build11 cd src/editableplugin; ant build deploybuild deployassets
1212
13phazr-formplugin: src/formplugin/build.properties src/formplugin/js/form.js builder13phazr-formplugin: src/formplugin/build.properties src/formplugin/js/form.js builder
14 cd src/formplugin; ant build14 cd src/formplugin; ant build deploybuild deployassets
1515
16clean:16clean:
17 rm -rf build/*17 rm -rf build/*
1818
=== removed directory 'assets'
=== removed file 'assets/cancel.svg'
--- assets/cancel.svg 2011-05-28 20:24:38 +0000
+++ assets/cancel.svg 1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12 width="128"
13 height="128"
14 id="svg2985"
15 version="1.1"
16 inkscape:version="0.48.1 r9760"
17 sodipodi:docname="close.svg">
18 <defs
19 id="defs2987" />
20 <sodipodi:namedview
21 id="base"
22 pagecolor="#ffffff"
23 bordercolor="#666666"
24 borderopacity="1.0"
25 inkscape:pageopacity="0.0"
26 inkscape:pageshadow="2"
27 inkscape:zoom="2.8284271"
28 inkscape:cx="61.841334"
29 inkscape:cy="80.280491"
30 inkscape:current-layer="g3788"
31 showgrid="true"
32 inkscape:document-units="px"
33 inkscape:grid-bbox="true"
34 inkscape:window-width="1280"
35 inkscape:window-height="702"
36 inkscape:window-x="0"
37 inkscape:window-y="0"
38 inkscape:window-maximized="0" />
39 <metadata
40 id="metadata2990">
41 <rdf:RDF>
42 <cc:Work
43 rdf:about="">
44 <dc:format>image/svg+xml</dc:format>
45 <dc:type
46 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
47 <dc:title></dc:title>
48 </cc:Work>
49 </rdf:RDF>
50 </metadata>
51 <g
52 id="layer1"
53 inkscape:label="Layer 1"
54 inkscape:groupmode="layer"
55 transform="translate(0,64)">
56 <path
57 sodipodi:type="arc"
58 style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
59 id="path2993"
60 sodipodi:cx="63.090908"
61 sodipodi:cy="64"
62 sodipodi:rx="55.454544"
63 sodipodi:ry="54.18182"
64 d="M 118.54545,64 A 55.454544,54.18182 0 1 1 7.636364,64 55.454544,54.18182 0 1 1 118.54545,64 z"
65 transform="matrix(1.0721871,0,0,1.0973726,-3.6452576,-70.231844)" />
66 <g
67 id="g3788"
68 transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,20.695964,43.304036)">
69 <rect
70 ry="3"
71 rx="4.5"
72 y="-50"
73 x="54"
74 height="100"
75 width="15"
76 id="rect3763"
77 style="fill:#a40000;fill-opacity:1;stroke:none" />
78 <rect
79 transform="matrix(0,1,-1,0,0,0)"
80 style="fill:#a40000;fill-opacity:1;stroke:none"
81 id="rect3786"
82 width="15"
83 height="100"
84 x="-7.5"
85 y="-111.5"
86 rx="4.5"
87 ry="3" />
88 </g>
89 </g>
90</svg>
910
=== removed file 'assets/close.svg'
--- assets/close.svg 2011-05-28 20:24:09 +0000
+++ assets/close.svg 1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12 width="128"
13 height="128"
14 id="svg2985"
15 version="1.1"
16 inkscape:version="0.48.1 r9760"
17 sodipodi:docname="close.svg">
18 <defs
19 id="defs2987" />
20 <sodipodi:namedview
21 id="base"
22 pagecolor="#ffffff"
23 bordercolor="#666666"
24 borderopacity="1.0"
25 inkscape:pageopacity="0.0"
26 inkscape:pageshadow="2"
27 inkscape:zoom="2.8284271"
28 inkscape:cx="57.068363"
29 inkscape:cy="80.280491"
30 inkscape:current-layer="g3788"
31 showgrid="true"
32 inkscape:document-units="px"
33 inkscape:grid-bbox="true"
34 inkscape:window-width="1280"
35 inkscape:window-height="702"
36 inkscape:window-x="0"
37 inkscape:window-y="0"
38 inkscape:window-maximized="0" />
39 <metadata
40 id="metadata2990">
41 <rdf:RDF>
42 <cc:Work
43 rdf:about="">
44 <dc:format>image/svg+xml</dc:format>
45 <dc:type
46 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
47 <dc:title></dc:title>
48 </cc:Work>
49 </rdf:RDF>
50 </metadata>
51 <g
52 id="layer1"
53 inkscape:label="Layer 1"
54 inkscape:groupmode="layer"
55 transform="translate(0,64)">
56 <path
57 sodipodi:type="arc"
58 style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
59 id="path2993"
60 sodipodi:cx="63.090908"
61 sodipodi:cy="64"
62 sodipodi:rx="55.454544"
63 sodipodi:ry="54.18182"
64 d="M 118.54545,64 A 55.454544,54.18182 0 1 1 7.636364,64 55.454544,54.18182 0 1 1 118.54545,64 z"
65 transform="matrix(1.0721871,0,0,1.0973726,-3.6452576,-70.231844)" />
66 <g
67 id="g3788"
68 transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,20.695964,43.304036)">
69 <rect
70 ry="3"
71 rx="4.5"
72 y="-50"
73 x="54"
74 height="100"
75 width="15"
76 id="rect3763"
77 style="fill:#646464;fill-opacity:1;stroke:none" />
78 <rect
79 transform="matrix(0,1,-1,0,0,0)"
80 style="fill:#646464;fill-opacity:1;stroke:none"
81 id="rect3786"
82 width="15"
83 height="100"
84 x="-7.5"
85 y="-111.5"
86 rx="4.5"
87 ry="3" />
88 </g>
89 </g>
90</svg>
910
=== removed file 'assets/ok.svg'
--- assets/ok.svg 2011-05-28 20:31:03 +0000
+++ assets/ok.svg 1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12 width="128"
13 height="128"
14 id="svg2985"
15 version="1.1"
16 inkscape:version="0.48.1 r9760"
17 sodipodi:docname="ok.svg">
18 <defs
19 id="defs2987" />
20 <sodipodi:namedview
21 id="base"
22 pagecolor="#ffffff"
23 bordercolor="#666666"
24 borderopacity="1.0"
25 inkscape:pageopacity="0.0"
26 inkscape:pageshadow="2"
27 inkscape:zoom="2.8284271"
28 inkscape:cx="68.165161"
29 inkscape:cy="54.161237"
30 inkscape:current-layer="g3788"
31 showgrid="true"
32 inkscape:document-units="px"
33 inkscape:grid-bbox="true"
34 inkscape:window-width="1280"
35 inkscape:window-height="702"
36 inkscape:window-x="0"
37 inkscape:window-y="0"
38 inkscape:window-maximized="0" />
39 <metadata
40 id="metadata2990">
41 <rdf:RDF>
42 <cc:Work
43 rdf:about="">
44 <dc:format>image/svg+xml</dc:format>
45 <dc:type
46 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
47 <dc:title></dc:title>
48 </cc:Work>
49 </rdf:RDF>
50 </metadata>
51 <g
52 id="layer1"
53 inkscape:label="Layer 1"
54 inkscape:groupmode="layer"
55 transform="translate(0,64)">
56 <path
57 sodipodi:type="arc"
58 style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
59 id="path2993"
60 sodipodi:cx="63.090908"
61 sodipodi:cy="64"
62 sodipodi:rx="55.454544"
63 sodipodi:ry="54.18182"
64 d="M 118.54545,64 A 55.454544,54.18182 0 1 1 7.636364,64 55.454544,54.18182 0 1 1 118.54545,64 z"
65 transform="matrix(1.0721871,0,0,1.0973726,-3.6452576,-70.231844)" />
66 <g
67 id="g3788"
68 transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,20.695964,43.304036)">
69 <rect
70 style="fill:#00a400;fill-opacity:1;stroke:none"
71 id="rect3896"
72 width="15"
73 height="40"
74 x="22.212006"
75 y="-26.36396"
76 rx="3"
77 ry="3" />
78 <rect
79 ry="2.7"
80 rx="3"
81 transform="matrix(0,1,-1,0,0,0)"
82 y="-112.58459"
83 x="-1.437555"
84 height="90"
85 width="15"
86 id="rect3898"
87 style="fill:#00a400;fill-opacity:1;stroke:none" />
88 </g>
89 </g>
90</svg>
910
=== removed directory 'src/css'
=== removed directory 'src/css/images'
=== removed file 'src/css/images/cancel.png'
92Binary files src/css/images/cancel.png 2011-05-28 20:39:10 +0000 and src/css/images/cancel.png 1970-01-01 00:00:00 +0000 differ1Binary files src/css/images/cancel.png 2011-05-28 20:39:10 +0000 and src/css/images/cancel.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'src/css/images/ok.png'
93Binary files src/css/images/ok.png 2011-05-28 20:40:19 +0000 and src/css/images/ok.png 1970-01-01 00:00:00 +0000 differ2Binary files src/css/images/ok.png 2011-05-28 20:40:19 +0000 and src/css/images/ok.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'src/css/phazr.css'
--- src/css/phazr.css 2011-05-28 21:19:28 +0000
+++ src/css/phazr.css 1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
1a.save { background: url('images/ok.png') 0 0 no-repeat; display: inline-block; height: 16px; width: 16px; }
2a.cancel { background: url('images/cancel.png') 0 0 no-repeat; display: inline-block; height: 16px; width: 16px; }
3
4
5div.yui3-widget .clickable {
6 cursor: pointer;
7}
8
9div.yui3-overlay {
10 background-color: #fff;
11
12 border-radius: 5px;
13 -moz-border-radius: 5px;
14 -webkit-border-radius: 5px;
15
16 box-shadow: 0px 0px 20px 10px #aaa;
17 -moz-box-shadow: 0px 0px 20px 10px #aaa;
18 -webkit-box-shadow: 0px 0px 20px 10px #aaa;
19}
20
21div.yui3-overlay div.yui3-widget-hd {
22 border-bottom: 2px solid #ddd;
23 font-size: 1.2em;
24 font-weight: bold;
25 padding: .5em .5em .1em .5em;
26}
27
28div.yui3-overlay div.yui3-widget-bd {
29 padding: .1em .5em .1em .5em;
30}
31
32div.yui3-overlay div.yui3-widget-ft {
33 font-size: .8em;
34 padding: .1em .5em .5em .5em;
35}
36
37div.yui3-overlay div.yui3-overlay-controls {
38 font-size: .8em;
39 padding: .1em .5em .5em .5em;
40 text-align: right;
41}
42div.yui3-overlay div.yui3-overlay-controls a {
43 display: inline-block;
44 height: 32px;
45 width: 32px;
46}
47div.yui3-overlay div.yui3-overlay-controls a#save-control {
48 background: url('images/ok.png') 0 0 no-repeat;
49}
50div.yui3-overlay div.yui3-overlay-controls a#cancel-control {
51 background: url('images/cancel.png') 0 0 no-repeat;
52}
53div.yui3-overlay div.yui3-overlay-close {
54 float: right;
55 margin: 5px 5px 0 0;
56}
57div.yui3-overlay div.yui3-overlay-close a.yui3-overlay-close-button {
58 background: url('images/close.png') 0 0 no-repeat;
59 cursor: pointer;
60 display: inline-block;
61 height: 20px;
62 width: 20px;
63}
64
65div.yui3-dd-draggable div.yui3-widget-hd {
66 cursor: pointer;
67}
680
=== added directory 'src/phazroverlay/assets'
=== renamed file 'src/css/images/close.png' => 'src/phazroverlay/assets/close.png'
=== added file 'src/phazroverlay/assets/phazroverlay-core.css'
--- src/phazroverlay/assets/phazroverlay-core.css 1970-01-01 00:00:00 +0000
+++ src/phazroverlay/assets/phazroverlay-core.css 2011-08-25 04:51:23 +0000
@@ -0,0 +1,49 @@
1div.yui3-phazroverlay {
2 background-color: #fff;
3
4 border-radius: 5px;
5 -moz-border-radius: 5px;
6 -webkit-border-radius: 5px;
7
8 box-shadow: 0px 0px 20px 10px #aaa;
9 -moz-box-shadow: 0px 0px 20px 10px #aaa;
10 -webkit-box-shadow: 0px 0px 20px 10px #aaa;
11}
12div.yui3-phazroverlay div.yui3-widget-hd {
13 border-bottom: 2px solid #ddd;
14 cursor: pointer;
15 font-size: 1.2em;
16 font-weight: bold;
17 padding: .5em .5em .1em .5em;
18}
19
20div.yui3-phazroverlay div.yui3-widget-bd {
21 padding: .1em .5em .1em .5em;
22}
23
24div.yui3-phazroverlay div.yui3-widget-ft {
25 font-size: .8em;
26 padding: .1em .5em .5em .5em;
27}
28
29div.yui3-phazroverlay div.yui3-overlay-controls {
30 font-size: .8em;
31 padding: .1em .5em .5em .5em;
32 text-align: right;
33}
34div.yui3-phazroverlay div.yui3-overlay-controls a {
35 display: inline-block;
36 height: 32px;
37 width: 32px;
38}
39div.yui3-phazroverlay div.yui3-overlay-close {
40 float: right;
41 margin: 5px 5px 0 0;
42}
43div.yui3-phazroverlay div.yui3-overlay-close a.yui3-overlay-close-button {
44 background: url(close.png) 0 0 no-repeat;
45 cursor: pointer;
46 display: inline-block;
47 height: 20px;
48 width: 20px;
49}
050
=== added directory 'src/phazroverlay/assets/skins'
=== added directory 'src/phazroverlay/assets/skins/sam'
=== modified file 'src/phazroverlay/build.properties'
--- src/phazroverlay/build.properties 2011-08-24 21:24:14 +0000
+++ src/phazroverlay/build.properties 2011-08-25 04:51:23 +0000
@@ -3,3 +3,4 @@
3component.jsfiles=overlay.js3component.jsfiles=overlay.js
4component.requires=base-build, dd-delegate, node, overlay, plugin, substitute4component.requires=base-build, dd-delegate, node, overlay, plugin, substitute
5component.builddir=../../build5component.builddir=../../build
6component.skinnable=true
67
=== modified file 'src/phazroverlay/js/overlay.js'
--- src/phazroverlay/js/overlay.js 2011-08-24 21:24:46 +0000
+++ src/phazroverlay/js/overlay.js 2011-08-25 04:51:23 +0000
@@ -69,4 +69,4 @@
69 }69 }
70};70};
7171
72Y.PhazrOverlay = Y.Base.create('overlay', Y.Overlay, [ModalOverlay]);72Y.PhazrOverlay = Y.Base.create('phazroverlay', Y.Overlay, [ModalOverlay]);

Subscribers

People subscribed via source and target branches

to all changes: