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 --- css/ninja.css | 40 +++++++-------- images/optionsbar/link.png | Bin 1295 -> 1248 bytes images/optionsbar/rectangle/cornerRadius.png | Bin 2955 -> 1187 bytes images/optionsbar/selection/AlignBottom.png | Bin 2852 -> 2887 bytes images/optionsbar/selection/AlignCenter.png | Bin 0 -> 2859 bytes images/optionsbar/selection/AlignMiddle.png | Bin 0 -> 2864 bytes .../optionsbar/selection/ArrangeBringForward.png | Bin 0 -> 2877 bytes .../optionsbar/selection/ArrangeBringToFront.png | Bin 0 -> 2877 bytes .../optionsbar/selection/ArrangeSendBackward.png | Bin 0 -> 2873 bytes images/optionsbar/selection/ArrangeSendToBack.png | Bin 0 -> 2877 bytes images/optionsbar/selection/DistBottom.png | Bin 0 -> 2888 bytes images/optionsbar/selection/DistMiddle.png | Bin 0 -> 2868 bytes images/optionsbar/selection/alignHcenter.png | Bin 2859 -> 0 bytes images/optionsbar/selection/alignVcenter.png | Bin 2864 -> 0 bytes images/optionsbar/selection/distVcenter.png | Bin 2868 -> 0 bytes images/optionsbar/unlinked.png | Bin 1581 -> 1193 bytes images/tools/AlignBottom.png | Bin 2887 -> 0 bytes images/tools/AlignCenter.png | Bin 2859 -> 0 bytes images/tools/AlignLeft.png | Bin 2847 -> 0 bytes images/tools/AlignMiddle.png | Bin 2864 -> 0 bytes images/tools/AlignRight.png | Bin 2851 -> 0 bytes images/tools/AlignTop.png | Bin 2856 -> 0 bytes images/tools/ArrangeBringForward.png | Bin 2877 -> 0 bytes images/tools/ArrangeBringToFront.png | Bin 2877 -> 0 bytes images/tools/ArrangeSendBackward.png | Bin 2873 -> 0 bytes images/tools/ArrangeSendToBack.png | Bin 2877 -> 0 bytes images/tools/DistBottom.png | Bin 2888 -> 0 bytes images/tools/DistCenter.png | Bin 2868 -> 0 bytes images/tools/DistLeft.png | Bin 2856 -> 0 bytes images/tools/DistMiddle.png | Bin 2868 -> 0 bytes images/tools/DistRight.png | Bin 2851 -> 0 bytes images/tools/DistTop.png | Bin 2856 -> 0 bytes .../oval-properties.reel/oval-properties.css | 11 ++++ .../oval-properties.reel/oval-properties.html | 6 +-- .../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 + scss/imports/scss/_Tools.scss | 56 ++++++++++----------- 40 files changed, 80 insertions(+), 60 deletions(-) create mode 100644 images/optionsbar/selection/AlignCenter.png create mode 100644 images/optionsbar/selection/AlignMiddle.png create mode 100644 images/optionsbar/selection/ArrangeBringForward.png create mode 100644 images/optionsbar/selection/ArrangeBringToFront.png create mode 100644 images/optionsbar/selection/ArrangeSendBackward.png create mode 100644 images/optionsbar/selection/ArrangeSendToBack.png create mode 100644 images/optionsbar/selection/DistBottom.png create mode 100644 images/optionsbar/selection/DistMiddle.png delete mode 100755 images/optionsbar/selection/alignHcenter.png delete mode 100755 images/optionsbar/selection/alignVcenter.png delete mode 100755 images/optionsbar/selection/distVcenter.png delete mode 100644 images/tools/AlignBottom.png delete mode 100644 images/tools/AlignCenter.png delete mode 100644 images/tools/AlignLeft.png delete mode 100644 images/tools/AlignMiddle.png delete mode 100644 images/tools/AlignRight.png delete mode 100644 images/tools/AlignTop.png delete mode 100644 images/tools/ArrangeBringForward.png delete mode 100644 images/tools/ArrangeBringToFront.png delete mode 100644 images/tools/ArrangeSendBackward.png delete mode 100644 images/tools/ArrangeSendToBack.png delete mode 100644 images/tools/DistBottom.png delete mode 100644 images/tools/DistCenter.png delete mode 100644 images/tools/DistLeft.png delete mode 100644 images/tools/DistMiddle.png delete mode 100644 images/tools/DistRight.png delete mode 100644 images/tools/DistTop.png diff --git a/css/ninja.css b/css/ninja.css index b281632e..a7aab886 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -701,13 +701,13 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .cornerRadius:hover, .cornerRadius:active { opacity: 1; } -.cornerRadius.topLeft { -webkit-transform: rotate(0deg); } +.cornerRadius.topLeft { -webkit-transform: rotate(0deg); margin-top: 1px; margin-right: 3px; } -.cornerRadius.topRight { -webkit-transform: rotate(90deg); } +.cornerRadius.topRight { -webkit-transform: rotate(90deg); margin-right: 3px; margin-top: 1px; } -.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); } +.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); margin-right: 2px; margin-top: -1px; } -.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); } +.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); margin-right: 4px; margin-top: -1px; } #toolOptionsContainer { display: inline; float: left; } @@ -819,37 +819,37 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .selectionToolIcon { width: 16px; height: 16px; background-repeat: no-repeat; background-position: 1px 2px; } -.alignTopIcon { background-image: url("../images/tools/AlignTop.png"); } +.alignTopIcon { background-image: url("../images/optionsbar/selection/AlignTop.png"); } -.alignMiddleIcon { background-image: url("../images/tools/AlignMiddle.png"); } +.alignMiddleIcon { background-image: url("../images/optionsbar/selection/AlignMiddle.png"); } -.alignBottomIcon { background-image: url("../images/tools/AlignBottom.png"); } +.alignBottomIcon { background-image: url("../images/optionsbar/selection/AlignBottom.png"); } -.alignLeftIcon { background-image: url("../images/tools/AlignLeft.png"); } +.alignLeftIcon { background-image: url("../images/optionsbar/selection/AlignLeft.png"); } -.alignCenterIcon { background-image: url("../images/tools/AlignCenter.png"); } +.alignCenterIcon { background-image: url("../images/optionsbar/selection/AlignCenter.png"); } -.alignRightIcon { background-image: url("../images/tools/AlignRight.png"); } +.alignRightIcon { background-image: url("../images/optionsbar/selection/AlignRight.png"); } -.arrangeBringForwardIcon { background-image: url("../images/tools/ArrangeBringForward.png"); } +.arrangeBringForwardIcon { background-image: url("../images/optionsbar/selection/ArrangeBringForward.png"); } -.arrangeSendBackwardIcon { background-image: url("../images/tools/ArrangeSendBackward.png"); } +.arrangeSendBackwardIcon { background-image: url("../images/optionsbar/selection/ArrangeSendBackward.png"); } -.arrangeBringToFrontIcon { background-image: url("../images/tools/ArrangeBringToFront.png"); } +.arrangeBringToFrontIcon { background-image: url("../images/optionsbar/selection/ArrangeBringToFront.png"); } -.arrangeSendToBackIcon { background-image: url("../images/tools/ArrangeSendToBack.png"); } +.arrangeSendToBackIcon { background-image: url("../images/optionsbar/selection/ArrangeSendToBack.png"); } -.distTopIcon { background-image: url("../images/tools/DistTop.png"); } +.distTopIcon { background-image: url("../images/optionsbar/selection/DistTop.png"); } -.distMiddleIcon { background-image: url("../images/tools/DistMiddle.png"); } +.distMiddleIcon { background-image: url("../images/optionsbar/selection/DistMiddle.png"); } -.distBottomIcon { background-image: url("../images/tools/DistBottom.png"); } +.distBottomIcon { background-image: url("../images/optionsbar/selection/DistBottom.png"); } -.distLeftIcon { background-image: url("../images/tools/DistLeft.png"); } +.distLeftIcon { background-image: url("../images/optionsbar/selection/DistLeft.png"); } -.distCenterIcon { background-image: url("../images/tools/DistCenter.png"); } +.distCenterIcon { background-image: url("../images/optionsbar/selection/DistCenter.png"); } -.distRightIcon { background-image: url("../images/tools/DistRight.png"); } +.distRightIcon { background-image: url("../images/optionsbar/selection/DistRight.png"); } #toolsPanelContent { width: 40px; } diff --git a/images/optionsbar/link.png b/images/optionsbar/link.png index 7a3f166a..dc834675 100755 Binary files a/images/optionsbar/link.png and b/images/optionsbar/link.png differ diff --git a/images/optionsbar/rectangle/cornerRadius.png b/images/optionsbar/rectangle/cornerRadius.png index 106c530b..d7bb2d44 100755 Binary files a/images/optionsbar/rectangle/cornerRadius.png and b/images/optionsbar/rectangle/cornerRadius.png differ diff --git a/images/optionsbar/selection/AlignBottom.png b/images/optionsbar/selection/AlignBottom.png index 842cb057..f68d62c8 100755 Binary files a/images/optionsbar/selection/AlignBottom.png and b/images/optionsbar/selection/AlignBottom.png differ diff --git a/images/optionsbar/selection/AlignCenter.png b/images/optionsbar/selection/AlignCenter.png new file mode 100644 index 00000000..64bb4014 Binary files /dev/null and b/images/optionsbar/selection/AlignCenter.png differ diff --git a/images/optionsbar/selection/AlignMiddle.png b/images/optionsbar/selection/AlignMiddle.png new file mode 100644 index 00000000..03dffad5 Binary files /dev/null and b/images/optionsbar/selection/AlignMiddle.png differ diff --git a/images/optionsbar/selection/ArrangeBringForward.png b/images/optionsbar/selection/ArrangeBringForward.png new file mode 100644 index 00000000..55861b5a Binary files /dev/null and b/images/optionsbar/selection/ArrangeBringForward.png differ diff --git a/images/optionsbar/selection/ArrangeBringToFront.png b/images/optionsbar/selection/ArrangeBringToFront.png new file mode 100644 index 00000000..1344e618 Binary files /dev/null and b/images/optionsbar/selection/ArrangeBringToFront.png differ diff --git a/images/optionsbar/selection/ArrangeSendBackward.png b/images/optionsbar/selection/ArrangeSendBackward.png new file mode 100644 index 00000000..2e8ea0ad Binary files /dev/null and b/images/optionsbar/selection/ArrangeSendBackward.png differ diff --git a/images/optionsbar/selection/ArrangeSendToBack.png b/images/optionsbar/selection/ArrangeSendToBack.png new file mode 100644 index 00000000..699ae5ba Binary files /dev/null and b/images/optionsbar/selection/ArrangeSendToBack.png differ diff --git a/images/optionsbar/selection/DistBottom.png b/images/optionsbar/selection/DistBottom.png new file mode 100644 index 00000000..c7ed75ce Binary files /dev/null and b/images/optionsbar/selection/DistBottom.png differ diff --git a/images/optionsbar/selection/DistMiddle.png b/images/optionsbar/selection/DistMiddle.png new file mode 100644 index 00000000..bb32a441 Binary files /dev/null and b/images/optionsbar/selection/DistMiddle.png differ diff --git a/images/optionsbar/selection/alignHcenter.png b/images/optionsbar/selection/alignHcenter.png deleted file mode 100755 index 64bb4014..00000000 Binary files a/images/optionsbar/selection/alignHcenter.png and /dev/null differ diff --git a/images/optionsbar/selection/alignVcenter.png b/images/optionsbar/selection/alignVcenter.png deleted file mode 100755 index 03dffad5..00000000 Binary files a/images/optionsbar/selection/alignVcenter.png and /dev/null differ diff --git a/images/optionsbar/selection/distVcenter.png b/images/optionsbar/selection/distVcenter.png deleted file mode 100755 index bb32a441..00000000 Binary files a/images/optionsbar/selection/distVcenter.png and /dev/null differ diff --git a/images/optionsbar/unlinked.png b/images/optionsbar/unlinked.png index c209dc7d..49a6efa0 100755 Binary files a/images/optionsbar/unlinked.png and b/images/optionsbar/unlinked.png differ diff --git a/images/tools/AlignBottom.png b/images/tools/AlignBottom.png deleted file mode 100644 index f68d62c8..00000000 Binary files a/images/tools/AlignBottom.png and /dev/null differ diff --git a/images/tools/AlignCenter.png b/images/tools/AlignCenter.png deleted file mode 100644 index 64bb4014..00000000 Binary files a/images/tools/AlignCenter.png and /dev/null differ diff --git a/images/tools/AlignLeft.png b/images/tools/AlignLeft.png deleted file mode 100644 index 822c5243..00000000 Binary files a/images/tools/AlignLeft.png and /dev/null differ diff --git a/images/tools/AlignMiddle.png b/images/tools/AlignMiddle.png deleted file mode 100644 index 03dffad5..00000000 Binary files a/images/tools/AlignMiddle.png and /dev/null differ diff --git a/images/tools/AlignRight.png b/images/tools/AlignRight.png deleted file mode 100644 index 07d6d7ef..00000000 Binary files a/images/tools/AlignRight.png and /dev/null differ diff --git a/images/tools/AlignTop.png b/images/tools/AlignTop.png deleted file mode 100644 index 378d8aab..00000000 Binary files a/images/tools/AlignTop.png and /dev/null differ diff --git a/images/tools/ArrangeBringForward.png b/images/tools/ArrangeBringForward.png deleted file mode 100644 index 55861b5a..00000000 Binary files a/images/tools/ArrangeBringForward.png and /dev/null differ diff --git a/images/tools/ArrangeBringToFront.png b/images/tools/ArrangeBringToFront.png deleted file mode 100644 index 1344e618..00000000 Binary files a/images/tools/ArrangeBringToFront.png and /dev/null differ diff --git a/images/tools/ArrangeSendBackward.png b/images/tools/ArrangeSendBackward.png deleted file mode 100644 index 2e8ea0ad..00000000 Binary files a/images/tools/ArrangeSendBackward.png and /dev/null differ diff --git a/images/tools/ArrangeSendToBack.png b/images/tools/ArrangeSendToBack.png deleted file mode 100644 index 699ae5ba..00000000 Binary files a/images/tools/ArrangeSendToBack.png and /dev/null differ diff --git a/images/tools/DistBottom.png b/images/tools/DistBottom.png deleted file mode 100644 index c7ed75ce..00000000 Binary files a/images/tools/DistBottom.png and /dev/null differ diff --git a/images/tools/DistCenter.png b/images/tools/DistCenter.png deleted file mode 100644 index cf8f2bf5..00000000 Binary files a/images/tools/DistCenter.png and /dev/null differ diff --git a/images/tools/DistLeft.png b/images/tools/DistLeft.png deleted file mode 100644 index 3849e9e6..00000000 Binary files a/images/tools/DistLeft.png and /dev/null differ diff --git a/images/tools/DistMiddle.png b/images/tools/DistMiddle.png deleted file mode 100644 index bb32a441..00000000 Binary files a/images/tools/DistMiddle.png and /dev/null differ diff --git a/images/tools/DistRight.png b/images/tools/DistRight.png deleted file mode 100644 index e350b53e..00000000 Binary files a/images/tools/DistRight.png and /dev/null differ diff --git a/images/tools/DistTop.png b/images/tools/DistTop.png deleted file mode 100644 index 1d474b3c..00000000 Binary files a/images/tools/DistTop.png and /dev/null differ 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.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css index c1f8a8ce..70a0e780 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.css +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css @@ -9,10 +9,15 @@ } .optionsShapeTool .shapeCustomProps { - margin-top: -3px; - margin-left: -31px; + margin-top: 0px; + margin-left: -7px; } .optionsShapeTool checkbox { padding: 6px; + margin-left: 4px; } + +.optionsShapeTool .hottextunit { + /*width: 46px;*/ +} \ No newline at end of file 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 c6aa0c94..9b523a3f 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html @@ -118,6 +118,8 @@ "rectProperties": {"@": "rectProperties1"}, "lineProperties": {"@": "lineProperties1"}, + "endDivider": {"#": "endDivider"}, + "components": [ {"@": "repetition1"} ] @@ -144,14 +146,14 @@
 
+
 
- +
 
-
@@ -160,9 +162,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) { diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss index 24846138..c2d2498a 100755 --- a/scss/imports/scss/_Tools.scss +++ b/scss/imports/scss/_Tools.scss @@ -114,28 +114,28 @@ opacity:1; } -.cornerRadius.topLeft -{ +.cornerRadius.topLeft { -webkit-transform: rotate(0deg); + margin-top: 1px; + margin-right: 3px; } -.cornerRadius.topRight -{ +.cornerRadius.topRight { -webkit-transform: rotate(90deg); -// margin-right : -2px; + margin-right: 3px; + margin-top: 1px; } -.cornerRadius.bottomLeft -{ -// margin-top: 3px; +.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); + margin-right: 2px; + margin-top: -1px; } -.cornerRadius.bottomRight -{ -// margin-top: 3px; +.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); -// margin-right : -2px; + margin-right: 4px; + margin-top: -1px; } #toolOptionsContainer @@ -451,66 +451,66 @@ input[type="radio"]:disabled { } .alignTopIcon { - background-image: url("../images/tools/AlignTop.png"); + background-image: url("../images/optionsbar/selection/AlignTop.png"); } .alignMiddleIcon { - background-image: url("../images/tools/AlignMiddle.png"); + background-image: url("../images/optionsbar/selection/AlignMiddle.png"); } .alignBottomIcon { - background-image: url("../images/tools/AlignBottom.png"); + background-image: url("../images/optionsbar/selection/AlignBottom.png"); } .alignLeftIcon { - background-image: url("../images/tools/AlignLeft.png"); + background-image: url("../images/optionsbar/selection/AlignLeft.png"); } .alignCenterIcon { - background-image: url("../images/tools/AlignCenter.png"); + background-image: url("../images/optionsbar/selection/AlignCenter.png"); } .alignRightIcon { - background-image: url("../images/tools/AlignRight.png"); + background-image: url("../images/optionsbar/selection/AlignRight.png"); } .arrangeBringForwardIcon { - background-image: url("../images/tools/ArrangeBringForward.png"); + background-image: url("../images/optionsbar/selection/ArrangeBringForward.png"); } .arrangeSendBackwardIcon { - background-image: url("../images/tools/ArrangeSendBackward.png"); + background-image: url("../images/optionsbar/selection/ArrangeSendBackward.png"); } .arrangeBringToFrontIcon { - background-image: url("../images/tools/ArrangeBringToFront.png"); + background-image: url("../images/optionsbar/selection/ArrangeBringToFront.png"); } .arrangeSendToBackIcon { - background-image: url("../images/tools/ArrangeSendToBack.png"); + background-image: url("../images/optionsbar/selection/ArrangeSendToBack.png"); } .distTopIcon { - background-image: url("../images/tools/DistTop.png"); + background-image: url("../images/optionsbar/selection/DistTop.png"); } .distMiddleIcon { - background-image: url("../images/tools/DistMiddle.png"); + background-image: url("../images/optionsbar/selection/DistMiddle.png"); } .distBottomIcon { - background-image: url("../images/tools/DistBottom.png"); + background-image: url("../images/optionsbar/selection/DistBottom.png"); } .distLeftIcon { - background-image: url("../images/tools/DistLeft.png"); + background-image: url("../images/optionsbar/selection/DistLeft.png"); } .distCenterIcon { - background-image: url("../images/tools/DistCenter.png"); + background-image: url("../images/optionsbar/selection/DistCenter.png"); } .distRightIcon { - background-image: url("../images/tools/DistRight.png"); + background-image: url("../images/optionsbar/selection/DistRight.png"); } -- cgit v1.2.3