From 7dd942b6e19d2d7a779bc50e7bf4c8f8780b8f3a Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Wed, 9 May 2012 14:19:14 -0700 Subject: Correct layout and styling for the shape tool and its sub tools --- .../rect-properties.reel/rect-properties.html | 2 -- .../shape-properties.reel/shape-properties.css | 19 ++++++++++++++++--- .../shape-properties.reel/shape-properties.html | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) (limited to 'js/components/tools-properties') diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html index 01f2b1da..43dae547 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.html +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html @@ -75,7 +75,6 @@
-
@@ -87,5 +86,4 @@
- \ No newline at end of file diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css index 1100bc70..4dc64d66 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.css +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css @@ -5,17 +5,26 @@ */ .optionsShapeTool { - padding: 4px; + padding: 6px; } .optionsShapeTool > * { float:left; } +.optionsShapeTool select.nj-skinned { + margin-top: 2px; +} + +.optionsShapeTool .shapeCustomProps { + margin-top: -3px; + margin-left: -31px; +} + .optionsShapeTool .fillColorCtrl, .optionsShapeTool .strokeColorCtrl { width: 20px; height: 18px; - margin: 2px 6px; + margin: 1px 6px; border: 1px black solid; } @@ -25,4 +34,8 @@ margin-top: 2px; -webkit-transform: scale(0.8); background-color: rgb(40, 40, 40); -} \ No newline at end of file +} + +.optionsShapeTool checkbox { + padding: 6px; +} diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html index 9363365e..c54f8b25 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html @@ -136,6 +136,7 @@
+
 
@@ -143,7 +144,7 @@
 
-
+
-- cgit v1.2.3