diff options
| author | Jonathan Duran | 2012-06-26 13:15:05 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-26 13:15:05 -0700 |
| commit | cdb5af99be5fca15265e4940dd22870f4c5fef4b (patch) | |
| tree | e9774d784cde6f2d701e5fac8228c5e13339afe6 /js/panels/Timeline/Style.reel/scss/Style.scss | |
| parent | e07370c7946fcdfbe6e245840348306821f8cc39 (diff) | |
| parent | 442793352b352be9f2679fab2e5b4bad186f228a (diff) | |
| download | ninja-cdb5af99be5fca15265e4940dd22870f4c5fef4b.tar.gz | |
Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber
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 | } | ||