diff options
| author | Jose Antonio Marquez | 2012-06-27 15:32:38 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-27 15:32:38 -0700 |
| commit | 60554730ac89bb874f811ba312c491d5caacf8ce (patch) | |
| tree | 3b78bab74798812a38c05bfba0f88c407f98031f /js/panels/Timeline/Style.reel/scss/Style.scss | |
| parent | f704705fd85c1af44ad86f8c29e8e93d330796e5 (diff) | |
| parent | 07e7e2f28b863b0a4d139cc7e649a630b162e0da (diff) | |
| download | ninja-60554730ac89bb874f811ba312c491d5caacf8ce.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
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 | } | ||