aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets/shaders/Cloud.frag.glsl4
-rw-r--r--assets/shaders/Cloud.vert.glsl2
-rw-r--r--assets/shaders/Flag.vert.glsl2
-rwxr-xr-xassets/shaders/linearGradient.frag.glsl18
-rwxr-xr-xassets/shaders/linearGradient.vert.glsl16
-rw-r--r--assets/shaders/radialGradient.frag.glsl18
-rwxr-xr-xassets/shaders/test_fshader.glsl44
-rwxr-xr-xassets/shaders/test_fshader_full.glsl22
-rwxr-xr-xassets/shaders/test_vshader.glsl10
-rwxr-xr-xassets/shaders/ub_fshader.glsl102
-rwxr-xr-xassets/shaders/ub_vshader.glsl44
-rw-r--r--credits.html4
-rwxr-xr-xindex.html20
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html12
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html14
-rwxr-xr-xjs/components/gradientpicker.reel/css/gradientpicker.scss2
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html35
-rwxr-xr-xjs/components/hottext.reel/hottext.html2
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html2
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html2
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html2
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html2
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html4
-rwxr-xr-xjs/components/menu/menu.reel/menu.html2
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.html14
-rwxr-xr-xjs/components/popup.reel/css/popup.scss4
-rwxr-xr-xjs/components/popup.reel/popup.html12
-rwxr-xr-xjs/components/slider.reel/slider.html2
-rw-r--r--js/components/toolbar.reel/toolbar.html4
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.html4
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.css2
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.html2
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html2
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html2
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.css4
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html2
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html6
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html2
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html4
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html4
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html4
-rw-r--r--js/components/treeview/treeview.reel/treeview.html4
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.css2
-rwxr-xr-xjs/document/templates/banner/index.html34
-rwxr-xr-xjs/document/templates/html/index.html16
-rwxr-xr-xjs/document/templates/preview/banner.html12
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.html44
-rw-r--r--js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css2
-rwxr-xr-xjs/ninja.reel/ninja.html4
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css2
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html2
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html2
-rwxr-xr-xjs/panels/Panel.reel/Panel.html2
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/projectpanelbase.html8
-rw-r--r--js/panels/Timeline/EasingMenu.reel/EasingMenu.html2
-rw-r--r--js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss2
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html18
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss2
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss2
-rw-r--r--js/panels/Timeline/Span.reel/scss/Span.scss2
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html16
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss2
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html16
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss2
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html2
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html12
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/css/colorpanelbase.scss14
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html36
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss2
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html4
-rwxr-xr-xjs/panels/properties.reel/properties.css2
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html2
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html2
-rw-r--r--license.html8
-rw-r--r--node_modules/montage-google/map.reel/map.html10
-rw-r--r--node_modules/montage/ui/button.reel/button.css2
-rw-r--r--node_modules/montage/ui/input-number.reel/input-number.html2
-rw-r--r--node_modules/montage/ui/input-radio.reel/input-radio.css10
-rw-r--r--node_modules/montage/ui/input-range.reel/input-range.css2
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.css2
-rw-r--r--node_modules/montage/ui/select.reel/select.css6
-rw-r--r--node_modules/montage/ui/textarea.reel/textarea.css6
-rw-r--r--node_modules/montage/ui/token-field/token.reel/token.css2
-rw-r--r--node_modules/montage/ui/token-field/token.reel/token.html2
-rwxr-xr-xscss/imports/scss/_Base.scss40
-rwxr-xr-xscss/imports/scss/_Components.scss4
-rwxr-xr-xscss/imports/scss/_MainWindow.scss10
-rwxr-xr-xscss/imports/scss/_MenuUI.scss6
-rw-r--r--scss/imports/scss/_MontageOverrides.scss2
-rwxr-xr-xscss/imports/scss/_PanelUI.scss90
-rwxr-xr-xscss/imports/scss/_ScrollBars.scss28
-rw-r--r--scss/imports/scss/_Stage.scss16
-rwxr-xr-xscss/imports/scss/_Tools.scss74
-rwxr-xr-xscss/imports/scss/_mixins.scss2
-rwxr-xr-xscss/imports/scss/_toolbar.scss6
-rwxr-xr-xscss/imports/themes/default/_colors.scss46
-rwxr-xr-xscss/ninja.scss4
101 files changed, 560 insertions, 561 deletions
diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl
index dc984191..1149f11b 100644
--- a/assets/shaders/Cloud.frag.glsl
+++ b/assets/shaders/Cloud.frag.glsl
@@ -43,5 +43,5 @@ void main()
43{ 43{
44 vec4 c = texture2D(u_tex0, v_texCoord0); 44 vec4 c = texture2D(u_tex0, v_texCoord0);
45 gl_FragColor = c; 45 gl_FragColor = c;
46} 46}
47 47
diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl
index c709bc27..a33429fe 100644
--- a/assets/shaders/Cloud.vert.glsl
+++ b/assets/shaders/Cloud.vert.glsl
@@ -70,6 +70,6 @@ void main()
70 pos.z = z; 70 pos.z = z;
71 71
72 gl_Position = u_projMatrix * u_mvMatrix * pos; 72 gl_Position = u_projMatrix * u_mvMatrix * pos;
73 73
74 v_texCoord0 = texcoord; 74 v_texCoord0 = texcoord;
75} 75}
diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl
index 49eaaccb..51ec8f8b 100644
--- a/assets/shaders/Flag.vert.glsl
+++ b/assets/shaders/Flag.vert.glsl
@@ -70,6 +70,6 @@ void main()
70 v.z *= u_waveHeight; 70 v.z *= u_waveHeight;
71 v.z -= 2.0*u_waveHeight; 71 v.z -= 2.0*u_waveHeight;
72 v.z *= x * 0.09; 72 v.z *= x * 0.09;
73 73
74 gl_Position = u_projMatrix * u_mvMatrix * vec4(v,1.0) ; 74 gl_Position = u_projMatrix * u_mvMatrix * vec4(v,1.0) ;
75} 75}
diff --git a/assets/shaders/linearGradient.frag.glsl b/assets/shaders/linearGradient.frag.glsl
index 56a55d86..03310255 100755
--- a/assets/shaders/linearGradient.frag.glsl
+++ b/assets/shaders/linearGradient.frag.glsl
@@ -33,14 +33,14 @@ precision highp float;
33#endif 33#endif
34 34
35 35
36uniform vec4 u_color1; 36uniform vec4 u_color1;
37uniform vec4 u_color2; 37uniform vec4 u_color2;
38uniform vec4 u_color3; 38uniform vec4 u_color3;
39uniform vec4 u_color4; 39uniform vec4 u_color4;
40uniform float u_colorStop1; 40uniform float u_colorStop1;
41uniform float u_colorStop2; 41uniform float u_colorStop2;
42uniform float u_colorStop3; 42uniform float u_colorStop3;
43uniform float u_colorStop4; 43uniform float u_colorStop4;
44uniform vec2 u_cos_sin_angle; 44uniform vec2 u_cos_sin_angle;
45//uniform int u_colorCount; // currently using 4 45//uniform int u_colorCount; // currently using 4
46 46
@@ -73,4 +73,4 @@ void main(void)
73 color = u_color4; 73 color = u_color4;
74 74
75 g