From ec886fe3c46f6e3e54fe4e1df769dabed5588063 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Fri, 11 May 2012 11:34:06 -0700 Subject: fixed bug introduced when we removed the color toolbar. The styling of the color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix. --- js/panels/properties.reel/properties.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'js/panels/properties.reel/properties.css') diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index 0928da3a..eee44561 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css @@ -4,6 +4,21 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ +/* Cleanup TODO - now that we removed the color toolbar from the tools panel, we no longer load the colortoolbar reel. + Currently the color chips in the property inspector rely on the colortoolbar button style so we + copied the class here. When we do the color feature cleanup we should remove this dependency. +*/ +.colortoolbar button { + float: left; + clear: both; + width: 27px; + height: 27px; + background: black; + border: 1px solid #000; + padding: 0; + margin: 0px; +} + .propertiesPanel { color:#FFF; overflow-x: hidden; -- cgit v1.2.3 From 6dfe2e62b1d7a71daf097aac3a31213d564e6122 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 16 May 2012 00:54:30 -0700 Subject: Removing the old checkbox components. Created a new LabelCheckbox Signed-off-by: Valerio Virgillito --- js/panels/properties.reel/properties.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'js/panels/properties.reel/properties.css') diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index 0928da3a..756ecc5c 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css @@ -256,17 +256,17 @@ padding-right:6px; content: "•"; } -.propertiesPanel input.nj-skinned label { +.propertiesPanel .checkbox-label { position: absolute; - top: 0; - left: 15px; + top: 4px; + padding-left: 5px; + /*left: 15px;*/ font-size: 10px; width:55px; text-align: left; font-weight: normal; color:#FFF; } - .propertiesPanel input[type='radio'].nj-skinned { text-indent: 0px; line-height: 5px; -- cgit v1.2.3 From f30e5613e37ec6858fe4b56d289fafb9f1b9b9f8 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 18 May 2012 16:12:30 -0700 Subject: Fixing button controls in the Properties Panel for changes in montage v.10 drawing. Signed-off-by: Nivesh Rajbhandari --- js/panels/properties.reel/properties.css | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'js/panels/properties.reel/properties.css') diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index 5306eb5b..3166a1ff 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css @@ -303,4 +303,34 @@ input label { .propertiesPanel .rotation .fieldRow { -webkit-box-flex:0; width:45px; +} + +.propertiesPanel div.montage-button:disabled { + opacity: 0.4; +} + +.propertiesPanel div.montage-button { + font-size: 9px; + cursor: pointer; + display: block; + margin: -3px 0 0 -12px; + padding: 4px; + border: 1px #313131 solid; + background-color: #474747; + background-image: -webkit-linear-gradient(top, #505050 0%, #3c3c3c 100%); + border-radius: 4px; + color: white; + text-transform: uppercase; + cursor: pointer; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); + width: 18px; + height: 14px; +} + +.propertiesPanel div.montage-button:active { + background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); +} + +.propertiesPanel div.montage-button:hover { + -webkit-box-shadow: 0px 0px 3px #b4b4b4; } \ No newline at end of file -- cgit v1.2.3 From ca70f18a62a2a2b5670be132361e3a3f5907d920 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 18 May 2012 17:12:37 -0700 Subject: Fixing radio control in the PI. Signed-off-by: Nivesh Rajbhandari --- js/panels/properties.reel/properties.css | 1 + 1 file changed, 1 insertion(+) (limited to 'js/panels/properties.reel/properties.css') diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index 3166a1ff..84f52ed4 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css @@ -285,6 +285,7 @@ padding-right:6px; .propertiesPanel input[type='radio'].nj-skinned { text-indent: 0px; line-height: 5px; + margin: -4px 0 0 0; } .propertiesPanel input[type='radio'].nj-skinned label { -- cgit v1.2.3