diff options
| author | Eric Guzman | 2012-06-27 15:29:41 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-27 15:29:41 -0700 |
| commit | 61a41e74154715b0b42a429158fa1f2a44d2eb9a (patch) | |
| tree | 2084e8df8c40708c9cc15d53d921a20718c8f006 /js/panels/Timeline/Style.reel/scss/Style.scss | |
| parent | 230a1a2f2848c27edf7d01f8d3a5585c8d0d4ac9 (diff) | |
| parent | 07e7e2f28b863b0a4d139cc7e649a630b162e0da (diff) | |
| download | ninja-61a41e74154715b0b42a429158fa1f2a44d2eb9a.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss')
| -rw-r--r-- | js/panels/Timeline/Style.reel/scss/Style.scss | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index c5287b00..42420409 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss | |||
| @@ -85,3 +85,8 @@ div.style-row .container-propvals { | |||
| 85 | background-color: $color-panel-hilite-bg; | 85 | background-color: $color-panel-hilite-bg; |
| 86 | color: $color-panel-hilite-text; | 86 | color: $color-panel-hilite-text; |
| 87 | } | 87 | } |
| 88 | |||
| 89 | .toolColorChipCtrl.color-chip-position{ | ||
| 90 | margin-top:0px; | ||
| 91 | height:14px; | ||
| 92 | } | ||