From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- .../TimelinePanel.reel/scss/TimelinePanel.scss | 118 ++++++++++----------- 1 file changed, 59 insertions(+), 59 deletions(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss') diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index 460fe5e3..470b5419 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss @@ -85,16 +85,16 @@ POSSIBILITY OF SUCH DAMAGE. } #bottomPanelContainer { - overflow: hidden !IMPORTANT; + overflow: hidden !IMPORTANT; } .layout-tracks { - width: 100%; - height: 100%; - padding-bottom: 6px; - box-sizing: border-box; - overflow: auto; - position: relative; + width: 100%; + height: 100%; + padding-bottom: 6px; + box-sizing: border-box; + overflow: auto; + position: relative; } .tl_layertracks{ background-color: $color-tool-bg; @@ -102,7 +102,7 @@ POSSIBILITY OF SUCH DAMAGE. width: 100%; -webkit-box-flex: 1; padding-top: 21px; - box-sizing: border-box; + box-sizing: border-box; } .layerresizer{ height: auto; @@ -183,12 +183,12 @@ POSSIBILITY OF SUCH DAMAGE. overflow: visible; } .layout_markers { - position: absolute; - overflow: hidden; - top: 0px; - left: 0px; - height: 20px; - width: 100%; + position: absolute; + overflow: hidden; + top: 0px; + left: 0px; + height: 20px; + width: 100%; border-bottom-style: solid; } @@ -220,7 +220,7 @@ POSSIBILITY OF SUCH DAMAGE. .container-tracks, .timelinemarkers, .mastertrack { - width: 2000px; + width: 2000px; } .userlayers{ width: 100%; @@ -316,18 +316,18 @@ POSSIBILITY OF SUCH DAMAGE. margin-top: 0%; } .timeline-disabled { - position: absolute; - top: 0px; - left: 0px; - width: 100%; - height: 100%; - background-color: rgba(30,30,30, 0.796); - z-index: 100; - display: none; - box-shadow: rgb(17, 17, 17) 0px 0px 14px inset; + position: absolute; + top: 0px; + left: 0px; + width: 100%; + height: 100%; + background-color: rgba(30,30,30, 0.796); + z-index: 100; + display: none; + box-shadow: rgb(17, 17, 17) 0px 0px 14px inset; } .timeline-dnd-helper { - -webkit-transform: scale(.9, .9); + -webkit-transform: scale(.9, .9); } .tl_slider{ width: 65px; @@ -340,60 +340,60 @@ POSSIBILITY OF SUCH DAMAGE. /* Configuration menu */ .layer-master { - position: relative; + position: relative; } .tl-configbutton { - position: absolute; - top: 0px; - right: 2px; - width: 20px; - height: 20px; - background-image: url(../images/icon-gear.png); - background-repeat: no-repeat; - cursor: pointer; - z-index: 100; - background-position: 100% 0px; + position: absolute; + top: 0px; + right: 2px; + width: 20px; + height: 20px; + background-image: url(../images/icon-gear.png); + background-repeat: no-repeat; + cursor: pointer; + z-index: 100; + background-position: 100% 0px; } .tl-configbutton:hover { - width: 180px; + width: 180px; } .tl-configbutton .tl-dropdown { - position: absolute; - border: 1px solid $color-panel-border; - top: 16px; - right: 2px; - width: 180px; - padding-bottom: 7px; - background-color: $color-menu-bg; - box-shadow: 2px 2px 2px $color-app-shadow; - display: none; + position: absolute; + border: 1px solid $color-panel-border; + top: 16px; + right: 2px; + width: 180px; + padding-bottom: 7px; + background-color: $color-menu-bg; + box-shadow: 2px 2px 2px $color-app-shadow; + display: none; } .tl-configbutton.checked .tl-dropdown { - display: block; + display: block; } .tl-configbutton .checkable { - padding-left: 20px; - height: 20px; - line-height: 20px; - margin-top: 3px; + padding-left: 20px; + height: 20px; + line-height: 20px; + margin-top: 3px; } .tl-configbutton .checkable:hover { - background-color: $color-panel-hilite-bg; - color: $color-panel-hilite-text; - text-shadow: none; + background-color: $color-panel-hilite-bg; + color: $color-panel-hilite-text; + text-shadow: none; } .tl-configbutton .checkable.checked { - background-image: url(../images/icon-checkmark.png); - background-repeat: no-repeat; - background-position: 6px 4px; + background-image: url(../images/icon-checkmark.png); + background-repeat: no-repeat; + background-position: 6px 4px; } .tl-configbutton .nj-divider { - margin-top: 7px; + margin-top: 7px; } .layer-hidden { - display: none; + display: none; } -- cgit v1.2.3 From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss') diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index 470b5419..eafa9dd6 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss @@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. /* TimelinePanel.scss * Main SCSS file for TimelinePanel component, compiled by SASS into the file css/TimelinePanel.css. */ - + // Import theme settings @import "../../../../../scss/imports/themes/default/colors"; // @import "../../../../../scss/imports/themes/default/fonts"; -- cgit v1.2.3 From fdbec324dad4ab33d97282ab021d2c1661bc097c Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Mon, 9 Jul 2012 16:27:52 -0700 Subject: BSD License --- .../TimelinePanel.reel/scss/TimelinePanel.scss | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss') diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index eafa9dd6..aa35fa8e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss @@ -1,26 +1,27 @@ @charset "UTF-8"; /* -Copyright (c) 2012, Motorola Mobility, Inc +Copyright (c) 2012, Motorola Mobility LLC. All Rights Reserved. -BSD License. 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 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 nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. +* 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. + +* 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 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -- cgit v1.2.3