Merge branch 'master' into brushtool

1 files changed, 0 insertions, 299 deletions

diff --git a/js/panels/properties/content.reel/content.css b/js/panels/properties/content.reel/content.css
deleted file mode 100755
index 2537aea2..00000000
--- a/js/panels/properties/content.reel/content.css
+++ /dev/null
@@ -1,299 +0,0 @@
-/* <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> */
-
-.propertiesPanel {
-    color:#FFF;
-    overflow-x: hidden;
-}
-
-.propertiesPanel .fieldCol {
-    display: -webkit-box;
-    -webkit-box-orient:horizontal;
-    position:relative;
-}
-
-.propertiesPanel .fieldCol > label {
-    -webkit-box-flex:0;
-    text-align: right;
-    width:46px;
-    display:block;
-    padding: 4px 2px 4px 5px;
-    height:16px;
-    line-height: 16px;
-}
-
-.propertiesPanel .fieldRow label {
-padding-right:6px;
-    width:20px;
-    display: inline-block;
-    text-align: right;
-}
-
-
-.propertiesPanel .fieldRow {
-    padding: 4px 10px 4px 5px;
-    height:16px;
-    line-height: 16px;
-    display:block;
-    -webkit-box-flex:1;
-}
-
-.propertiesPanel .fieldRow.oneCol div, .propertiesPanel .fieldRow.twoCol div,.propertiesPanel .fieldRow.threeCol div {
-    -webkit-box-sizing: content-box;
-    float:left;
-
-}
-
-.propertiesPanel hr {
-    border: 0;
-    border-top: 1px solid #3c3c3c;
-    border-bottom: 1px solid #555;
-}
-
-.propertiesPanel input[type='text'] {
-    width:100%;
-    padding: 1px;
-}
-
-.propertiesPanel .montage-textfield {
-    padding: 1px;
-}
-
-.propertiesPanel .fieldRow.threeCol div input[type='text'] {
-    width:34px;
-    display: inline-block;
-}
-
-.propertiesPanel .hottextunit input {
-    width:38px;
-}
-
-.propertiesPanel .fieldRow.threeCol div .inputField {
-    width:34px;
-}
-.propertiesPanel .fieldRow.twoCol label {
-    width:74px;
-    display: inline-block;
-    
-}
-
-.propertiesPanel .fieldRow.oneCol label {
-    width:auto;
-    display: inline-block;
-
-}
-
-.propertiesPanel .fieldRow.oneCol div input[type='text'] {
-    width:34px;
-    display: inline-block;
-}
-.propertiesPanel .fieldRow.oneCol div .inputField {
-    width:34px;
-}
-
-
-.propertiesPanel .fieldRow.twoCol div input[type='text'] {
-    width:38px;
-    display: inline-block;
-}
-.propertiesPanel .fieldRow.twoCol div .inputField {
-    width:38px;
-}
-
-.propertiesPanel input[type='text'][readonly], .propertiesPanel input[type='text'][readonly]:focus {
-    border: none;
-    background: none;
-    -webkit-box-shadow:none;
-}
-
-.propertiesPanel h2 {
-    background: #3E3E3E;
-    font-size:11px;
-    height:16px;
-    line-height: 17px;
-    display:-webkit-box;
-    -webkit-box-orient:horizontal;
-    margin: 0px;
-    border-bottom: 1px solid #3A3A3A;
-}
-.propertiesPanel .subSectionHeader .arrow {
-    -webkit-box-flex:0;
-    margin: 0px 10px;
-}
-
-.propertiesPanel .subSectionHeader .arrowIcon {
-    background: url("data:image/png;base64,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") 0px 0px no-repeat;
-    -webkit-background-size:cover;
-    width:15px;
-    height:15px;
-}
-
-.propertiesPanel .subSectionHeader.collapsed .arrowIcon {
-    -webkit-transform: rotate(-90deg);
-}
-
-.propertiesPanel .sectional {
-    padding: 4px;
-}
-
-.propertiesPanel .animated {
-    -webkit-transition: 0.2s all linear;
-}
-
-.propertiesPanel div.collapsed {
-    padding: 0px !important;
-    height:0px !important;
-    overflow: hidden;
-}
-
-.propertiesPanel .subSectionHeader section {
-    -webkit-box-flex:1;
-}
-
-.propertiesPanel {
-    text-shadow: 1px 1px 1px #000;
-}
-
-/* Dropdown layout */
-.propertiesPanel select {
-    -webkit-appearance: none;
-    font-size: 10px;
-    color: white;
-    background-color: #444;
-    border: 1px solid #313131;
-    width: 100%;
-    -webkit-box-sizing: border-box;
-    height: 15px;
-    outline: none;
-    background-image: url("../../../../images/dropdown-bg.png");
-    background-repeat: no-repeat;
-    background-position: right center;
-    border-radius: 0px;
-    padding-left:5px;
-}
-
-/* File Input Field */
-.propertiesPanel .file {
-    display:-webkit-box;
-}
-.propertiesPanel .file input {
-    -webkit-box-flex:1;
-    width:auto;
-    display: block;
-}
-.propertiesPanel .file .source {
-    border: 1px solid #313131;
-    background-color: #444;
-    color:#FFF;
-    height:16px;
-    width:20px;
-    -webkit-box-flex:0;
-    cursor: pointer;
-    padding: 0px;
-}
-
-.propertiesPanel .file .source:hover {
-    background-color:#555;
-}
-
-.propertiesPanel .file .source:active {
-    background-color: #666;
-}
-
-/* Checkbox layout */
-
-.propertiesPanel .fieldRow.checkbox div .inputField {
-    width:25px;
-}
-
-.propertiesPanel .fieldRow.colorSelect {
-    height: 20px;