aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-10 11:17:42 -0700
committerJohn Mayhew2012-05-10 11:17:42 -0700
commit3be15e2076f2d3d46862bbc0ea078b9bf2e161fe (patch)
tree7043c476e0852197f67f00b1d1c583736d492797
parent18370abcf406c6ab36d5c5f2613cb79e756ff6d2 (diff)
downloadninja-3be15e2076f2d3d46862bbc0ea078b9bf2e161fe.tar.gz
-moved sel tool images to proper folder
-finished styling shape tool options -added new icons for shape tool
-rwxr-xr-xcss/ninja.css40
-rwxr-xr-ximages/optionsbar/link.pngbin1295 -> 1248 bytes
-rwxr-xr-ximages/optionsbar/rectangle/cornerRadius.pngbin2955 -> 1187 bytes
-rwxr-xr-ximages/optionsbar/selection/AlignBottom.pngbin2852 -> 2887 bytes
-rw-r--r--images/optionsbar/selection/AlignCenter.png (renamed from images/tools/AlignCenter.png)bin2859 -> 2859 bytes
-rw-r--r--images/optionsbar/selection/AlignMiddle.png (renamed from images/tools/AlignMiddle.png)bin2864 -> 2864 bytes
-rw-r--r--images/optionsbar/selection/ArrangeBringForward.png (renamed from images/tools/ArrangeBringForward.png)bin2877 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/ArrangeBringToFront.png (renamed from images/tools/ArrangeBringToFront.png)bin2877 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/ArrangeSendBackward.png (renamed from images/tools/ArrangeSendBackward.png)bin2873 -> 2873 bytes
-rw-r--r--images/optionsbar/selection/ArrangeSendToBack.png (renamed from images/tools/ArrangeSendToBack.png)bin2877 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/DistBottom.png (renamed from images/tools/DistBottom.png)bin2888 -> 2888 bytes
-rw-r--r--images/optionsbar/selection/DistMiddle.png (renamed from images/tools/DistMiddle.png)bin2868 -> 2868 bytes
-rwxr-xr-ximages/optionsbar/selection/alignHcenter.pngbin2859 -> 0 bytes
-rwxr-xr-ximages/optionsbar/selection/alignVcenter.pngbin2864 -> 0 bytes
-rwxr-xr-ximages/optionsbar/selection/distVcenter.pngbin2868 -> 0 bytes
-rwxr-xr-ximages/optionsbar/unlinked.pngbin1581 -> 1193 bytes
-rw-r--r--images/tools/AlignBottom.pngbin2887 -> 0 bytes
-rw-r--r--images/tools/AlignLeft.pngbin2847 -> 0 bytes
-rw-r--r--images/tools/AlignRight.pngbin2851 -> 0 bytes
-rw-r--r--images/tools/AlignTop.pngbin2856 -> 0 bytes
-rw-r--r--images/tools/DistCenter.pngbin2868 -> 0 bytes
-rw-r--r--images/tools/DistLeft.pngbin2856 -> 0 bytes
-rw-r--r--images/tools/DistRight.pngbin2851 -> 0 bytes
-rw-r--r--images/tools/DistTop.pngbin2856 -> 0 bytes
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.css11
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html6
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css4
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css9
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html10
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js2
-rwxr-xr-xscss/imports/scss/_Tools.scss56
32 files changed, 80 insertions, 60 deletions
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
701 701
702.cornerRadius:hover, .cornerRadius:active { opacity: 1; } 702.cornerRadius:hover, .cornerRadius:active { opacity: 1; }
703 703
704.cornerRadius.topLeft { -webkit-transform: rotate(0deg); } 704.cornerRadius.topLeft { -webkit-transform: rotate(0deg); margin-top: 1px; margin-right: 3px; }
705 705
706.cornerRadius.topRight { -webkit-transform: rotate(90deg); } 706.cornerRadius.topRight { -webkit-transform: rotate(90deg); margin-right: 3px; margin-top: 1px; }
707 707
708.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); } 708.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); margin-right: 2px; margin-top: -1px; }
709 709
710.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); } 710.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); margin-right: 4px; margin-top: -1px; }
711 711
712#toolOptionsContainer { display: inline; float: left; } 712#toolOptionsContainer { display: inline; float: left; }
713 713
@@ -819,37 +819,37 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
819 819
820.selectionToolIcon { width: 16px; height: 16px; background-repeat: no-repeat; background-position: 1px 2px; } 820.selectionToolIcon { width: 16px; height: 16px; background-repeat: no-repeat; background-position: 1px 2px; }
821 821
822.alignTopIcon { background-image: url("../images/tools/AlignTop.png"); } 822.alignTopIcon { background-image: url("../images/optionsbar/selection/AlignTop.png"); }
823 823
824.alignMiddleIcon { background-image: url("../images/tools/AlignMiddle.png"); } 824.alignMiddleIcon { background-image: url("../images/optionsbar/selection/AlignMiddle.png"); }
825 825
826.alignBottomIcon { background-image: url("../images/tools/AlignBottom.png"); } 826.alignBottomIcon { background-image: url("../images/optionsbar/selection/AlignBottom.png"); }
827 827
828.alignLeftIcon { background-image: url("../images/tools/AlignLeft.png"); } 828.alignLeftIcon { background-image: url("../images/optionsbar/selection/AlignLeft.png"); }
829 829
830.alignCenterIcon { background-image: url("../images/tools/AlignCenter.png"); } 830.alignCenterIcon { background-image: url("../images/optionsbar/selection/AlignCenter.png"); }
831 831
832.alignRightIcon { background-image: url("../images/tools/AlignRight.png"); } 832.alignRightIcon { background-image: url("../images/optionsbar/selection/AlignRight.png"); }
833 833
834.arrangeBringForwardIcon { background-image: url("../images/tools/ArrangeBringForward.png"); } 834.arrangeBringForwardIcon { background-image: url("../images/optionsbar/selection/ArrangeBringForward.png"); }
835 835
836.arrangeSendBackwardIcon { background-image: url("../images/tools/ArrangeSendBackward.png"); } 836.arrangeSendBackwardIcon { background-image: url("../images/optionsbar/selection/ArrangeSendBackward.png"); }
837 837
838.arrangeBringToFrontIcon { background-image: url("../images/tools/ArrangeBringToFront.png"); } 838.arrangeBringToFrontIcon { background-image: url("../images/optionsbar/selection/ArrangeBringToFront.png"); }
839 839
840.arrangeSendToBackIcon { background-image: url("../images/tools/ArrangeSendToBack.png"); } 840.arrangeSendToBackIcon { background-image: url("../images/optionsbar/selection/ArrangeSendToBack.png"); }
841 841
842.distTopIcon { background-image: url("../images/tools/DistTop.png"); } 842.distTopIcon { background-image: url("../images/optionsbar/selection/DistTop.png"); }
843 843
844.distMiddleIcon { background-image: url("../images/tools/DistMiddle.png"); } 844.distMiddleIcon { background-image: url("../images/optionsbar/selection/DistMiddle.png"); }
845 845
846.distBottomIcon { background-image: url("../images/tools/DistBottom.png"); } 846.distBottomIcon { background-image: url("../images/optionsbar/selection/DistBottom.png"); }
847 847
848.distLeftIcon { background-image: url("../images/tools/DistLeft.png"); } 848.distLeftIcon { background-image: url("../images/optionsbar/selection/DistLeft.png"); }
849 849
850.distCenterIcon { background-image: url("../images/tools/DistCenter.png"); } 850.distCenterIcon { background-image: url("../images/optionsbar/selection/DistCenter.png"); }
851 851
852.distRightIcon { background-image: url("../images/tools/DistRight.png"); } 852.distRightIcon { background-image: url("../images/optionsbar/selection/DistRight.png"); }
853 853
854#toolsPanelContent { width: 40px; } 854#toolsPanelContent { width: 40px; }
855 855
diff --git a/images/optionsbar/link.png b/images/optionsbar/link.png
index 7a3f166a..dc834675 100755
--- a/images/optionsbar/link.png
+++ b/images/optionsbar/link.png
Binary files differ
diff --git a/images/optionsbar/rectangle/cornerRadius.png b/images/optionsbar/rectangle/cornerRadius.png
index 106c530b..d7bb2d44 100755
--- a/images/optionsbar/rectangle/cornerRadius.png
+++ b/images/optionsbar/rectangle/cornerRadius.png
Binary files differ
diff --git a/images/optionsbar/selection/AlignBottom.png b/images/optionsbar/selection/AlignBottom.png
index 842cb057..f68d62c8 100755
--- a/images/optionsbar/selection/AlignBottom.png
+++ b/images/optionsbar/selection/AlignBottom.png
Binary files differ
diff --git a/images/tools/AlignCenter.png b/images/optionsbar/selection/AlignCenter.png
index 64bb4014..64bb4014 100644
--- a/images/tools/AlignCenter.png
+++ b/images/optionsbar/selection/AlignCenter.png
Binary files differ
diff --git a/images/tools/AlignMiddle.png b/images/optionsbar/selection/AlignMiddle.png
index 03dffad5..03dffad5 100644
--- a/images/tools/AlignMiddle.png
+++ b/images/optionsbar/selection/AlignMiddle.png
Binary files differ
diff --git a/images/tools/ArrangeBringForward.png b/images/optionsbar/selection/ArrangeBringForward.png
index 55861b5a..55861b5a 100644
--- a/images/tools/ArrangeBringForward.png
+++ b/images/optionsbar/selection/ArrangeBringForward.png
Binary files differ
diff --git a/images/tools/ArrangeBringToFront.png b/images/optionsbar/selection/ArrangeBringToFront.png
index 1344e618..1344e618 100644
--- a/images/tools/ArrangeBringToFront.png
+++ b/images/optionsbar/selection/ArrangeBringToFront.png
Binary files differ
diff --git a/images/tools/ArrangeSendBackward.png b/images/optionsbar/selection/ArrangeSendBackward.png
index 2e8ea0ad..2e8ea0ad 100644
--- a/images/tools/ArrangeSendBackward.png
+++ b/images/optionsbar/selection/ArrangeSendBackward.png
Binary files differ
diff --git a/images/tools/ArrangeSendToBack.png b/images/optionsbar/selection/ArrangeSendToBack.png
index 699ae5ba..699ae5ba 100644
--- a/images/tools/ArrangeSendToBack.png
+++ b/images/optionsbar/selection/ArrangeSendToBack.png
Binary files differ
diff --git a/images/tools/DistBottom.png b/images/optionsbar/selection/DistBottom.png
index c7ed75ce..c7ed75ce 100644
--- a/images/tools/DistBottom.png
+++ b/images/optionsbar/selection/DistBottom.png
Binary files differ
diff --git a/images/tools/DistMiddle.png b/images/optionsbar/selection/DistMiddle.png
index bb32a441..bb32a441 100644
--- a/images/tools/DistMiddle.png
+++ b/images/optionsbar/selection/DistMiddle.png
Binary files differ
diff --git a/images/optionsbar/selection/alignHcenter.png b/images/optionsbar/selection/alignHcenter.png
deleted file mode 100755
index 64bb4014..00000000
--- a/images/optionsbar/selection/alignHcenter.png
+++ /dev/null
Binary files differ
diff --git a/images/optionsbar/selection/alignVcenter.png b/images/optionsbar/selection/alignVcenter.png
deleted file mode 100755
index 03dffad5..00000000
--- a/images/optionsbar/selection/alignVcenter.png
+++ /dev/null
Binary files differ
diff --git a/images/optionsbar/selection/distVcenter.png b/images/optionsbar/selection/distVcenter.png
deleted file mode 100755
index bb32a441..00000000
--- a/images/optionsbar/selection/distVcenter.png
+++ /dev/null
Binary files differ
diff --git a/images/optionsbar/unlinked.png b/images/optionsbar/unlinked.png
index c209dc7d..49a6efa0 100755
--- a/images/optionsbar/unlinked.png
+++ b/images/optionsbar/unlinked.png
Binary files differ
diff --git a/images/tools/AlignBottom.png b/images/tools/AlignBottom.png
deleted file mode 100644
index f68d62c8..00000000
--- a/images/tools/AlignBottom.png
+++ /dev/null
Binary files differ
diff --git a/images/tools/AlignLeft.png b/images/tools/AlignLeft.png
deleted file mode 100644
index 822c5243..00000000
--- a/images/tools/AlignLeft.png
+++ /dev/null
Binary files differ
diff --git a/images/tools/AlignRight.png b/images/tools/AlignRight.png
deleted file mode 100644
index 07d6d7ef..00000000
--- a/images/tools/AlignRight.png
+++ /dev/null
Binary files differ
diff --git a/images/tools/AlignTop.png b/images/tools/AlignTop.png
deleted file mode 100644
index 378d8aab..00000000
--- a/images/tools/AlignTop.png
+++ /dev/null
Binary files differ
diff --git a/images/tools/DistCenter.png b/images/tools/DistCenter.png
deleted file mode 100644
index cf8f2bf5..00000000
--- a/images/tools/DistCenter.png
+++ /dev/null
Binary files differ
diff --git a/images/tools/DistLeft.png b/images/tools/DistLeft.png
deleted file mode 100644
index 3849e9e6..00000000
--- a/images/tools/DistLeft.png
+++ /dev/null
Binary files differ
diff --git a/images/tools/DistRight.png b/images/tools/DistRight.png
deleted file mode 100644
index e350b53e..00000000
--- a/images/tools/DistRight.png
+++ /dev/null
Binary files differ
diff --git a/images/tools/DistTop.png b/images/tools/DistTop.png
deleted file mode 100644
index 1d474b3c..00000000
--- a/images/tools/DistTop.png
+++ /dev/null
Binary files 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 @@
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6 6
7.ovalProperties{
8}
9
10.ovalProperties hottextunit {
11 width: 22px;
12}
13
14.ovalProperties label {
15 margin-left: 6px;
16 margin-right: 6px;
17}
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 @@
35 </head> 35 </head>
36 36
37 <body> 37 <body>
38 <div data-montage-id="ovalProperties"> 38 <div data-montage-id="ovalProperties" class="ovalProperties toolOptionsFloatChildren">
39 <label class="label">Inner Radius:</label> 39 <label>Inner Radius:</label>
40 <div data-montage-id="innerRadiusControl" class="label"></div> 40 <div data-montage-id="innerRadiusControl"></div>
41 </div> 41 </div>
42 </body> 42 </body>
43 43
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 @@
12 opacity: 0.7; 12 opacity: 0.7;
13 width: 17px; 13 width: 17px;
14 height: 18px; 14 height: 18px;
15 margin-right: 10px; 15 margin-right: 8px;