Merge branch 'refs/heads/master' into StylesControllerUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 133 insertions, 0 deletions

diff --git a/js/panels/Timeline/Style.reel/css/Style.css b/js/panels/Timeline/Style.reel/css/Style.css
new file mode 100644
index 00000000..6c7542cb
--- /dev/null
+++ b/js/panels/Timeline/Style.reel/css/Style.css
@@ -0,0 +1,133 @@
+/* Layer.scss
+ * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
+ */
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+/*
+ * _colors.scss
+ * Defines the colors for the UI of the application.
+ * To create a new theme, copy this file and change the values as desired.
+ * Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values.
+ */
+/* Colors for radio buttons and other form elements */
+/* Base colors for dividers 
+ *
+ * Dividers consist of a div with a background color and either 
+ * a top & bottom border (in the case of horizontal dividers)
+ * or a left & right border (in the case of vertical dividers),
+ * for a total of three different colors.
+ * 
+ */
+/* top and left */
+/* Middle */
+/* Bottom and right */
+/* Main background color of entire app */
+/* Main app background color. */
+/* rgba version */
+/* Main app border color */
+/* color of drop shadows */
+/* Stage color */
+/* body border color */
+/* Body background color */
+/* Colors for main dropdown menus: background & text for both regular and highlighted states, dividers */
+/* Colors for tools: background, text, how they interact with the UI */
+/* Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc. */
+/* used for editable items in their non-edit state, etc. */
+/* Border for panel and for block elements */
+/* Shadow for text and block elements */
+/* Colors for scroll bars */
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+/*
+ * themes/themename/mixins.scss
+ * Mixins that are theme-dependent (e.g. sprite mixins, etc)
+ */
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+/*
+ * mixins.scss
+ * Generic mixins.  Theme-specific mixins (e.g. for sprites) 
+ * should go in the theme/themename/mixins.scss file.
+ */
+/* line 12, ../scss/Style.scss */
+.hidden {
+  display: none;
+}
+
+/* line 15, ../scss/Style.scss */
+.row-editor {
+  position: relative;
+  height: 14px;
+}
+
+/* line 19, ../scss/Style.scss */
+.style-padding {
+  padding-left: 5px;
+  padding-top: 3px;
+  padding-right: 5px;
+}
+
+/* line 24, ../scss/Style.scss */
+.style-row {
+  height: 20px;
+  border-bottom: 1px solid #505050;
+}
+
+/* line 29, ../scss/Style.scss */
+div.content-style div.editable2 {
+  height: 14px;
+  background-color: #242424 !important;
+  color: #b2b2b2 !important;
+  border-width: 0px;
+  font-size: 11px;
+  overflow: hidden;
+  -webkit-user-select: text;
+  white-space: nowrap;
+  text-overflow: clip;
+  width: 100%;
+}
+
+/* line 43, ../scss/Style.scss */
+.content-style.collapsible-content,
+.content-style.collapsible-content div,
+.content-style.collapsible-content span {
+  overflow: visible;
+  text-overflow: visible;
+}
+
+/* line 48, ../scss/Style.scss */
+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;
+}
+
+/* line 57, ../scss/Style.scss */
+div.content-style div.cell-property div {
+  min-width: 90%;
+  height: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+/* line 65, ../scss/Style.scss */
+div.content-style input.nj-skinned {
+  height: 10px;
+  font-size: 12px;
+  top: -3px;
+}