From 3be15e2076f2d3d46862bbc0ea078b9bf2e161fe Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 10 May 2012 11:17:42 -0700
Subject: -moved sel tool images to proper folder
-finished styling shape tool options
-added new icons for shape tool
---
.../tools-properties/oval-properties.reel/oval-properties.css | 11 +++++++++++
.../oval-properties.reel/oval-properties.html | 6 +++---
.../tools-properties/rect-properties.reel/rect-properties.css | 4 +++-
.../rect-properties.reel/rect-properties.html | 2 +-
.../shape-properties.reel/shape-properties.css | 9 +++++++--
.../shape-properties.reel/shape-properties.html | 10 +++++-----
.../shape-properties.reel/shape-properties.js | 2 ++
7 files changed, 32 insertions(+), 12 deletions(-)
(limited to 'js/components')
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css
index 7f1b0f7f..ea0d92fc 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.css
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css
@@ -4,3 +4,14 @@
(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
*/
+.ovalProperties{
+}
+
+.ovalProperties hottextunit {
+ width: 22px;
+}
+
+.ovalProperties label {
+ margin-left: 6px;
+ margin-right: 6px;
+}
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html
index c76e8c39..21308be6 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.html
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html
@@ -35,9 +35,9 @@
-
-
-
+
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css
index c186d895..dcb478e7 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.css
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css
@@ -12,7 +12,9 @@
opacity: 0.7;
width: 17px;
height: 18px;
- margin-right: 10px;
+ margin-right: 8px;
+ margin-left: 8px;
+ margin-top: 1px;
}
.rectProperties .subToolButton {
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 6caef4b3..42746caa 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,7 @@
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index 23158493..bd0cf8cf 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -112,11 +112,13 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
this._fillColorCtrl.visible = false;
this._fillColorCtrlIcon.style["display"] = "none";
this._fillColorCtrlIcon.visible = false;
+ this.endDivider.style["display"] = "none";
} else {
this._fillColorCtrl.style["display"] = "";
this._fillColorCtrl.visible = true;
this._fillColorCtrlIcon.style["display"] = "";
this._fillColorCtrlIcon.visible = true;
+ this.endDivider.style["display"] = "";
}
if (this._useWebGL.checked) {
--
cgit v1.2.3