aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-14 14:57:07 -0700
committerJohn Mayhew2012-05-14 14:57:07 -0700
commit52f63541065ce94fab8766b1b0db057eafcfccaa (patch)
tree0b2129f4bda627c2cdf5c2b79e6079dafdc63b01
parent2cdefe05cdc058160093d7ab9d50a4fadd1c45fc (diff)
downloadninja-52f63541065ce94fab8766b1b0db057eafcfccaa.tar.gz
-changed tool options radio button class to match the styling of the shape options tool buttons
-fixed bug injected in the tag tool caused by accidental removal of the value element attribute -moved color chip in the tag tool to the right of the element radio button group
Diffstat
-rwxr-xr-xcss/ninja.css10
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html16
-rwxr-xr-xscss/imports/scss/_Tools.scss38
-rwxr-xr-xscss/imports/scss/_toolbar.scss2
4 files changed, 27 insertions, 39 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 34a29362..6b3c00d6 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -679,13 +679,11 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul
679 679
680.toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } 680.toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; }
681 681
682.subToolHolderPanel input.toolOptsRadioButton { background: none; width: 20px; height: 20px; display: block; 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; background-position: 1px 1px; } 682.subToolHolderPanel input.toolOptsRadioButton { width: 24px; height: 24px; margin: 0px 5px 0px 0px; padding: 0px; cursor: pointer; border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; background: none; background-repeat: no-repeat; background-position: center center; -webkit-transform: scale(0.9); }
683 683
684.subToolHolderPanel input.toolOptsRadioButton:active { border: 1px solid transparent; } 684.subToolHolderPanel input.toolOptsRadioButton:hover { box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); }
685 685
686.subToolHolderPanel input.toolOptsRadioButton:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; } 686.subToolHolderPanel input.toolOptsRadioButton:checked { box-shadow: inset 0px 0px 2px 2px #999; background-color: #363636; background-position: center center; background-repeat: no-repeat; -webkit-transform: scale(1); }
687
688.subToolHolderPanel input.toolOptsRadioButton:checked { background-color: #b2b2b2; opacity: 1.0; cursor: default; -webkit-box-shadow: none; background-repeat: no-repeat; background-position: 1px 1px; }
689 687
690.textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; } 688.textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; }
691 689
@@ -837,7 +835,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
837 835
838.toolbutton:active { background-color: #8c8c8c; } 836.toolbutton:active { background-color: #8c8c8c; }
839 837
840.toolbutton.active { box-shadow: inset 0px 0px 2px 2px #555; background-color: #363636; } 838.toolbutton.active { box-shadow: inset 0px 0px 2px 2px #999; background-color: #363636; }
841 839
842.SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); } 840.SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); }
843 841
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 e9c15d22..7a8f6d87 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -39,18 +39,18 @@
39 <body> 39 <body>
40 <div data-montage-id="tagProperties" class="subToolHolderPanel toolOptionsFloatChildren"> 40 <div data-montage-id="tagProperties" class="subToolHolderPanel toolOptionsFloatChildren">
41 <div data-montage-id="tagToolContainer" class="tagRadioButtons toolOptionsFloatChildren"> 41 <div data-montage-id="tagToolContainer" class="tagRadioButtons toolOptionsFloatChildren">
42 <input type="radio" data-montage-id="divTool" class="toolOptsRadioButton divTool" title="Div Element" name="TagRadios" value="div" checked/>
43 <input type="radio" data-montage-id="imageTool" class="toolOptsRadioButton imageTool" title="Image Element" name="TagRadios" value="image"/>
44 <input type="radio" data-montage-id="videoTool" class="toolOptsRadioButton videoTool" title="Video Element" name="TagRadios" value="video"/>
45 <input type="radio" data-montage-id="canvasTool" class="toolOptsRadioButton canvasTool" title="Canvas Element" name="TagRadios" value="canvas"/>
46 <input type="radio" data-montage-id="customTool" class="toolOptsRadioButton customTool" title="Custom Element" name="TagRadios" value="custom"/>
47
48 <div class="nj-divider divider-vertical">&nbsp;</div>
49
42 <div class="toolColorChipIcon FillTool"></div> 50 <div class="toolColorChipIcon FillTool"></div>
43 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 51 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
44 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 52 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
45 53
46 <input type="radio" data-montage-id="divTool" class="toolOptsRadioButton divTool" title="Div Element" name="TagRadios" checked/>
47 <input type="radio" data-montage-id="imageTool" class="toolOptsRadioButton imageTool" title="Image Element" name="TagRadios"/>
48 <input type="radio" data-montage-id="videoTool" class="toolOptsRadioButton videoTool" title="Video Element" name="TagRadios"/>
49 <input type="radio" data-montage-id="canvasTool" class="toolOptsRadioButton canvasTool" title="Canvas Element" name="TagRadios"/>
50 <input type="radio" data-montage-id="customTool" class="toolOptsRadioButton customTool" title="Custom Element" name="TagRadios"/>
51
52 <div class="nj-divider divider-vertical">&nbsp;</div>
53
54 <div id="classNameContainer"> 54 <div id="classNameContainer">
55 <label class="label"> Class:</label> 55 <label class="label"> Class:</label>
56 <input data-montage-id="className" type="text" name="ClassNameTextBox" class="textBox nj-skinned"/> 56 <input data-montage-id="className" type="text" name="ClassNameTextBox" class="textBox nj-skinned"/>
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 1813fb14..a4deb488 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -54,43 +54,33 @@
54 54
55// generic styles for image radio button groups used in the tool options bar 55// generic styles for image radio button groups used in the tool options bar
56.subToolHolderPanel input.toolOptsRadioButton { 56.subToolHolderPanel input.toolOptsRadioButton {
57 background: none; 57 width: 24px;
58 width: 20px; 58 height: 24px;
59 height: 20px; 59 margin: 0px 5px 0px 0px;
60 display: block;
61 margin: 0px;
62 padding: 0px; 60 padding: 0px;
63 margin-right: 5px;
64 margin-top: 0px;
65 background-repeat: no-repeat;
66 opacity: 0.8;
67 text-indent: -9999px;
68 cursor: pointer; 61 cursor: pointer;
69 -webkit-border-radius: 3px; 62 border-radius: 3px;
70 -webkit-user-select: none; 63 -webkit-user-select: none;
71 border: 1px solid transparent; 64 border: 1px solid transparent;
72 background-position: 1px 1px; 65 background: none;
73} 66 background-repeat: no-repeat;
74 67 background-position: center center;
75.subToolHolderPanel input.toolOptsRadioButton:active { 68 -webkit-transform: scale(0.9);
76 border: 1px solid transparent;
77} 69}
78 70
79.subToolHolderPanel input.toolOptsRadioButton:hover { 71.subToolHolderPanel input.toolOptsRadioButton:hover {
80 opacity: 1.0; 72 box-shadow: 0px 0px 2px 2px #999;
81 -webkit-box-shadow: 0px 0px 4px #fff; 73 -webkit-transform: scale(1);
82} 74}
83 75
84.subToolHolderPanel input.toolOptsRadioButton:checked { 76.subToolHolderPanel input.toolOptsRadioButton:checked {
85 background-color: $color-tool-bg-active; 77 box-shadow: inset 0px 0px 2px 2px #999;
86 opacity: 1.0; 78 background-color:#363636;
87 cursor: default; 79 background-position: center center;
88 -webkit-box-shadow: none;
89 background-repeat: no-repeat; 80 background-repeat: no-repeat;
90 background-position: 1px 1px; 81 -webkit-transform: scale(1);
91} 82}
92 83
93
94// Added new styling Sub Tool Shape Options 84// Added new styling Sub Tool Shape Options
95.textBox { 85.textBox {
96 86
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index d2e2f766..9440fa85 100755
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
@@ -53,7 +53,7 @@
53} 53}
54 54
55.toolbutton.active { 55.toolbutton.active {
56 box-shadow: inset 0px 0px 2px 2px #555; 56 box-shadow: inset 0px 0px 2px 2px #999;
57 background-color:#363636; 57 background-color:#363636;
58} 58}
59 59
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 09:43:18 +0000