aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/scss/Style.scss
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-07-02 09:23:13 -0700
committerNivesh Rajbhandari2012-07-02 09:23:13 -0700
commit2bae1b3148233288ec0bc50876935bdfea1f288c (patch)
tree686fa3b5b9615941bb7013f35c91e8f326b049db /js/panels/Timeline/Style.reel/scss/Style.scss
parent2da05a4c71bfe9b136384d9e94fbfbef19f24550 (diff)
parent12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff)
downloadninja-2bae1b3148233288ec0bc50876935bdfea1f288c.tar.gz
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss')
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss5
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}