diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /_scss/imports/scss/_PanelUI.scss | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to '_scss/imports/scss/_PanelUI.scss')
| -rw-r--r-- | _scss/imports/scss/_PanelUI.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_scss/imports/scss/_PanelUI.scss b/_scss/imports/scss/_PanelUI.scss index ac82adf8..21ada556 100644 --- a/_scss/imports/scss/_PanelUI.scss +++ b/_scss/imports/scss/_PanelUI.scss | |||
| @@ -390,7 +390,7 @@ ul.treeComponent > img:first-child | |||
| 390 | // | 390 | // |
| 391 | #pp-container-assets .pp-scroll-linked, | 391 | #pp-container-assets .pp-scroll-linked, |
| 392 | #pp-container-list .pp-scroll-linked { | 392 | #pp-container-list .pp-scroll-linked { |
| 393 | width: 420px; | 393 | //width: 420px; |
| 394 | } | 394 | } |
| 395 | 395 | ||
| 396 | 396 | ||