Merge branch 'refs/heads/Ninja-Master' into Tracking

1 files changed, 61 insertions, 54 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index 7cc70ba7..f9f5e98c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -6,16 +6,11 @@ All Rights Reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-* Neither the name of Motorola Mobility LLC nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
+* Neither the name of Motorola Mobility LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -30,138 +25,150 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 /* TimelinePanel.scss Main SCSS file for TimelinePanel component, compiled by SASS into the file css/TimelinePanel.css. */
-/* line 22, ../scss/TimelinePanel.scss */
+/* line 47, ../scss/TimelinePanel.scss */
 .tl_container { display: -webkit-box; -webkit-box-orient: vertical; height: 100%; }
 
-/* line 27, ../scss/TimelinePanel.scss */
+/* line 52, ../scss/TimelinePanel.scss */
 .maintimeline { -webkit-box-flex: 1; display: -webkit-box; -webkit-box-orient: horizontal; height: 100%; position: relative; margin-top: 1px; }
 
-/* line 35, ../scss/TimelinePanel.scss */
+/* line 60, ../scss/TimelinePanel.scss */
 .leftinside { height: 100%; width: 100%; display: -webkit-box; -webkit-box-orient: vertical; position: absolute; overflow: hidden; }
 
-/* line 43, ../scss/TimelinePanel.scss */
+/* line 68, ../scss/TimelinePanel.scss */
 .rightinside { height: 100%; width: 100%; display: -webkit-box; -webkit-box-orient: vertical; position: absolute; }
 
-/* line 50, ../scss/TimelinePanel.scss */
+/* line 75, ../scss/TimelinePanel.scss */
 .tl_leftpane { min-width: 210px; max-width: 500px; position: relative; overflow: hidden; -webkit-box-flex: 0; }
 
-/* line 57, ../scss/TimelinePanel.scss */
+/* line 82, ../scss/TimelinePanel.scss */
 .tl_rightpane { width: 100%; position: relative; -webkit-box-flex: 1; }
 
-/* line 63, ../scss/TimelinePanel.scss */
+/* line 88, ../scss/TimelinePanel.scss */
 #bottomPanelContainer { overflow: hidden !IMPORTANT; }
 
-/* line 67, ../scss/TimelinePanel.scss */
+/* line 92, ../scss/TimelinePanel.scss */
 .layout-tracks { width: 100%; height: 100%; padding-bottom: 6px; box-sizing: border-box; overflow: auto; position: relative; }
 
-/* line 75, ../scss/TimelinePanel.scss */
+/* line 100, ../scss/TimelinePanel.scss */
 .tl_layertracks { background-color: #292929; height: 100%; width: 100%; -webkit-box-flex: 1; padding-top: 21px; box-sizing: border-box; }
 
-/* line 83, ../scss/TimelinePanel.scss */
+/* line 108, ../scss/TimelinePanel.scss */
 .layerresizer { height: auto; width: 6px; border-right-style: solid; border-right-color: #3a3a3a; border-right-width: thin; border-left-style: solid; border-left-color: black; border-left-width: thin; background-color: #232323; cursor: col-resize; -webkit-box-flex: 0; }
 
-/* line 96, ../scss/TimelinePanel.scss */
+/* line 121, ../scss/TimelinePanel.scss */
 .timelinecontroller { height: 20px; background-color: #474747; -webkit-box-flex: 0; border-bottom-style: solid; border-bottom-width: thin; border-bottom-color: black; }
 
-/* line 104, ../scss/TimelinePanel.scss */
+/* line 129, ../scss/TimelinePanel.scss */
 .timelinecontrols { width: 100%; padding-left: 6px; padding-top: 2px; height: 18px; background-color: #474747; float: left; }
 
-/* line 112, ../scss/TimelinePanel.scss */
+/* line 137, ../scss/TimelinePanel.scss */
 .timetext { float: right; padding-right: 10px; color: white; }
 
-/* line 117, ../scss/TimelinePanel.scss */
+/* line 142, ../scss/TimelinePanel.scss */
 .rewindbutton { background-image: url("../images/play_prev.png"); background-repeat: no-repeat; height: 18px; width: 18px; float: left; padding-right: 5px; }
 
-/* line 125, ../scss/TimelinePanel.scss */
+/* line 150, ../scss/TimelinePanel.scss */
 .playbutton { background-image: url("../images/play.png"); background-repeat: no-repeat; height: 18px; width: 18px; float: left; padding-right: 5px; }
 
-/* line 133, ../scss/TimelinePanel.scss */
+/* line 158, ../scss/TimelinePanel.scss */
 .pausebutton { background-image: url("../images/pause.png"); background-repeat: no-repeat; height: 18px; width: 18px; float: left; padding-right: 5px; }
 
-/* line 141, ../scss/TimelinePanel.scss */
+/* line 166, ../scss/TimelinePanel.scss */
 .forwardbutton { background-image: url("../images/play_next.png"); background-repeat: no-repeat; height: 18px; width: 18px; float: left; padding-right: 5px; }
 
-/* line 149, ../scss/TimelinePanel.scss */
+/* line 174, ../scss/TimelinePanel.scss */
 .timelinemarkers { height: 20px; width: 100%; background-color: #474747; border-bottom-style: solid; border-bottom-width: thin; border-bottom-color: black; -webkit-box-flex: 0; position: absolute; background-image: url("../images/timetick.jpg"); overflow: visible; }
 
-/* line 161, ../scss/TimelinePanel.scss */
+/* line 186, ../scss/TimelinePanel.scss */
 .layout_markers { position: absolute; overflow: hidden; top: 0px; left: 0px; height: 20px; width: 100%; border-bottom-style: solid; }
 
-/* line 171, ../scss/TimelinePanel.scss */
+/* line 196, ../scss/TimelinePanel.scss */
 .masterlayer { font-family: 'Droid Sans'; font-size: 12px; text-shadow: 1px 1px 1px black; height: 18px; background-color: #474747; border-bottom-style: solid; border-bottom-width: thin; border-bottom-color: #3a3a3a; color: white; padding-left: 15px; padding-top: 2px; }
 
-/* line 184, ../scss/TimelinePanel.scss */
+/* line 209, ../scss/TimelinePanel.scss */
 .mastertrack { -webkit-box-flex: 0; color: white; height: 20px; width: 100%; border-bottom-style: solid; border-bottom-width: thin; border-bottom-color: #3a3a3a; background-color: #232323; background-image: url("../../Track.reel/images/gridline.jpg"); }
 
-/* line 198, ../scss/TimelinePanel.scss */
+/* line 223, ../scss/TimelinePanel.scss */
 .container-tracks, .timelinemarkers, .mastertrack { width: 2000px; }
 
-/* line 201, ../scss/TimelinePanel.scss */
+/* line 226, ../scss/TimelinePanel.scss */
 .userlayers { width: 100%; background-color: #292929; -webkit-box-flex: 1; overflow: hidden; border-bottom-style: solid; border-bottom-width: thin; border-bottom-color: black; }
 
-/* line 210, ../scss/TimelinePanel.scss */
+/* line 235, ../scss/TimelinePanel.scss */
 .timelinegutter { height: 16px; padding-top: 1px; padding-left: 6px; -webkit-box-flex: 0; background-color: #474747; border-top-style: solid; border-top-width: thin; border-top-color: #3a3a3a; }
 
-/* line 220, ../scss/TimelinePanel.scss */
+/* line 245, ../scss/TimelinePanel.scss */
 .newlayerbutton { background-image: url("../images/plus.png"); background-repeat: no-repeat; height: 16px; width: 16px; float: left; padding-right: 5px; }
 
-/* line 228, ../scss/TimelinePanel.scss */
+/* line 253, ../scss/TimelinePanel.scss */
 .deletelayerbutton { background-image: url("../images/trash.png"); background-repeat: no-repeat; height: 16px; width: 16px; float: left; padding-right: 5px; }
 
-/* line 236, ../scss/TimelinePanel.scss */
+/* line 261, ../scss/TimelinePanel.scss */
 .tracktick { height: 100%; width: 15px; border-right-color: #3a3a3a; border-right-style: solid; border-right-width: thin; float: left; }
 
-/* line 244, ../scss/TimelinePanel.scss */
+/* line 269, ../scss/TimelinePanel.scss */
 .timemark { font-family: 'Droid Sans'; font-size: 12px; text-shadow: 1px 1px 1px #3a3a3a; width: 76px; color: gray; float: left; padding-top: 6px; padding-left: 4px; text-align: left; }
 
-/* line 255, ../scss/TimelinePanel.scss */
+/* line 280, ../scss/TimelinePanel.scss */
 .playhead { height: 14px; width: 6px; position: absolute; top: 6px; left: -3px; z-index: 92; background-color: #b50003; opacity: 0.5; visibility: hidden; }
 
-/* line 266, ../scss/TimelinePanel.scss */
+/* line 291, ../scss/TimelinePanel.scss */
 .playheadmarker { height: 100%; width: 1px; background-color: white; top: 0; left: 0; position: absolute; z-index: 91; opacity: 0.7; }
 
-/* line 276, ../scss/TimelinePanel.scss */
+/* line 301, ../scss/TimelinePanel.scss */
 .timebar { height: 3px; width: 0; background-color: #ff0003; opacity: 0.3; top: 10px; position: absolute; border-top: #c7a19f thin solid; border-right: #ffffff thin solid; }