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

[Paul Hummer]

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.

[Deryck Hodge (deryck)]

Looks good. Builds fine locally for me.

review: Approve (code)

=== modified file 'Makefile'
--- Makefile	2011-08-24 22:33:33 +0000
+++ Makefile	2011-08-25 04:51:23 +0000
@@ -5,13 +5,13 @@
 builder: ../builder
 
 phazr-overlay: src/phazroverlay/build.properties src/phazroverlay/js/overlay.js builder
-	cd src/phazroverlay; ant build
+	cd src/phazroverlay; ant build deploybuild deployassets
 
 phazr-editable: src/editableplugin/build.properties src/editableplugin/js/editable.js builder
-	cd src/editableplugin; ant build
+	cd src/editableplugin; ant build deploybuild deployassets
 
 phazr-formplugin: src/formplugin/build.properties src/formplugin/js/form.js builder
-	cd src/formplugin; ant build
+	cd src/formplugin; ant build deploybuild deployassets
 
 clean:
 	rm -rf build/*

=== 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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg2985"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="close.svg">
-  <defs
-     id="defs2987" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="61.841334"
-     inkscape:cy="80.280491"
-     inkscape:current-layer="g3788"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="702"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2990">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,64)">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2993"
-       sodipodi:cx="63.090908"
-       sodipodi:cy="64"
-       sodipodi:rx="55.454544"
-       sodipodi:ry="54.18182"
-       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"
-       transform="matrix(1.0721871,0,0,1.0973726,-3.6452576,-70.231844)" />
-    <g
-       id="g3788"
-       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,20.695964,43.304036)">
-      <rect
-         ry="3"
-         rx="4.5"
-         y="-50"
-         x="54"
-         height="100"
-         width="15"
-         id="rect3763"
-         style="fill:#a40000;fill-opacity:1;stroke:none" />
-      <rect
-         transform="matrix(0,1,-1,0,0,0)"
-         style="fill:#a40000;fill-opacity:1;stroke:none"
-         id="rect3786"
-         width="15"
-         height="100"
-         x="-7.5"
-         y="-111.5"
-         rx="4.5"
-         ry="3" />
-    </g>
-  </g>
-</svg>

=== 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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg2985"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="close.svg">
-  <defs
-     id="defs2987" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="57.068363"
-     inkscape:cy="80.280491"
-     inkscape:current-layer="g3788"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="702"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2990">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,64)">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2993"
-       sodipodi:cx="63.090908"
-       sodipodi:cy="64"
-       sodipodi:rx="55.454544"
-       sodipodi:ry="54.18182"
-       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"
-       transform="matrix(1.0721871,0,0,1.0973726,-3.6452576,-70.231844)" />
-    <g
-       id="g3788"
-       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,20.695964,43.304036)">
-      <rect
-         ry="3"
-         rx="4.5"
-         y="-50"
-         x="54"
-         height="100"
-         width="15"
-         id="rect3763"
-         style="fill:#646464;fill-opacity:1;stroke:none" />
-      <rect
-         transform="matrix(0,1,-1,0,0,0)"
-         style="fill:#646464;fill-opacity:1;stroke:none"
-         id="rect3786"
-         width="15"
-         height="100"
-         x="-7.5"
-         y="-111.5"
-         rx="4.5"
-         ry="3" />
-    </g>
-  </g>
-</svg>

=== 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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg2985"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="ok.svg">
-  <defs
-     id="defs2987" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="68.165161"
-     inkscape:cy="54.161237"
-     inkscape:current-layer="g3788"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="702"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2990">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,64)">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2993"
-       sodipodi:cx="63.090908"
-       sodipodi:cy="64"
-       sodipodi:rx="55.454544"
-       sodipodi:ry="54.18182"
-       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"
-       transform="matrix(1.0721871,0,0,1.0973726,-3.6452576,-70.231844)" />
-    <g
-       id="g3788"
-       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,20.695964,43.304036)">
-      <rect
-         style="fill:#00a400;fill-opacity:1;stroke:none"
-         id="rect3896"
-         width="15"
-         height="40"
-         x="22.212006"
-         y="-26.36396"
-         rx="3"
-         ry="3" />
-      <rect
-         ry="2.7"
-         rx="3"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-112.58459"
-         x="-1.437555"
-         height="90"
-         width="15"
-         id="rect3898"
-         style="fill:#00a400;fill-opacity:1;stroke:none" />
-    </g>
-  </g>
-</svg>

=== removed directory 'src/css'
=== removed directory 'src/css/images'
=== removed file 'src/css/images/cancel.png'
Binary 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'
Binary 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 @@
-a.save { background: url('images/ok.png') 0 0 no-repeat; display: inline-block; height: 16px; width: 16px; }
-a.cancel { background: url('images/cancel.png') 0 0 no-repeat; display: inline-block; height: 16px; width: 16px; }
-
-
-div.yui3-widget .clickable {
-    cursor: pointer;
-}
-
-div.yui3-overlay {
-    background-color: #fff;
-
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-
-    box-shadow: 0px 0px 20px 10px #aaa;
-    -moz-box-shadow: 0px 0px 20px 10px #aaa;
-    -webkit-box-shadow: 0px 0px 20px 10px #aaa;
-}
-
-div.yui3-overlay div.yui3-widget-hd {
-    border-bottom: 2px solid #ddd;
-    font-size: 1.2em;
-    font-weight: bold;
-    padding: .5em .5em .1em .5em;
-}
-
-div.yui3-overlay div.yui3-widget-bd {
-    padding: .1em .5em .1em .5em;
-}
-
-div.yui3-overlay div.yui3-widget-ft {
-    font-size: .8em;
-    padding: .1em .5em .5em .5em;
-}
-
-div.yui3-overlay div.yui3-overlay-controls {
-    font-size: .8em;
-    padding: .1em .5em .5em .5em;
-    text-align: right;
-}
-div.yui3-overlay div.yui3-overlay-controls a {
-    display: inline-block;
-    height: 32px;
-    width: 32px;
-}
-div.yui3-overlay div.yui3-overlay-controls a#save-control {
-    background: url('images/ok.png') 0 0 no-repeat;
-}
-div.yui3-overlay div.yui3-overlay-controls a#cancel-control {
-    background: url('images/cancel.png') 0 0 no-repeat;
-}
-div.yui3-overlay div.yui3-overlay-close {
-    float: right;
-    margin: 5px 5px 0 0;
-}
-div.yui3-overlay div.yui3-overlay-close a.yui3-overlay-close-button {
-    background: url('images/close.png') 0 0 no-repeat;
-    cursor: pointer;
-    display: inline-block;
-    height: 20px;
-    width: 20px;
-}
-
-div.yui3-dd-draggable div.yui3-widget-hd {
-    cursor: pointer;
-}

=== 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 @@
+div.yui3-phazroverlay {
+    background-color: #fff;
+
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+
+    box-shadow: 0px 0px 20px 10px #aaa;
+    -moz-box-shadow: 0px 0px 20px 10px #aaa;
+    -webkit-box-shadow: 0px 0px 20px 10px #aaa;
+}
+div.yui3-phazroverlay div.yui3-widget-hd {
+    border-bottom: 2px solid #ddd;
+    cursor: pointer;
+    font-size: 1.2em;
+    font-weight: bold;
+    padding: .5em .5em .1em .5em;
+}
+
+div.yui3-phazroverlay div.yui3-widget-bd {
+    padding: .1em .5em .1em .5em;
+}
+
+div.yui3-phazroverlay div.yui3-widget-ft {
+    font-size: .8em;
+    padding: .1em .5em .5em .5em;
+}
+
+div.yui3-phazroverlay div.yui3-overlay-controls {
+    font-size: .8em;
+    padding: .1em .5em .5em .5em;
+    text-align: right;
+}
+div.yui3-phazroverlay div.yui3-overlay-controls a {
+    display: inline-block;
+    height: 32px;
+    width: 32px;
+}
+div.yui3-phazroverlay div.yui3-overlay-close {
+    float: right;
+    margin: 5px 5px 0 0;
+}
+div.yui3-phazroverlay div.yui3-overlay-close a.yui3-overlay-close-button {
+    background: url(close.png) 0 0 no-repeat;
+    cursor: pointer;
+    display: inline-block;
+    height: 20px;
+    width: 20px;
+}

=== 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 @@
 component.jsfiles=overlay.js
 component.requires=base-build, dd-delegate, node, overlay, plugin, substitute
 component.builddir=../../build
+component.skinnable=true

=== 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 @@
     }
 };
 
-Y.PhazrOverlay = Y.Base.create('overlay', Y.Overlay, [ModalOverlay]);
+Y.PhazrOverlay = Y.Base.create('phazroverlay', Y.Overlay, [ModalOverlay]);