diff options
author | Jose Antonio Marquez | 2012-06-28 09:50:28 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-28 09:50:28 -0700 |
commit | ee1adbcc33932bc27966c02b159a3ab06966d4a5 (patch) | |
tree | a9d5ff91681aa06bf26cb62994461a58d3f80005 /js/panels/Timeline/Style.reel/scss/Style.scss | |
parent | ca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (diff) | |
parent | 299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff) | |
download | ninja-ee1adbcc33932bc27966c02b159a3ab06966d4a5.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
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 | } | ||