Skip to content

Commit 3e0250d

Browse files
authored
Merge pull request #1090 from neomjs/dev
v1.3.50
2 parents be07087 + 5928683 commit 3e0250d

File tree

17 files changed

+318
-147
lines changed

17 files changed

+318
-147
lines changed

examples/dialog/DemoDialog.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import Dialog from '../../src/container/Dialog.mjs';
1+
import {default as Dialog} from '../../src/dialog/Base.mjs';
22

33
/**
44
* @class Window.DemoDialog
5-
* @extends Neo.container.Dialog
5+
* @extends Neo.dialog.Base
66
*/
77
class DemoDialog extends Dialog {
88
static getConfig() {return {

examples/dialog/MainContainer.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ class MainContainer extends Toolbar {
4444
*/
4545
createDialog(data) {
4646
Neo.create(DemoDialog, {
47-
appName: this.appName
47+
animateTargetId: data.component.id,
48+
appName : this.appName
4849
});
4950
}
5051

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neo.mjs",
3-
"version": "1.3.49",
3+
"version": "1.3.50",
44
"description": "The webworkers driven UI framework",
55
"repository": {
66
"type": "git",

resources/scss/src/_all.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@import "calendar/all";
33
@import "component/all";
44
@import "container/all";
5+
@import "dialog/all";
56
@import "docs/all";
67
@import "draggable/all";
78
@import "examples/all";

resources/scss/src/container/_all.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@import "Base";
2-
@import "Dialog";
32
@import "Panel";
43
@import "Toolbar";
54
@import "Toolbar";

resources/scss/src/container/_Dialog.scss renamed to resources/scss/src/dialog/_Base.scss

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
.neo-animate-dialog {
2+
// default styling to match buttons, since this is the most common use case
3+
background-color: v(button-background-color);
4+
background-image: v(button-background-image);
5+
border : 1px solid v(button-active-border-color);
6+
7+
position: fixed;
8+
z-index : 1000;
9+
10+
transition-duration : 250ms;
11+
transition-property : height, left, top, transform, width;
12+
transition-timing-function: ease-out;
13+
14+
&.neo-hide {
15+
transform : none !important;
16+
transition-property: height, left, top, width;
17+
}
18+
}
19+
120
.neo-dialog {
221
border : 1px solid v(dialog-border-color);
322
position : fixed;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "Base";

resources/scss/theme-dark/_all.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
@import "apps/all";
44
@import "calendar/all";
55
@import "component/all";
6+
@import "dialog/all";
67
@import "docs/all";
78
@import "container/all";
89
@import "examples/all";
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@import "Base";
2-
@import "Dialog";
32
@import "Panel";
43
@import "Toolbar";
54
@import "Viewport";

0 commit comments

Comments
 (0)