Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

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

1 files changed, 63 insertions, 0 deletions

diff --git a/js/panels/css-panel/css-panel.reel/css-panel.css b/js/panels/css-panel/css-panel.reel/css-panel.css
new file mode 100644
index 00000000..8d8c8ff5
--- /dev/null
+++ b/js/panels/css-panel/css-panel.reel/css-panel.css
@@ -0,0 +1,63 @@
+/* <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> */
+.css-panel {
+    color: #FFF;
+    display: -webkit-box;
+    height: 100%;
+    -webkit-box-orient: vertical;
+}
+.css-panel > h3 {
+    background-color: #333;
+    border-top: 1px solid #3D3D3D;
+    color: #FFF;
+    cursor: default;
+    font-size: 12px;
+    font-weight: normal;
+    height: 16px;
+    margin: 0;
+    overflow: hidden;
+    padding: 4px 0 2px 10px;
+    text-overflow: ellipsis;
+    vertical-align: top;
+    white-space: nowrap;
+    -webkit-box-flex: 0;
+    -webkit-user-select: none;
+}
+.css-panel .selection-name:before, .css-panel .document-name:before {
+    content:" - "
+}
+.css-panel .no-styles.selection-name, .css-panel .no-document.document-name {
+    display: none;
+}
+
+.css-panel .style-sheets-view-container {
+    display: -webkit-box;
+    min-height: 41px;
+    -webkit-box-flex: 0;
+    -webkit-box-orient: vertical;
+}
+.css-panel .styles-view-container {
+    display: -webkit-box;
+    -webkit-box-flex: 1;
+    -webkit-box-orient: vertical;
+}
+.panel-message {
+    background-color: rgba(255,255,255, 0.1);
+    border: 1px dashed rgba(255,255,255, 0.2);
+    border-radius: 4px;
+    color: #CCC;
+    font-size: 11px;
+    font-weight: normal;
+    margin: 0 8px;
+    padding: 5px;
+    position: relative;
+    text-shadow: 1px 1px 0px #333;
+    text-align: center;
+    top: 8px;
+    -webkit-box-flex: 0;
+}
+
+