diff options
Diffstat (limited to 'js/panels')
64 files changed, 5486 insertions, 293 deletions
diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js index 94860b30..cf8880a3 100644 --- a/js/panels/CSSPanel/CSSPanel.js +++ b/js/panels/CSSPanel/CSSPanel.js | |||
@@ -20,9 +20,9 @@ exports.CSSPanel = Montage.create(PanelBase, { | |||
20 | init : { | 20 | init : { |
21 | enumerable:true, | 21 | enumerable:true, |
22 | value : function (){ | 22 | value : function (){ |
23 | this.minHeight = 300; | 23 | this.minHeight = 195; |
24 | this.contentHeight = 300; | 24 | this.contentHeight = 195; |
25 | this.defaultHeight= 300; | 25 | this.defaultHeight= 195; |
26 | 26 | ||
27 | /* OLD WAY -- Removing the temporary div | 27 | /* OLD WAY -- Removing the temporary div |
28 | // TODO: Remove this comment once this is tested. | 28 | // TODO: Remove this comment once this is tested. |
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js index 9a27689a..ff738bbe 100644 --- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js +++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js | |||
@@ -1499,13 +1499,13 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
1499 | // | 1499 | // |
1500 | if (type._event.clientX && type._event.clientY) { | 1500 | if (type._event.clientX && type._event.clientY) { |
1501 | // | 1501 | // |
1502 | if (type._event.clientX > (parseInt(document.width)/2)) { | 1502 | //if (type._event.clientX > (parseInt(document.width)/2)) { |
1503 | //TODO: Fix offset hack | 1503 | //TODO: Fix offset hack |
1504 | this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX) +'px', (type._event.target.clientHeight/2+type._event.clientY - type._event.offsetY)+'px', 'right', 'top'); | 1504 | this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX) +'px', (type._event.target.clientHeight/2+type._event.clientY - type._event.offsetY)+'px', 'right', 'top'); |
1505 | } else { | 1505 | //} else { |
1506 | // | 1506 | // |
1507 | this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top'); | 1507 | // this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top'); |
1508 | } | 1508 | //} |
1509 | } | 1509 | } |
1510 | } | 1510 | } |
1511 | } else { | 1511 | } else { |
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css index 6a418279..4db0abff 100644 --- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css +++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css | |||
@@ -6,7 +6,7 @@ | |||
6 | </copyright> */ | 6 | </copyright> */ |
7 | /* line 12, colorpanelpopup.scss */ | 7 | /* line 12, colorpanelpopup.scss */ |
8 | .cpp_popup { | 8 | .cpp_popup { |
9 | overflow: none; | 9 | overflow: hidden; |
10 | font-size: 12px; | 10 | font-size: 12px; |
11 | text-shadow: 1px 1px 1px #000; | 11 | text-shadow: 1px 1px 1px #000; |
12 | font-family: 'Droid Sans', sans-serif; | 12 | font-family: 'Droid Sans', sans-serif; |
@@ -28,7 +28,7 @@ | |||
28 | text-indent: -9999px; | 28 | text-indent: -9999px; |
29 | overflow: hidden; | 29 | overflow: hidden; |
30 | float: right; | 30 | float: right; |
31 | padding: none; | 31 | padding: 0; |
32 | cursor: pointer; | 32 | cursor: pointer; |
33 | border: 1px solid transparent; | 33 | border: 1px solid transparent; |
34 | } | 34 | } |
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss index 20481fb6..1f63658a 100644 --- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss +++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss | |||
@@ -10,7 +10,7 @@ $grey_light: #494949; | |||
10 | 10 | ||
11 | .cpp_popup | 11 | .cpp_popup |
12 | { | 12 | { |
13 | overflow: none; | 13 | overflow: hidden; |
14 | font-size: 12px; | 14 | font-size: 12px; |
15 | text-shadow: 1px 1px 1px #000; | 15 | text-shadow: 1px 1px 1px #000; |
16 | font-family: 'Droid Sans', sans-serif; | 16 | font-family: 'Droid Sans', sans-serif; |
@@ -32,7 +32,7 @@ $grey_light: #494949; | |||
32 | text-indent: -9999px; | 32 | text-indent: -9999px; |
33 | overflow: hidden; | 33 | overflow: hidden; |
34 | float: right; | 34 | float: right; |
35 | padding: none; | 35 | padding: 0; |
36 | cursor: pointer; | 36 | cursor: pointer; |
37 | border: 1px solid transparent; | 37 | border: 1px solid transparent; |
38 | } | 38 | } |
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml index cdeee69e..e955623a 100644 --- a/js/panels/Materials/Materials.xml +++ b/js/panels/Materials/Materials.xml | |||
@@ -2,17 +2,10 @@ | |||
2 | <tree id="Materials"> | 2 | <tree id="Materials"> |
3 | <folder id="ninjaMaterials" label="Ninja Materials"> | 3 | <folder id="ninjaMaterials" label="Ninja Materials"> |
4 | <leaf id="UberMaterial" label="Uber" /> | 4 | <leaf id="UberMaterial" label="Uber" /> |
5 | <leaf id="RadialBlurMaterial" label="Radial Blur" /> | ||
6 | <leaf id="PulseMaterial" label="Pulse" /> | ||
7 | <leaf id="TunnelMaterial" label="Tunnel" /> | ||
8 | <leaf id="TwistMaterial" label="Twist" /> | ||
9 | <leaf id="KeleidoscopeMaterial" label="Keleidoscope" /> | ||
10 | <leaf id="JuliaMaterial" label="Julia" /> | ||
11 | <leaf id="MandelMaterial" label="Mandel" /> | ||
12 | <leaf id="PlasmaMaterial" label="Plasma" /> | ||
13 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> | 5 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> |
14 | <leaf id="LinearGradientMaterial" label="Linear Gradient" /> | 6 | <leaf id="LinearGradientMaterial" label="Linear Gradient" /> |
15 | <leaf id="RadialGradientMaterial" label="Radial Gradient" /> | 7 | <leaf id="RadialGradientMaterial" label="Radial Gradient" /> |
8 | <leaf id="FlatMaterial" label="Flat" /> | ||
16 | </folder> | 9 | </folder> |
17 | <folder id="customMaterials" label="Custom Materials"> | 10 | <folder id="customMaterials" label="Custom Materials"> |
18 | <leaf id="CheckerBoard" label="CheckerBoard" /> | 11 | <leaf id="CheckerBoard" label="CheckerBoard" /> |
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index afdc3628..62ca5395 100644 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -236,21 +236,11 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
236 | { | 236 | { |
237 | this._materialName = materialID; | 237 | this._materialName = materialID; |
238 | if( | 238 | if( |
239 | (materialID === "BrickMaterial") |