From 920f5f3855418d91e8a55649495bb93ea3841486 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 14 Dec 2017 23:10:19 +0800
Subject: [PATCH] updates
---
/dev/null | 1
src/typings.d.ts | 13 ++++
package.json | 2
src/styles/index.less | 1
src/index.html | 34 ++++++++--
src/polyfills.ts | 50 +++++++++-------
src/styles/_alain-custom-variables.less | 26 ++++++++
.angular-cli.json | 30 +++++++++
src/styles.less | 15 +++++
9 files changed, 139 insertions(+), 33 deletions(-)
diff --git a/.angular-cli.json b/.angular-cli.json
index 9ccd9d5..1e8b64b 100644
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -19,7 +19,7 @@
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
- "styles.css"
+ "styles.less"
],
"scripts": [],
"environmentSource": "environments/environment.ts",
@@ -55,6 +55,32 @@
},
"defaults": {
"styleExt": "css",
- "component": {}
+ "class": {
+ "spec": false
+ },
+ "component": {
+ "flat": false,
+ "spec": false,
+ "inlineStyle": true,
+ "inlineTemplate": false
+ },
+ "directive": {
+ "spec": false
+ },
+ "guard": {
+ "spec": false
+ },
+ "interface": {
+ "prefix": "I"
+ },
+ "module": {
+ "spec": false
+ },
+ "pipe": {
+ "spec": true
+ },
+ "service": {
+ "spec": false
+ }
}
}
diff --git a/package.json b/package.json
index bc25aac..a3f832f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "screen-frontend",
- "version": "0.0.0",
+ "version": "1.0.0",
"license": "MIT",
"scripts": {
"ng": "ng",
diff --git a/src/index.html b/src/index.html
index 403d282..6ab9cf7 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,14 +1,32 @@
<!doctype html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <title>ScreenFrontend</title>
- <base href="/">
+<html>
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="icon" type="image/x-icon" href="favicon.ico">
+<head>
+ <meta charset="utf-8">
+ <title>ngAlain</title>
+ <base href="/">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta http-equiv="x-ua-compatible" content="ie=edge">
+ <link rel="icon" type="image/x-icon" href="favicon.ico">
+ <!-- Apple Touch Icon -->
+ <!-- <link rel="apple-touch-icon" href="custom-icon.png"> -->
+ <style type="text/css">.preloader{position:fixed;top:0;left:0;width:100%;height:100%;overflow:hidden;background:#49a9ee;z-index:9999;transition:opacity .65s}.preloader-hidden-add{opacity:1;display:block}.preloader-hidden-add-active{opacity:0}.preloader-hidden{display:none}.cs-loader{position:absolute;top:0;left:0;height:100%;width:100%}.cs-loader-inner{transform:translateY(-50%);top:50%;position:absolute;width:100%;color:#fff;text-align:center}.cs-loader-inner label{font-size:20px;opacity:0;display:inline-block}@keyframes lol{0%{opacity:0;transform:translateX(-300px)}33%{opacity:1;transform:translateX(0)}66%{opacity:1;transform:translateX(0)}100%{opacity:0;transform:translateX(300px)}}.cs-loader-inner label:nth-child(6){animation:lol 3s infinite ease-in-out}.cs-loader-inner label:nth-child(5){animation:lol 3s .1s infinite ease-in-out}.cs-loader-inner label:nth-child(4){animation:lol 3s .2s infinite ease-in-out}.cs-loader-inner label:nth-child(3){animation:lol 3s .3s infinite ease-in-out}.cs-loader-inner label:nth-child(2){animation:lol 3s .4s infinite ease-in-out}.cs-loader-inner label:nth-child(1){animation:lol 3s .5s infinite ease-in-out}</style>
</head>
+
<body>
- <app-root></app-root>
+ <app-root></app-root>
+ <div class="preloader">
+ <div class="cs-loader">
+ <div class="cs-loader-inner">
+ <label> ���</label>
+ <label> ���</label>
+ <label> ���</label>
+ <label> ���</label>
+ <label> ���</label>
+ <label> ���</label>
+ </div>
+ </div>
+ </div>
</body>
+
</html>
diff --git a/src/polyfills.ts b/src/polyfills.ts
index d68672f..5c963f0 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -19,35 +19,33 @@
*/
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-// import 'core-js/es6/symbol';
-// import 'core-js/es6/object';
-// import 'core-js/es6/function';
-// import 'core-js/es6/parse-int';
-// import 'core-js/es6/parse-float';
-// import 'core-js/es6/number';
-// import 'core-js/es6/math';
-// import 'core-js/es6/string';
-// import 'core-js/es6/date';
-// import 'core-js/es6/array';
-// import 'core-js/es6/regexp';
-// import 'core-js/es6/map';
-// import 'core-js/es6/weak-map';
-// import 'core-js/es6/set';
+import 'core-js/es6/symbol';
+import 'core-js/es6/object';
+import 'core-js/es6/function';
+import 'core-js/es6/parse-int';
+import 'core-js/es6/parse-float';
+import 'core-js/es6/number';
+import 'core-js/es6/math';
+import 'core-js/es6/string';
+import 'core-js/es6/date';
+import 'core-js/es6/array';
+import 'core-js/es6/regexp';
+import 'core-js/es6/map';
+import 'core-js/es6/weak-map';
+import 'core-js/es6/set';
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
-/** IE10 and IE11 requires the following for the Reflect API. */
-// import 'core-js/es6/reflect';
-
-
/** Evergreen browsers require these. **/
-// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
+import 'core-js/es6/reflect';
import 'core-js/es7/reflect';
+// IE Need
+import 'core-js/es7/array';
/**
- * Required to support Web Animations `@angular/platform-browser/animations`.
+ * Required to support Web Animations `@angular/animation`.
* Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
**/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
@@ -55,7 +53,7 @@
/***************************************************************************************************
- * Zone JS is required by default for Angular itself.
+ * Zone JS is required by Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
@@ -64,3 +62,13 @@
/***************************************************************************************************
* APPLICATION IMPORTS
*/
+
+/**
+ * Date, currency, decimal and percent pipes.
+ * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
+ */
+// import 'intl'; // Run `npm install --save intl`.
+/**
+ * Need to import at least one locale-data with intl.
+ */
+// import 'intl/locale-data/jsonp/en';
diff --git a/src/styles.css b/src/styles.css
deleted file mode 100644
index 90d4ee0..0000000
--- a/src/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* You can add global styles to this file, and also import other style files */
diff --git a/src/styles.less b/src/styles.less
new file mode 100644
index 0000000..d216cf5
--- /dev/null
+++ b/src/styles.less
@@ -0,0 +1,15 @@
+/* You can add global styles to this file, and also import other style files */
+
+// web font icon
+@import '../node_modules/font-awesome/css/font-awesome.css';
+@import '../node_modules/simple-line-icons/css/simple-line-icons.css';
+@import '../node_modules/weather-icons/css/weather-icons.css';
+
+// ng-alain
+@import '~@delon/theme/styles/index';
+@import "./styles/_alain-custom-variables";
+
+@import "./styles/index";
+
+// Third Library
+@import '../node_modules/ng2-dnd/bundles/style.css';
diff --git a/src/styles/_alain-custom-variables.less b/src/styles/_alain-custom-variables.less
new file mode 100644
index 0000000..7393faf
--- /dev/null
+++ b/src/styles/_alain-custom-variables.less
@@ -0,0 +1,26 @@
+// ��������������������������������������������������� alain ���������������
+// alain ��������������������������������������� issues ������
+
+// ���������������������������������������
+// @content-bg: #fff;
+
+// ���������������
+// ������ng-zorro-antd������������������������14px
+@focusing-enabled: true;
+@nz-font-size: 14px;
+
+@focusing-full-color-enabled: true;
+
+// ������alain������������
+.alain();
+// ������alain������������������������������������
+.alain-theme-a();
+.alain-theme-b();
+.alain-theme-c();
+.alain-theme-d();
+.alain-theme-e();
+.alain-theme-f();
+.alain-theme-g();
+.alain-theme-h();
+.alain-theme-i();
+.alain-theme-j();
diff --git a/src/styles/index.less b/src/styles/index.less
new file mode 100644
index 0000000..dcd9331
--- /dev/null
+++ b/src/styles/index.less
@@ -0,0 +1 @@
+// ������������������������������������������������������
diff --git a/src/typings.d.ts b/src/typings.d.ts
index ef5c7bd..590bdc6 100644
--- a/src/typings.d.ts
+++ b/src/typings.d.ts
@@ -3,3 +3,16 @@
interface NodeModule {
id: string;
}
+
+interface WebpackRequire {
+ <T>(path: string): T;
+ (paths: string[], callback: (...modules: any[]) => void): void;
+ ensure: (paths: string[], callback: (require: <T>(path: string) => T) => void) => void;
+}
+interface NodeRequire extends WebpackRequire {}
+declare var require: NodeRequire;
+
+// G2
+declare var G2: any;
+declare var Slider: any;
+declare var Cloud: any;
--
Gitblit v1.8.0