From b64821534abbbf9e0cc44f5c84da1e37a14d756b Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 26 Jun 2012 10:18:21 -0700 Subject: BugFix - Color Chip Positioning & Checking for null value of the current color Signed-off-by: Kruti Shah --- js/panels/Timeline/Style.reel/scss/Style.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'js/panels/Timeline/Style.reel/scss') diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index c5287b00..ca719955 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss @@ -85,3 +85,7 @@ div.style-row .container-propvals { background-color: $color-panel-hilite-bg; color: $color-panel-hilite-text; } + +.color-chip-position{ + margin-top:0px; +} -- cgit v1.2.3 From a2047a565aa5ef8643c5d71de3cc484191d6c671 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 26 Jun 2012 12:13:45 -0700 Subject: Bug Fix : Color Chip Position Signed-off-by: Kruti Shah --- js/panels/Timeline/Style.reel/scss/Style.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/panels/Timeline/Style.reel/scss') diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index ca719955..42420409 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss @@ -86,6 +86,7 @@ div.style-row .container-propvals { color: $color-panel-hilite-text; } -.color-chip-position{ +.toolColorChipCtrl.color-chip-position{ margin-top:0px; + height:14px; } -- cgit v1.2.3