diff options
| author | hwc487 | 2012-06-28 12:17:22 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-28 12:17:22 -0700 |
| commit | 230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596 (patch) | |
| tree | 133be243b24260f831252f347ed66f24e2b78136 /js/panels/Timeline/Style.reel/scss | |
| parent | 22cbc9644b79df60b3f6336f9563debd47fb3ea1 (diff) | |
| parent | 56d6311f398e04eee3883a5c848fec3b2b53c981 (diff) | |
| download | ninja-230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper
Diffstat (limited to 'js/panels/Timeline/Style.reel/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 | } | ||