aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-09 18:07:32 -0700
committerJohn Mayhew2012-05-09 18:07:32 -0700
commit18370abcf406c6ab36d5c5f2613cb79e756ff6d2 (patch)
tree7c1c75a974dc593f73149770f94c8d746eb4926f
parent7dd942b6e19d2d7a779bc50e7bf4c8f8780b8f3a (diff)
downloadninja-18370abcf406c6ab36d5c5f2613cb79e756ff6d2.tar.gz
-Consolidated many redundant css classes used in the tool options bars
-rwxr-xr-xcss/ninja.css44
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.css21
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html6
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.css23
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html6
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css24
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html4
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.css16
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html8
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css2
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html10
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css23
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html14
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js1
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html26
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css1
-rwxr-xr-xscss/imports/scss/_PanelUI.scss13
-rwxr-xr-xscss/imports/scss/_Tools.scss110
19 files changed, 88 insertions, 266 deletions
diff --git a/css/ninja.css b/css/ninja.css
index a65e826f..b281632e 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -526,10 +526,6 @@ div.pp-button.button-divider div { height: 1px; width: 24px; background-color: b
526 526
527#pp-container-assets input.inline-editor { height: 11px; width: 80%; background-color: #242424 !important; color: #b2b2b2 !important; top: -2px; border-width: 0px; font-size: 11px; } 527#pp-container-assets input.inline-editor { height: 11px; width: 80%; background-color: #242424 !important; color: #b2b2b2 !important; top: -2px; border-width: 0px; font-size: 11px; }
528 528
529.subToolHolderPanel { margin-left: 42px; }
530
531.subToolPanel { margin-top: -6px; }
532
533.properties_panel { overflow-x: hidden; color: white; } 529.properties_panel { overflow-x: hidden; color: white; }
534 530
535.properties_panel select { -webkit-appearance: none; font-size: 9px; color: white; background-color: #444444; border: 1px solid #313131; width: 120px; height: 15px; outline: none; background-image: url("../images/dropdown-bg.png"); background-repeat: no-repeat; background-position: right center; } 531.properties_panel select { -webkit-appearance: none; font-size: 9px; color: white; background-color: #444444; border: 1px solid #313131; width: 120px; height: 15px; outline: none; background-image: url("../images/dropdown-bg.png"); background-repeat: no-repeat; background-position: right center; }
@@ -677,25 +673,19 @@ nav.menuBar ul ul, nav.menuBar ul li:hover ul ul, nav.menuBar ul ul li:hover ul
677 673
678nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; } 674nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; }
679 675
676.subToolHolderPanel { margin-left: 42px; padding: 6px; float: left; }
677
680.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); margin-top: -4px; } 678.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); margin-top: -4px; }
681 679
682.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); } 680.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); }
683 681
684.toolOptionsSpacer { margin-right: 9px; } 682.toolOptionsFloatChildren > * { float: left; }
685
686.toolSeparator { height: 1px; width: 30px; }
687
688.toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; }
689
690.toolSeparatorMiddle { margin-top: 0px; margin-bottom: 0px; }
691 683
692.toolSeparatorBottom { margin-top: 0px; margin-bottom: 3px; } 684.toolOptionsSpacer { margin-right: 9px; }
693
694.toolImageBase { padding: 0px; width: 26px; height: 23px; opacity: 0.7; background-repeat: no-repeat; }
695 685
696.toolImageBase:hover { opacity: 1.0; } 686.toolColorChipCtrl { width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; margin-right: 8px; border: 1px black solid; }
697 687
698.drawingMode { outline: blue solid thin; } 688.toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; }
699 689
700.textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; } 690.textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; }
701 691
@@ -713,11 +703,11 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul
713 703
714.cornerRadius.topLeft { -webkit-transform: rotate(0deg); } 704.cornerRadius.topLeft { -webkit-transform: rotate(0deg); }
715 705
716.cornerRadius.topRight { -webkit-transform: rotate(90deg); margin-right: -2px; } 706.cornerRadius.topRight { -webkit-transform: rotate(90deg); }
717 707
718.cornerRadius.bottomLeft { margin-top: 3px; -webkit-transform: rotate(270deg); } 708.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); }
719 709
720.cornerRadius.bottomRight { margin-top: 3px; -webkit-transform: rotate(180deg); margin-right: -2px; } 710.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); }
721 711
722#toolOptionsContainer { display: inline; float: left; } 712#toolOptionsContainer { display: inline; float: left; }
723 713
@@ -761,7 +751,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
761 751
762.optionLabel { margin-top: 5px; } 752.optionLabel { margin-top: 5px; }
763 753
764.tagRadioButtons input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 4px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } 754.tagRadioButtons input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 0px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; }
765 755
766.tagRadioButtons input.tag-type { background-image: url("../images/tools/sprite-toolbar-tag.png"); } 756.tagRadioButtons input.tag-type { background-image: url("../images/tools/sprite-toolbar-tag.png"); }
767 757
@@ -791,16 +781,12 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
791 781
792.tagRadioButtons input.customTool:checked { background-position: 0px -20px; } 782.tagRadioButtons input.customTool:checked { background-position: 0px -20px; }
793 783
794.tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; top: 5px; } 784.tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; }
795 785
796.tagRadioButtons select.nj-skinned { visibility: visible; position: relative; } 786.tagRadioButtons select.nj-skinned { visibility: visible; position: relative; margin-top: 1px; }
797 787
798.tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; } 788.tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; }
799 789
800.tagRadioButtons .fillColorCtrl { width: 18px; height: 18px; margin-top: 6px; margin-left: 3px; margin-right: 8px; border: 1px black solid; }
801
802.tagRadioButtons .colorCtrlIcon { width: 20px; height: 20px; margin-top: 6px; -webkit-transform: scale(0.8); background-color: #282828; }
803
804#zoomToolOptionHolder input#zoomInTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; } 790#zoomToolOptionHolder input#zoomInTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; }
805 791
806#zoomToolOptionHolder input#zoomOutTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_minus.png"); background-repeat: no-repeat; background-position: 4px 3px; } 792#zoomToolOptionHolder input#zoomOutTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_minus.png"); background-repeat: no-repeat; background-position: 4px 3px; }
@@ -811,7 +797,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
811 797
812#zoomToolOptionHolder input.zoom-option { background: none; } 798#zoomToolOptionHolder input.zoom-option { background: none; }
813 799
814.object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 4px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } 800.object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; margin-right: 5px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; }
815 801
816.object3DToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); } 802.object3DToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); }
817 803
@@ -829,10 +815,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
829 815
830.object3DToolContainer input.rotateGlobally:checked { background-position: 0px -20px; } 816.object3DToolContainer input.rotateGlobally:checked { background-position: 0px -20px; }
831 817
832.optionsSelectionTool { padding: 6px; }
833
834.optionsSelectionTool > * { float: left; }
835
836.optionsSelectionTool button { padding-top: 0px; } 818.optionsSelectionTool button { padding-top: 0px; }
837 819
838.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; }
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 @@
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 .optionsBrushTool {
8 padding: 6px;
9}
10 7
11 .optionsBrushTool > * {
12 float:left;
13}
14
15 .optionsBrushTool .fillColorCtrl {
16 width: 20px;
17 height: 18px;
18 margin-left: 3px;
19 margin-right: 8px;
20 border: 1px black solid;
21}
22
23 .optionsBrushTool .colorCtrlIcon {
24 width: 20px;
25 height: 20px;
26 -webkit-transform: scale(0.8);
27 background-color: rgb(40, 40, 40);
28} \ 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 @@
80 </head> 80 </head>
81 81
82 <body> 82 <body>
83 <div data-montage-id="brushProperties" class="subToolHolderPanel optionsBrushTool"> 83 <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren">
84 <div class="colorCtrlIcon FillTool"></div> 84 <div class="toolColorChipIcon FillTool"></div>
85 <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> 85 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
86 <div class="nj-divider divider-vertical">&nbsp;</div> 86 <div class="nj-divider divider-vertical">&nbsp;</div>
87 <label class="label"> Width:</label> 87 <label class="label"> Width:</label>
88 <div data-montage-id="strokeSize" class="label"></div> 88 <div data-montage-id="strokeSize" class="label"></div>
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 @@
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