diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels')
102 files changed, 8585 insertions, 8478 deletions
diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js index 0788b2c0..6d4d0bdb 100755 --- a/js/panels/CSSPanel/CSSPanel.js +++ b/js/panels/CSSPanel/CSSPanel.js | |||
| @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 29 | </copyright> */ | 29 | </copyright> */ |
| 30 | 30 | ||
| 31 | var Montage = require("montage/core/core").Montage, | 31 | var Montage = require("montage/core/core").Montage, |
| 32 | PanelBase = require("js/panels/PanelBase").PanelBase; | 32 | PanelBase = require("js/panels/PanelBase").PanelBase; |
| 33 | 33 | ||
| 34 | var CSSPanelBase = require("js/panels/CSSPanel/CSSPanelBase.reel").CSSPanelBase; | 34 | var CSSPanelBase = require("js/panels/CSSPanel/CSSPanelBase.reel").CSSPanelBase; |
| 35 | 35 | ||
| @@ -74,4 +74,4 @@ exports.CSSPanel = Montage.create(PanelBase, { | |||
| 74 | value: null, | 74 | value: null, |
| 75 | writable:true | 75 | writable:true |
| 76 | } | 76 | } |
| 77 | }); | 77 | }); |
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css index f70cb8cb..65f7bf79 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css | |||
| @@ -29,9 +29,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 29 | </copyright> */ | 29 | </copyright> */ |
| 30 | 30 | ||
| 31 | .css_panel { | 31 | .css_panel { |
| 32 | background-color: #FFF; | 32 | background-color: #FFF; |
| 33 | display: -webkit-box; | 33 | display: -webkit-box; |
| 34 | -webkit-box-orient: vertical; | 34 | -webkit-box-orient: vertical; |
| 35 | height:100%; | 35 | height:100%; |
| 36 | } | 36 | } |
| 37 | .css_panel .resizer { | 37 | .css_panel .resizer { |
| @@ -40,18 +40,18 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 40 | height: 1px; | 40 | height: 1px; |
| 41 | } | 41 | } |