From e065244ac75d1d0f25fd5c75cb58e714a13fe16b Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 14 Mar 2012 08:59:17 -0700
Subject: Squashed commit of the following:

merge master into timeline

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 .../color/colortoolbar.reel/css/colortoolbar.scss  | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100755 js/panels/color/colortoolbar.reel/css/colortoolbar.scss

(limited to 'js/panels/color/colortoolbar.reel/css/colortoolbar.scss')

diff --git a/js/panels/color/colortoolbar.reel/css/colortoolbar.scss b/js/panels/color/colortoolbar.reel/css/colortoolbar.scss
new file mode 100755
index 00000000..79fb37b6
--- /dev/null
+++ b/js/panels/color/colortoolbar.reel/css/colortoolbar.scss
@@ -0,0 +1,52 @@
+@charset "UTF-8";
+
+/*
+	<copyright>
+	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.
+	</copyright>
+*/
+
+.colortoolbar
+{
+	
+}
+
+.colortoolbar button
+{
+	float: left;
+	clear: both;
+	width: 27px;
+	height: 27px;
+	background: black;
+	border: 1px solid #000;
+	padding: 0;
+	margin: 0px;
+}
+
+.colortoolbar div
+{
+	float: left;
+	clear: both;
+	width: 27px;
+	height: 27px;
+	margin: 6px 10px 1px 9px;
+	background: url(../../../../../images/colorpanel/transparent.png) repeat;
+}
+
+.colortoolbar div.cpe_colortoolbar_container
+{
+	margin: 0px 0px 4px 7px;
+}
+
+.toolbar_hr
+{
+	height: 1px;
+	border: none;
+	background-color: #565656;
+	border-top: 1px solid #3E3E3E;
+	margin: 8px 6px 0px 4px;
+	width: 32px;
+	display: block;
+}
-- 
cgit v1.2.3