aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-09 18:07:32 -0700
committerJohn Mayhew2012-05-09 18:07:32 -0700
commit18370abcf406c6ab36d5c5f2613cb79e756ff6d2 (patch)
tree7c1c75a974dc593f73149770f94c8d746eb4926f /scss/imports
parent7dd942b6e19d2d7a779bc50e7bf4c8f8780b8f3a (diff)
downloadninja-18370abcf406c6ab36d5c5f2613cb79e756ff6d2.tar.gz
-Consolidated many redundant css classes used in the tool options bars
Diffstat (limited to 'scss/imports')
-rwxr-xr-xscss/imports/scss/_PanelUI.scss13
-rwxr-xr-xscss/imports/scss/_Tools.scss110
2 files changed, 36 insertions, 87 deletions
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index dd8cee04..8baffc95 100755
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
@@ -855,20 +855,7 @@ div.pp-button.button-divider div {
855 855
856// End: Tree component for Project Panel 856// End: Tree component for Project Panel
857 857
858
859.subToolHolderPanel{
860 margin-left:42px
861}
862
863.subToolPanel{
864 margin-top:-6px
865}
866
867// .marginposition{
868 // margin-top:-26px
869// }
870// Begin: Properties Panel styles 858// Begin: Properties Panel styles
871
872.properties_panel { 859.properties_panel {
873 overflow-x: hidden; 860 overflow-x: hidden;
874 color: $color-panel-text; 861 color: $color-panel-text;
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 637828a4..24846138 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -11,8 +11,11 @@
11// _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss 11// _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
12// 12//
13 13
14 14.subToolHolderPanel {
15// Made changes to toolButton } 15 margin-left: 42px;
16 padding: 6px;
17 float:left;
18}
16 19
17.subToolHolderPanel .toolbutton { 20.subToolHolderPanel .toolbutton {
18 float:left; 21 float:left;
@@ -24,53 +27,37 @@
24 -webkit-transform: scale(0.75); 27 -webkit-transform: scale(0.75);
25} 28}
26 29
27.toolOptionsSpacer{ 30.toolOptionsFloatChildren > * {
28 margin-right: 9px; 31 float:left;
29}
30
31/* These appear to be unused
32.toolSeparator {
33 height:1px;
34 width:30px;
35 // margin-left: 3px;
36 // margin-right: 3px;
37} 32}
38 33
39.toolSeparatorTop { 34// .toolOptionsFloatChildren select.nj-skinned {
40 margin-top: 3px; 35// margin-top: 2px;
41 margin-bottom: 0px; 36// }
42}
43 37
44.toolSeparatorMiddle {
45 margin-top: 0px;
46 margin-bottom: 0px;
47}
48 38
49.toolSeparatorBottom { 39.toolOptionsSpacer {
50 margin-top: 0px; 40 margin-right: 9px;
51 margin-bottom: 3px;
52} 41}
53 42
54.toolImageBase { 43.toolColorChipCtrl {
55 padding: 0px; 44 width: 18px;
56 width: 26px; 45 height: 18px;
57 height: 23px; 46 margin-top: 1px;
58 opacity: 0.7; 47 margin-left: 3px;
59 background-repeat:no-repeat; 48 margin-right: 8px;
49 border: 1px black solid;
60} 50}
61 51
62.toolImageBase:hover { 52.toolColorChipIcon {
63 opacity: 1.0; 53 width: 20px;
64 } 54 height: 20px;
65 55 margin-top: 1px;
66.drawingMode { 56 -webkit-transform: scale(0.8);
67 outline:blue solid thin; 57 background-color: rgb(40, 40, 40);
68} 58}
69*/
70
71 59
72// Added new styling Sub Tool Shape Options 60// Added new styling Sub Tool Shape Options
73
74.textBox { 61.textBox {
75 62
76 padding-top:3px; 63 padding-top:3px;
@@ -135,20 +122,20 @@
135.cornerRadius.topRight 122.cornerRadius.topRight
136{ 123{
137 -webkit-transform: rotate(90deg); 124 -webkit-transform: rotate(90deg);
138 margin-right : -2px; 125// margin-right : -2px;
139} 126}
140 127
141.cornerRadius.bottomLeft 128.cornerRadius.bottomLeft
142{ 129{
143 margin-top: 3px; 130// margin-top: 3px;
144 -webkit-transform: rotate(270deg); 131 -webkit-transform: rotate(270deg);
145} 132}
146 133
147.cornerRadius.bottomRight 134.cornerRadius.bottomRight
148{ 135{
149 margin-top: 3px; 136// margin-top: 3px;
150 -webkit-transform: rotate(180deg); 137 -webkit-transform: rotate(180deg);
151 margin-right : -2px; 138// margin-right : -2px;
152} 139}
153 140
154#toolOptionsContainer 141#toolOptionsContainer
@@ -292,7 +279,7 @@ input[type="radio"]:disabled {
292 margin: 0px; 279 margin: 0px;
293 padding: 0px; 280 padding: 0px;
294 margin-right: 5px; 281 margin-right: 5px;
295 margin-top: 4px; 282 margin-top: 0px;
296 background-repeat: no-repeat; 283 background-repeat: no-repeat;
297 opacity: 0.8; 284 opacity: 0.8;
298 text-indent: -9999px; 285 text-indent: -9999px;
@@ -353,35 +340,18 @@ input[type="radio"]:disabled {
353 height: 100%; 340 height: 100%;
354 float: left; 341 float: left;
355 position: relative; 342 position: relative;
356 top: 5px;
357} 343}
358 344
359.tagRadioButtons select.nj-skinned { 345.tagRadioButtons select.nj-skinned {
360 visibility: visible; 346 visibility: visible;
361 position: relative; 347 position: relative;
348 margin-top: 1px;
362} 349}
363 350
364.tagRadioButtons select[disabled="true"].nj-skinned, 351.tagRadioButtons select[disabled="true"].nj-skinned,
365.tagRadioButtons select[disabled].nj-skinned { 352.tagRadioButtons select[disabled].nj-skinned {
366 visibility: hidden; 353 visibility: hidden;
367} 354}
368
369.tagRadioButtons .fillColorCtrl {
370 width: 18px;
371 height: 18px;
372 margin-top: 6px;
373 margin-left: 3px;
374 margin-right: 8px;
375 border: 1px black solid;
376}
377
378.tagRadioButtons .colorCtrlIcon {
379 width: 20px;
380 height: 20px;
381 margin-top: 6px;
382 -webkit-transform: scale(0.8);
383 background-color: rgb(40, 40, 40);
384}
385// End: styles for tag toolbar 355// End: styles for tag toolbar
386 356
387#zoomToolOptionHolder input#zoomInTool:checked{ 357#zoomToolOptionHolder input#zoomInTool:checked{
@@ -430,9 +400,7 @@ input[type="radio"]:disabled {
430 display: block; 400 display: block;
431 float: left; 401 float: left;
432 margin: 0px; 402 margin: 0px;
433 padding: 0px; 403 margin-right: 5px;
434 margin-right: 5px;
435 margin-top: 4px;
436 background-repeat: no-repeat; 404 background-repeat: no-repeat;
437 opacity: 0.8; 405 opacity: 0.8;
438 text-indent: -9999px; 406 text-indent: -9999px;
@@ -470,15 +438,7 @@ input[type="radio"]:disabled {
470 background-position: 0px -20px; 438 background-position: 0px -20px;
471} 439}
472 440
473// Selection Tool Options 441// Selection Tool Options Styles
474.optionsSelectionTool {
475 padding: 6px;
476}
477
478 .optionsSelectionTool > * {
479 float:left;
480}
481
482.optionsSelectionTool button { 442.optionsSelectionTool button {
483 padding-top: 0px; 443 padding-top: 0px;
484} 444}
@@ -489,6 +449,7 @@ input[type="radio"]:disabled {
489 background-repeat:no-repeat; 449 background-repeat:no-repeat;
490 background-position: 1px 2px; 450 background-position: 1px 2px;
491} 451}
452
492.alignTopIcon { 453.alignTopIcon {
493 background-image: url("../images/tools/AlignTop.png"); 454 background-image: url("../images/tools/AlignTop.png");
494}