From 18370abcf406c6ab36d5c5f2613cb79e756ff6d2 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Wed, 9 May 2012 18:07:32 -0700 Subject: -Consolidated many redundant css classes used in the tool options bars --- .../brush-properties.reel/brush-properties.css | 21 ----------------- .../brush-properties.reel/brush-properties.html | 6 ++--- .../fill-properties.reel/fill-properties.css | 23 +------------------ .../fill-properties.reel/fill-properties.html | 6 ++--- .../ink-bottle-properties.css | 24 ++------------------ .../ink-bottle-properties.html | 4 +++- .../pen-properties.reel/pen-properties.css | 16 ------------- .../pen-properties.reel/pen-properties.html | 8 +++---- .../rect-properties.reel/rect-properties.css | 2 +- .../rect-properties.reel/rect-properties.html | 10 ++++----- .../selection-properties.html | 2 +- .../shape-properties.reel/shape-properties.css | 23 ------------------- .../shape-properties.reel/shape-properties.html | 14 ++++++------ .../shape-properties.reel/shape-properties.js | 1 - .../tag-properties.reel/tag-properties.html | 26 ++++++++-------------- .../text-properties.reel/text-properties.css | 1 - 16 files changed, 39 insertions(+), 148 deletions(-) (limited to 'js') diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css index 0912dd7e..102a79db 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.css +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.css @@ -4,25 +4,4 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ - .optionsBrushTool { - padding: 6px; -} - .optionsBrushTool > * { - float:left; -} - - .optionsBrushTool .fillColorCtrl { - width: 20px; - height: 18px; - margin-left: 3px; - margin-right: 8px; - border: 1px black solid; -} - - .optionsBrushTool .colorCtrlIcon { - width: 20px; - height: 20px; - -webkit-transform: scale(0.8); - background-color: rgb(40, 40, 40); -} \ No newline at end of file diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index a820dd04..7d99a42a 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html @@ -80,9 +80,9 @@ -
-
-
+
+
+
 
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.css b/js/components/tools-properties/fill-properties.reel/fill-properties.css index fa2e75e6..606e73b3 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.css +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.css @@ -4,32 +4,11 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ -.optionsFillTool { - padding: 6px; -} -.optionsFillTool > * { - float:left; -} -.optionsFillTool > * > *{ - float:left; -} - -.optionsFillTool label { - margin-right: 8px; -} -.optionsFillTool .colorCtrlIcon { - width: 20px; - height: 20px; - margin-top: 0px; - margin-left: 10px; - -webkit-transform: scale(0.8); - background-color: rgb(40, 40, 40); -} .materialsContainerOptions select { margin-top: 2px; } .materialsContainerOptions label { - margin-right: 0px; + margin-right: 3px; } \ No newline at end of file diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index 9fb84a1b..975b4e6f 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html @@ -34,12 +34,12 @@ -
+
-
+
-
+
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css index 4136339c..3dba17b6 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css @@ -4,21 +4,9 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ -.toolOptionsFloatChildren > * { - float:left; -} - -.inkBottleOptions { - padding: 6px; -} -.inkBottleOptions .nj-divider { - margin-left: 16px; - margin-right: 16px; -} - -.toolOptionsFloatChildren select.nj-skinned { - margin-top: 2px; +.inkBottleOptions select.nj-skinned { + margin-top: 2px; } .inkBottleOptions label.disabled { @@ -35,11 +23,3 @@ background-color: transparent; cursor:default; } - -.inkBottleOptions .colorCtrlIcon { - width: 20px; - height: 20px; - margin-top: 2px; - -webkit-transform: scale(0.8); - background-color: rgb(40, 40, 40); -} \ No newline at end of file diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html index 148c71e3..f5b1851f 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html @@ -180,7 +180,9 @@
+
 
 
+
 
@@ -194,7 +196,7 @@
-
+
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.css b/js/components/tools-properties/pen-properties.reel/pen-properties.css index d08d0abd..c6e68195 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.css +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.css @@ -5,24 +5,8 @@ */ .optionsPenTool { - padding: 6px; } .optionsPenTool > * { float:left; } - - .optionsPenTool .fillColorCtrl, .optionsPenTool .strokeColorCtrl { - width: 20px; - height: 18px; - margin-left: 3px; - margin-right: 8px; - border: 1px black solid; -} - - .optionsPenTool .colorCtrlIcon { - width: 20px; - height: 20px; - -webkit-transform: scale(0.8); - background-color: rgb(40, 40, 40); -} \ No newline at end of file diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index 446b0a02..324d1070 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html @@ -40,10 +40,10 @@
-
-
-
-
+
+
+
+
 
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 cbd9dde8..c186d895 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.css +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css @@ -16,7 +16,7 @@ } .rectProperties .subToolButton { - float:left; + margin-right: 7px; } .rectProperties .button:hover 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 43dae547..6caef4b3 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.html +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html @@ -74,16 +74,16 @@ -
+
-
+
-
+
-
+
-
+
\ No newline at end of file diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html index a05bb7a1..3dd04f2c 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.html +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html @@ -46,7 +46,7 @@ -
+
 
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 4dc64d66..c1f8a8ce 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.css +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css @@ -4,14 +4,6 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ - .optionsShapeTool { - padding: 6px; -} - - .optionsShapeTool > * { - float:left; -} - .optionsShapeTool select.nj-skinned { margin-top: 2px; } @@ -21,21 +13,6 @@ margin-left: -31px; } - .optionsShapeTool .fillColorCtrl, .optionsShapeTool .strokeColorCtrl { - width: 20px; - height: 18px; - margin: 1px 6px; - border: 1px black solid; -} - - .optionsShapeTool .colorCtrlIcon { - width: 20px; - height: 20px; - margin-top: 2px; - -webkit-transform: scale(0.8); - background-color: rgb(40, 40, 40); -} - .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 c54f8b25..c6aa0c94 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html @@ -132,15 +132,15 @@ -
+
 
-
-
-
-
+
+
+
+
 
@@ -153,12 +153,12 @@ -
+
-
+
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 74875544..23158493 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.js +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js @@ -16,7 +16,6 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, { _fill: { enumerable: false, value: { colorMode: 'rgb', color: { r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [1, 1, 1, 1] } - //this._fillColorCtrl.color('nocolor', null); }, _stroke: { diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index bd4590ce..f92665a7 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html @@ -37,10 +37,10 @@ -
-
-
-
+
+
+
+
 
@@ -51,15 +51,13 @@
 
-
- +
+ +
-
+
-
- - -
+
- -
- -
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css index f7bb8295..d34968e5 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.css +++ b/js/components/tools-properties/text-properties.reel/text-properties.css @@ -5,7 +5,6 @@ */ .optionsTextTool { - padding: 6px; } .optionsTextTool .btnGroup { -- cgit v1.2.3