Skip to content

Commit 0ffd03f

Browse files
committed
Merge 4.7.2 changes
1 parent 74c65db commit 0ffd03f

File tree

273 files changed

+23232
-30917
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+23232
-30917
lines changed

.jsbeautifyrc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{
2-
// Details: https://github.com/victorporof/Sublime-HTMLPrettify#using-your-own-jsbeautifyrc-options
3-
// Documentation: https://github.com/einars/js-beautify/
4-
52
"html": {
63
"allowed_file_extensions": ["htm", "html", "xhtml", "shtml", "xml", "svg"],
74
"space_after_anon_function": true,
@@ -10,7 +7,8 @@
107
"css": {
118
"allowed_file_extensions": ["css", "scss", "sass", "less"],
129
"end_with_newline": true,
13-
"space_around_combinator": true
10+
"space_around_combinator": true,
11+
"indent_size": 2
1412
},
1513
"js": {
1614
"allowed_file_extensions": ["js", "jsx", "json", "jshintrc", "jsbeautifyrc"],
@@ -19,4 +17,4 @@
1917
"space_after_anon_function": true,
2018
"end_with_newline": true
2119
}
22-
}
20+
}

bundles/mobiscroll.angular.min.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export * from './mobiscroll.angular';
2-
export { MbscAccordion as ɵp, MbscFormGroup as ɵm, MbscFormGroupContent as ɵo, MbscFormGroupTitle as ɵn, MbscRadioGroupBase as ɵl, MbscRadioService as ɵk } from '../src/js/forms.angular';
2+
export { MbscAccordion as ɵo, MbscFormGroup as ɵl, MbscFormGroupContent as ɵn, MbscFormGroupTitle as ɵm, MbscRadioGroupBase as ɵk, MbscRadioService as ɵj } from '../src/js/forms.angular';
33
export { MbscBase as ɵc, MbscCloneBase as ɵe, MbscControlBase as ɵf, MbscInputService as ɵb, MbscOptionsService as ɵa, MbscValueBase as ɵd } from '../src/js/frameworks/angular';
4-
export { MbscFormBase as ɵg, MbscFormValueBase as ɵh, MbscInputBase as ɵi, MbscInputModule as ɵj } from '../src/js/input.angular';
4+
export { MbscFormBase as ɵg, MbscFormValueBase as ɵh, MbscInputBase as ɵi } from '../src/js/input.angular';

bundles/mobiscroll.angular.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
$mbsc-font-path: '~@mobiscroll/angular-lite/dist/css/' !default;
2+
3+
@import "mobiscroll";

bundles/mobiscroll.javascript.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
$mbsc-font-path: '~@mobiscroll/javascript-lite/dist/css/' !default;
2+
3+
@import "mobiscroll";

bundles/mobiscroll.jquery.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
$mbsc-font-path: '~@mobiscroll/jquery-lite/dist/css/' !default;
2+
3+
@import "mobiscroll";

bundles/mobiscroll.less

Lines changed: 0 additions & 15 deletions
This file was deleted.

bundles/mobiscroll.ng.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
$mbsc-font-path: '~@mobiscroll/angularjs-lite/dist/css/' !default;
2+
3+
@import "mobiscroll";

bundles/mobiscroll.react.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
$mbsc-font-path: '~@mobiscroll/react-lite/dist/css/' !default;
2+
3+
@import "mobiscroll";

bundles/mobiscroll.scss

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// Forms
2+
@import "../src/scss/forms/forms";
3+
@import "../src/scss/forms/forms.bootstrap";
4+
@import "../src/scss/forms/forms.ios";
5+
@import "../src/scss/forms/forms.material";
6+
@import "../src/scss/forms/forms.mobiscroll";
7+
@import "../src/scss/forms/forms.windows";
8+
9+
// Grid Layout
10+
@import "../src/scss/grid-layout/grid-layout";
11+
12+
// Create theme builder functions
13+
14+
@mixin mbsc-ios-theme($theme, $params) {
15+
@include mbsc-ios-forms($theme, $params);
16+
}
17+
18+
@mixin mbsc-material-theme($theme, $params) {
19+
@include mbsc-material-forms($theme, $params);
20+
}
21+
22+
@mixin mbsc-mobiscroll-theme($theme, $params) {
23+
@include mbsc-mobiscroll-forms($theme, $params);
24+
}
25+
26+
@mixin mbsc-windows-theme($theme, $params) {
27+
@include mbsc-windows-forms($theme, $params);
28+
}
29+
30+
@mixin mbsc-custom-theme($theme, $base-theme, $colors) {
31+
@if $base-theme=='ios' {
32+
@include mbsc-ios-theme($theme, $colors);
33+
}
34+
35+
@else if $base-theme=='material' {
36+
@include mbsc-material-theme($theme, $colors);
37+
}
38+
39+
@else if $base-theme=='mobiscroll' {
40+
@include mbsc-mobiscroll-theme($theme, $colors);
41+
}
42+
43+
@else if $base-theme=='windows' {
44+
@include mbsc-windows-theme($theme, $colors);
45+
}
46+
}
47+
48+
// Create dark theme variants
49+
@include mbsc-ios-theme('ios-dark', ('background': $mbsc-ios-dark-background, 'text': $mbsc-ios-dark-text, 'accent': $mbsc-ios-dark-accent));
50+
@include mbsc-material-theme('material-dark', ('background': $mbsc-material-dark-background, 'text': $mbsc-material-dark-text, 'accent': $mbsc-material-dark-accent));
51+
@include mbsc-mobiscroll-theme('mobiscroll-dark', ('background': $mbsc-mobiscroll-dark-background, 'text': $mbsc-mobiscroll-dark-text, 'accent': $mbsc-mobiscroll-dark-accent));
52+
@include mbsc-windows-theme('windows-dark', ('background': $mbsc-windows-dark-background, 'text': $mbsc-windows-dark-text, 'accent': $mbsc-windows-dark-accent));

examples/angular/.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Editor configuration, see http://editorconfig.org
1+
# Editor configuration, see https://editorconfig.org
22
root = true
33

44
[*]

0 commit comments

Comments
 (0)