Merge branch 'refs/heads/ninja-internal-master' into bugfix-master

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 128 insertions, 0 deletions

diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.css b/js/panels/binding/edit-binding-view.reel/edit-binding-view.css
new file mode 100644
index 00000000..0ca82179
--- /dev/null
+++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.css
@@ -0,0 +1,128 @@
+/* <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> */
+
+.edit-binding-view {
+    background: #474747;
+    color: #FFF;
+    font-size: 11px;
+    height: 100%;
+    left: 100%;
+    position: absolute;
+    top: 0;
+    width: 100%;
+    -webkit-transition-property: -webkit-transform;
+    -webkit-transition-duration: 550ms;
+    -webkit-transition-timing-function: cubic-bezier(.44,.19,0,.99);
+    -webkit-user-select: text;
+}
+
+/* -------------------
+    Object Editing Section
+ --------------------- */
+.edit-object-binding {
+    border-bottom: 1px solid #505050;
+    display: -webkit-box;
+    margin: 5px;
+    padding-bottom: 5px;
+    -webkit-box-orient: horizontal;
+}
+.object-container {
+    display: -webkit-box;
+    -webkit-box-orient: horizontal;
+    -webkit-box-flex: 1;
+}
+.object-container:first-child {
+    margin-right: 5px;
+}
+.object-icon-container {
+    background-color: #414141;
+    border-radius: 5px;
+    border: 1px solid #333;
+    box-shadow: inset 0 0 5px 0px #333, 0 1px 0 #585858;
+    height: 40px;
+    width: 40px;
+    -webkit-box-flex: 0;
+}
+
+.edit-object-binding .object-icon {
+    -webkit-transform: scale(.75);
+    height: 100%;
+    margin: 0;
+    width: 100%;
+    position:relative;
+    top: -1px;
+    left: -1px;
+    -webkit-transition: opacity 550ms linear;
+}
+.object-fields-container {
+    -webkit-box-flex: 1;
+    padding-top: 1px;
+    width: 1px;
+}
+.no-object {
+    opacity: 0;
+}
+
+.edit-binding-view ul {
+    padding: 0;
+    margin: 0;
+}
+
+.edit-binding-view li {
+    padding: 3px;
+    list-style-type: none;
+}
+
+.edit-binding-view label {
+    display: inline-block;
+    width: 50%;
+}
+
+.checkbox-container {
+    position: absolute;
+    left: 50%;
+}
+.checkbox-container label {
+    position: relative;
+    top: -3px;
+}
+
+.buttons-container {
+    background-color: #474747;
+    padding: 5px 0;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+}
+
+.edit-binding-view .btn-delete, .edit-binding-view .btn-cancel, .edit-binding-view .btn-save {
+    width: 72px;
+    display: inline-block;
+    margin: 0 5px;
+}
+.edit-binding-view .btn-cancel, .edit-binding-view .btn-save {
+    float:right;
+    margin: 0 5px 0 0;
+}
+/* hintable fields */
+
+.hintable-field {
+    background-color: #444;
+    border: 1px solid #313131;
+    display: block;
+    height: 13px;
+    margin: 0 0 5px 5px;
+    padding: 1px 4px;
+    width: 80%;
+}
+
+.hintable-field .hintable-hint {
+    color: #7C7C7C;
+}
+
+.hintable-field:focus {
+    border: 1px solid #313131;
+}
\ No newline at end of file