diff options
author | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
commit | 53051672a62208fbc96957719d8285fac6431ed6 (patch) | |
tree | 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/panels/Timeline/TimelinePanel.reel/scss | |
parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
download | ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/DragDrop.js
js/panels/Timeline/Keyframe.reel/Keyframe.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Span.reel/Span.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
js/panels/Timeline/Tween.reel/Tween.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 143 |
1 files changed, 72 insertions, 71 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index d3529444..ccb421d0 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | |||
@@ -1,26 +1,27 @@ | |||
1 | @charset "UTF-8"; | 1 | @charset "UTF-8"; |
2 | 2 | ||
3 | /* <copyright> | 3 | /* <copyright> |
4 | Copyright (c) 2012, Motorola Mobility, Inc | 4 | Copyright (c) 2012, Motorola Mobility LLC. |
5 | All Rights Reserved. | 5 | All Rights Reserved. |
6 | BSD License. | ||
7 | 6 | ||
8 | Redistribution and use in source and binary forms, with or without | 7 | Redistribution and use in source and binary forms, with or without |
9 | modification, are permitted provided that the following conditions are met: | 8 | modification, are permitted provided that the following conditions are met: |
10 | 9 | ||
11 | - Redistributions of source code must retain the above copyright notice, | 10 | * Redistributions of source code must retain the above copyright notice, |
12 | this list of conditions and the following disclaimer. | 11 | this list of conditions and the following disclaimer. |
13 | - Redistributions in binary form must reproduce the above copyright | 12 | |
14 | notice, this list of conditions and the following disclaimer in the | 13 | * Redistributions in binary form must reproduce the above copyright notice, |
15 | documentation and/or other materials provided with the distribution. | 14 | this list of conditions and the following disclaimer in the documentation |
16 | - Neither the name of Motorola Mobility nor the names of its contributors | 15 | and/or other materials provided with the distribution. |
17 | may be used to endorse or promote products derived from this software | 16 | |
18 | without specific prior written permission. | 17 | * Neither the name of Motorola Mobility LLC nor the names of its |
18 | contributors may be used to endorse or promote products derived from this | ||
19 | software without specific prior written permission. | ||
19 | 20 | ||
20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 21 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 22 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 23 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 24 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 25 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 26 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 27 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -33,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
33 | /* TimelinePanel.scss | 34 | /* TimelinePanel.scss |
34 | * Main SCSS file for TimelinePanel component, compiled by SASS into the file css/TimelinePanel.css. | 35 | * Main SCSS file for TimelinePanel component, compiled by SASS into the file css/TimelinePanel.css. |
35 | */ | 36 | */ |
36 | 37 | ||
37 | // Import theme settings | 38 | // Import theme settings |
38 | @import "../../../../../scss/imports/themes/default/colors"; | 39 | @import "../../../../../scss/imports/themes/default/colors"; |
39 | // @import "../../../../../scss/imports/themes/default/fonts"; | 40 | // @import "../../../../../scss/imports/themes/default/fonts"; |
@@ -85,16 +86,16 @@ POSSIBILITY OF SUCH DAMAGE. | |||
85 | } | 86 | } |
86 | 87 | ||
87 | #bottomPanelContainer { | 88 | #bottomPanelContainer { |
88 | overflow: hidden !IMPORTANT; | 89 | overflow: hidden !IMPORTANT; |
89 | } | 90 | } |
90 | 91 | ||
91 | .layout-tracks { | 92 | .layout-tracks { |
92 | width: 100%; | 93 | width: 100%; |
93 | height: 100%; | 94 | height: 100%; |
94 | padding-bottom: 6px; | 95 | padding-bottom: 6px; |
95 | box-sizing: border-box; | 96 | box-sizing: border-box; |
96 | overflow: auto; | 97 | overflow: auto; |
97 | position: relative; | 98 | position: relative; |
98 | } | 99 | } |
99 | .tl_layertracks{ | 100 | .tl_layertracks{ |
100 | background-color: $color-tool-bg; | 101 | background-color: $color-tool-bg; |
@@ -102,7 +103,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
102 | width: 100%; | 103 | width: 100%; |
103 | -webkit-box-flex: 1; | 104 | -webkit-box-flex: 1; |
104 | padding-top: 21px; | 105 | padding-top: 21px; |
105 | box-sizing: border-box; | 106 | box-sizing: border-box; |
106 | } | 107 | } |
107 | .layerresizer{ | 108 | .layerresizer{ |
108 | height: auto; | 109 | height: auto; |
@@ -183,12 +184,12 @@ POSSIBILITY OF SUCH DAMAGE. | |||
183 | overflow: visible; | 184 | overflow: visible; |
184 | } | 185 | } |
185 | .layout_markers { | 186 | .layout_markers { |
186 | position: absolute; | 187 | position: absolute; |
187 | overflow: hidden; | 188 | overflow: hidden; |
188 | top: 0px; | 189 | top: 0px; |
189 | left: 0px; | 190 | left: 0px; |
190 | height: 20px; | 191 | height: 20px; |
191 | width: 100%; | 192 | width: 100%; |
192 | border-bottom-style: solid; | 193 | border-bottom-style: solid; |
193 | } | 194 | } |
194 | 195 | ||
@@ -220,7 +221,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
220 | .container-tracks, | 221 | .container-tracks, |
221 | .timelinemarkers, | 222 | .timelinemarkers, |
222 | .mastertrack { | 223 | .mastertrack { |
223 | width: 2000px; | 224 | width: 2000px; |
224 | } | 225 | } |
225 | .userlayers{ | 226 | .userlayers{ |
226 | width: 100%; | 227 | width: 100%; |
@@ -316,18 +317,18 @@ POSSIBILITY OF SUCH DAMAGE. | |||
316 | margin-top: 0%; | 317 | margin-top: 0%; |
317 | } | 318 | } |
318 | .timeline-disabled { | 319 | .timeline-disabled { |
319 | position: absolute; | 320 | position: absolute; |
320 | top: 0px; | 321 | top: 0px; |
321 | left: 0px; | 322 | left: 0px; |
322 | width: 100%; | 323 | width: 100%; |
323 | height: 100%; | 324 | height: 100%; |
324 | background-color: rgba(30,30,30, 0.796); | 325 | background-color: rgba(30,30,30, 0.796); |
325 | z-index: 100; | 326 | z-index: 100; |
326 | display: none; | 327 | display: none; |
327 | box-shadow: rgb(17, 17, 17) 0px 0px 14px inset; | 328 | box-shadow: rgb(17, 17, 17) 0px 0px 14px inset; |
328 | } | 329 | } |
329 | .timeline-dnd-helper { | 330 | .timeline-dnd-helper { |
330 | -webkit-transform: scale(.9, .9); | 331 | -webkit-transform: scale(.9, .9); |
331 | } | 332 | } |
332 | .tl_slider{ | 333 | .tl_slider{ |
333 | width: 65px; | 334 | width: 65px; |
@@ -339,62 +340,62 @@ POSSIBILITY OF SUCH DAMAGE. | |||
339 | 340 | ||
340 | /* Configuration menu */ | 341 | /* Configuration menu */ |
341 | .layer-master { | 342 | .layer-master { |
342 | position: relative; | 343 | position: relative; |
343 | } | 344 | } |
344 | .tl-configbutton { | 345 | .tl-configbutton { |
345 | position: absolute; | 346 | position: absolute; |
346 | top: 0px; | 347 | top: 0px; |
347 | right: 2px; | 348 | right: 2px; |
348 | width: 20px; | 349 | width: 20px; |
349 | height: 20px; | 350 | height: 20px; |
350 | background-image: url(../images/icon-gear.png); | 351 | background-image: url(../images/icon-gear.png); |
351 | background-repeat: no-repeat; | 352 | background-repeat: no-repeat; |
352 | cursor: pointer; | 353 | cursor: pointer; |
353 | z-index: 100; | 354 | z-index: 100; |
354 | background-position: 100% 0px; | 355 | background-position: 100% 0px; |
355 | } | 356 | } |
356 | .tl-configbutton:hover { | 357 | .tl-configbutton:hover { |
357 | width: 180px; | 358 | width: 180px; |
358 | } | 359 | } |
359 | 360 | ||
360 | .tl-configbutton .tl-dropdown { | 361 | .tl-configbutton .tl-dropdown { |
361 | position: absolute; | 362 | position: absolute; |
362 | border: 1px solid $color-panel-border; | 363 | border: 1px solid $color-panel-border; |
363 | top: 16px; | 364 | top: 16px; |
364 | right: 2px; | 365 | right: 2px; |
365 | width: 180px; | 366 | width: 180px; |
366 | padding-bottom: 7px; | 367 | padding-bottom: 7px; |
367 | background-color: $color-menu-bg; | 368 | background-color: $color-menu-bg; |
368 | box-shadow: 2px 2px 2px $color-app-shadow; | 369 | box-shadow: 2px 2px 2px $color-app-shadow; |
369 | display: none; |