diff options
author | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
commit | 7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (patch) | |
tree | f0f6168b083aa929d34f37edca6c87ce7c3743bd /scss/imports | |
parent | 0dc43f8b6d7db6d9ed698e8c4568e942d8e3d8eb (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-7b76e4664b35f044e9f24c060f1e092cb5e5c4b0.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'scss/imports')
-rwxr-xr-x | scss/imports/scss/_PanelUI.scss | 13 | ||||
-rwxr-xr-x | scss/imports/scss/_Tools.scss | 317 | ||||
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 124 |
3 files changed, 156 insertions, 298 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 55c37d02..c63e695d 100755 --- a/scss/imports/scss/_Tools.scss +++ b/scss/imports/scss/_Tools.scss | |||
@@ -11,68 +11,77 @@ | |||
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; |
19 | -webkit-transform: scale(0.6); | 22 | -webkit-transform: scale(0.6); |
23 | margin-top: -4px; | ||
20 | } | 24 | } |
21 | 25 | ||
22 | .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { | 26 | .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { |
23 | -webkit-transform: scale(0.75); | 27 | -webkit-transform: scale(0.75); |
24 | } | 28 | } |
25 | 29 | ||
26 | .subOption{ | 30 | .toolOptionsFloatChildren > * { |
27 | float:left; | 31 | float:left; |
28 | // margin:10px; | ||
29 | margin-top: 5px; | ||
30 | margin-left: 10px; | ||
31 | margin-right: 10px; | ||
32 | } | 32 | } |
33 | 33 | ||
34 | .toolSeparator { | 34 | .toolOptionsSpacer { |
35 | height:1px; | 35 | margin-right: 9px; |
36 | width:30px; | ||
37 | // margin-left: 3px; | ||
38 | // margin-right: 3px; | ||
39 | } | 36 | } |
40 | 37 | ||
41 | .toolSeparatorTop { | 38 | .toolColorChipCtrl { |
42 | margin-top: 3px; | 39 | width: 18px; |
43 | margin-bottom: 0px; | 40 | height: 18px; |
41 | margin-top: 1px; | ||
42 | margin-left: 3px; | ||
43 | margin-right: 8px; | ||
44 | border: 1px black solid; | ||
44 | } | 45 | } |
45 | 46 | ||
46 | .toolSeparatorMiddle { | 47 | .toolColorChipIcon { |
47 | margin-top: 0px; | 48 | width: 20px; |
48 | margin-bottom: 0px; | 49 | height: 20px; |
50 | margin-top: 1px; | ||
51 | -webkit-transform: scale(0.8); | ||
52 | background-color: rgb(40, 40, 40); | ||
49 | } | 53 | } |
50 | 54 | ||
51 | .toolSeparatorBottom { | 55 | // generic styles for image radio button groups used in the tool options bar |
52 | margin-top: 0px; | 56 | .subToolHolderPanel input.toolOptsRadioButton { |
53 | margin-bottom: 3px; | 57 | width: 24px; |
58 | height: 24px; | ||
59 | margin: 0px 5px 0px 0px; | ||
60 | padding: 0px; | ||
61 | cursor: pointer; | ||
62 | border-radius: 3px; | ||
63 | -webkit-user-select: none; | ||
64 | border: 1px solid transparent; | ||
65 | background: none; | ||
66 | background-repeat: no-repeat; | ||
67 | background-position: center center; | ||
68 | -webkit-transform: scale(0.9); | ||
54 | } | 69 | } |
55 | 70 | ||
56 | .toolImageBase { | 71 | .subToolHolderPanel input.toolOptsRadioButton:hover { |
57 | padding: 0px; | 72 | box-shadow: 0px 0px 2px 2px #999; |
58 | width: 26px; | 73 | -webkit-transform: scale(1); |
59 | height: 23px; | ||
60 | opacity: 0.7; | ||
61 | background-repeat:no-repeat; | ||
62 | } | 74 | } |
63 | 75 | ||
64 | .toolImageBase:hover { | 76 | .subToolHolderPanel input.toolOptsRadioButton:checked { |
65 | opacity: 1.0; | 77 | box-shadow: inset 0px 0px 2px 2px #999; |
66 | } | 78 | background-color:#363636; |
67 | 79 | background-position: center center; | |
68 | 80 | background-repeat: no-repeat; | |
69 | .drawingMode { | 81 | -webkit-transform: scale(1); |
70 | outline:blue solid thin; | ||
71 | } | 82 | } |
72 | 83 | ||
73 | |||
74 | // Added new styling Sub Tool Shape Options | 84 | // Added new styling Sub Tool Shape Options |
75 | |||
76 | .textBox { | 85 | .textBox { |
77 | 86 | ||
78 | padding-top:3px; | 87 | padding-top:3px; |
@@ -129,28 +138,28 @@ | |||
129 | opacity:1; | 138 | opacity:1; |
130 | } | 139 | } |
131 | 140 | ||
132 | .cornerRadius.topLeft | 141 | .cornerRadius.topLeft { |
133 | { | ||
134 | -webkit-transform: rotate(0deg); | 142 | -webkit-transform: rotate(0deg); |
143 | margin-top: 1px; | ||
144 | margin-right: 3px; | ||
135 | } | 145 | } |
136 | 146 | ||
137 | .cornerRadius.topRight | 147 | .cornerRadius.topRight { |
138 | { | ||
139 | -webkit-transform: rotate(90deg); | 148 | -webkit-transform: rotate(90deg); |
140 | margin-right : -2px; | 149 | margin-right: 3px; |
150 | margin-top: 1px; | ||
141 | } | 151 | } |
142 | 152 | ||
143 | .cornerRadius.bottomLeft | 153 | .cornerRadius.bottomLeft { |
144 | { | ||
145 | margin-top: 3px; | ||
146 | -webkit-transform: rotate(270deg); | 154 | -webkit-transform: rotate(270deg); |
155 | margin-right: 2px; | ||
156 | margin-top: -1px; | ||
147 | } | 157 | } |
148 | 158 | ||
149 | .cornerRadius.bottomRight | 159 | .cornerRadius.bottomRight { |
150 | { | ||
151 | margin-top: 3px; | ||
152 | -webkit-transform: rotate(180deg); | 160 | -webkit-transform: rotate(180deg); |
153 | margin-right : -2px; | 161 | margin-right: 4px; |
162 | margin-top: -1px; | ||
154 | } | 163 | } |
155 | 164 | ||
156 | #toolOptionsContainer | 165 | #toolOptionsContainer |
@@ -285,159 +294,143 @@ input[type="radio"]:disabled { | |||
285 | } | 294 | } |
286 | 295 | ||
287 | // Begin: styles for tag toolbar | 296 | // Begin: styles for tag toolbar |
288 | #tagToolContainer input.tag-type, | 297 | .tagRadioButtons input.divTool { |
289 | #rotateObjectToolContainer input.tag-type, | 298 | background-image: url("../images/optionsbar/tag/div-tag.png"); |
290 | #translateObjectToolContainer input.tag-type { | 299 | } |
291 | background: none; | 300 | .tagRadioButtons input.imageTool { |
292 | width: 20px; | 301 | background-image: url("../images/optionsbar/tag/img-tag.png"); |
293 | height: 20px; | ||
294 | display: block; | ||
295 | float: left; | ||
296 | margin: 0px; | ||
297 | padding: 0px; | ||
298 | margin-right: 5px; | ||
299 | margin-top: 4px; | ||
300 | background-repeat: no-repeat; | ||
301 | opacity: 0.8; | ||
302 | text-indent: -9999px; | ||
303 | cursor: pointer; | ||
304 | -webkit-border-radius: 3px; | ||
305 | -webkit-user-select: none; | ||
306 | border: 1px solid transparent; | ||
307 | } | 302 | } |
308 | #tagToolContainer input.tag-type { | 303 | .tagRadioButtons input.videoTool { |
309 | background-image: url("../images/tools/sprite-toolbar-tag.png"); | 304 | background-image: url("../images/optionsbar/tag/vid-tag.png"); |
310 | } | 305 | } |
311 | #rotateObjectToolContainer input.tag-type { | 306 | .tagRadioButtons input.canvasTool { |
312 | background-image: url("../images/tools/sprite-toolbar-3d.png"); | 307 | background-image: url("../images/optionsbar/tag/canvas-tag.png"); |
313 | } | 308 | } |
314 | #translateObjectToolContainer input.tag-type { | 309 | .tagRadioButtons input.customTool { |
315 | background-image: url("../images/tools/sprite-toolbar-3d.png"); | 310 | background-image: url("../images/optionsbar/tag/custom-tag.png"); |
316 | } | 311 | } |
317 | 312 | ||
318 | #tag |