From a39bad832722a10f6556f91e94c3301a41f59bd5 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Mon, 6 Feb 2012 13:30:49 -0800 Subject: merge new timeline Signed-off-by: Jonathan Duran --- js/panels/Timeline/Style.reel/scss/Style.scss | 70 +++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 js/panels/Timeline/Style.reel/scss/Style.scss (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss') diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss new file mode 100644 index 00000000..f15f553d --- /dev/null +++ b/js/panels/Timeline/Style.reel/scss/Style.scss @@ -0,0 +1,70 @@ +/* Layer.scss + * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. + */ + +// Import theme settings +@import "../../../../../_scss/imports/themes/default/colors"; +@import "../../../../../_scss/imports/themes/default/mixins"; + +// Import generic mixins and styles +@import "../../../../../_scss/imports/scss/mixins"; + +.hidden { + display: none; +} +.row-editor { + position: relative; + height: 14px; +} +.style-padding { + padding-left: 5px; + padding-top: 3px; + padding-right: 5px; +} +.style-row { + height: 20px; + border-bottom: 1px solid $color-menu-divider; +} + +div.content-style div.editable2 { + height: 14px; + background-color: $color-panel-hilite-text !IMPORTANT; + color: $color-panel-hilite-bg !IMPORTANT; + border-width: 0px; + font-size: 11px; + overflow: hidden; + -webkit-user-select: text; + white-space: nowrap; + text-overflow: clip; + width: 100%; +} +.content-style.collapsible-content, +.content-style.collapsible-content div, +.content-style.collapsible-content span { + overflow: visible; + text-overflow: visible; +} +div.content-style div.cell-property, +div.content-style div.cell-value { + width: 45%; + float: left; + height: 18px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + line-height: 18px; +} +div.content-style div.cell-property div { + min-width: 90%; + height: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +div.content-style input.nj-skinned { + height: 10px; + font-size: 12px; + top: -3px; +} + -- cgit v1.2.3 From b7402018659cf8058d5646c08b2a916492269e33 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Thu, 23 Feb 2012 07:37:17 -0800 Subject: Timeline Reset to clean Master branch. Code scrub. Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran --- js/panels/Timeline/Style.reel/scss/Style.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss') diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index f15f553d..827a0c43 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss @@ -3,11 +3,11 @@ */ // Import theme settings -@import "../../../../../_scss/imports/themes/default/colors"; -@import "../../../../../_scss/imports/themes/default/mixins"; +@import "../../../../../scss/imports/themes/default/colors"; +@import "../../../../../scss/imports/themes/default/mixins"; // Import generic mixins and styles -@import "../../../../../_scss/imports/scss/mixins"; +@import "../../../../../scss/imports/scss/mixins"; .hidden { display: none; -- cgit v1.2.3 From 5de5dc6454fe6ca097ce4baf34768c9174a827d9 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 24 Feb 2012 10:20:04 -0800 Subject: Adding some missing copyrights Signed-off-by: Valerio Virgillito --- js/panels/Timeline/Style.reel/scss/Style.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss') diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index 827a0c43..30bf43fe 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + /* Layer.scss * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. */ -- cgit v1.2.3