diff --git a/package.json b/package.json index ec4a42a..8c5a597 100644 --- a/package.json +++ b/package.json @@ -31,5 +31,8 @@ "webpack-cli": "^3.3.0", "webpack-dev-server": "^3.2.1", "webpack-stream": "^5.2.1" + }, + "optionalDependencies": { + "fineui": "git+ssh://git@cloud.finedevelop.com:7999/visual/fineui.git" } } diff --git a/src/less/resource/app.less b/src/less/app.less similarity index 92% rename from src/less/resource/app.less rename to src/less/app.less index 114a1ac..c30e453 100644 --- a/src/less/resource/app.less +++ b/src/less/app.less @@ -30,7 +30,7 @@ width: 30px; height: 30px; cursor: pointer; - background-image: url("../../img/icon_close9x9_normal.png"); + background-image: url("../img/icon_close9x9_normal.png"); background-repeat: no-repeat; background-position: center; } @@ -108,7 +108,7 @@ .bi-flex-center-adapt-layout{ height: 100%; .data-connection-background{ - background: url(../../img/resources.png) center center no-repeat; + background: url(../img/resources.png) center center no-repeat; background-size: contain; } } @@ -215,7 +215,7 @@ margin-top: 40px; margin-left: 20px; .comfirm-icon{ - background-image: url("../../img/warning.png"); + background-image: url("../img/warning.png"); background-size: contain; margin-right: 12px; } @@ -249,7 +249,7 @@ top: -1px; height: 30px; width: 30px; - background: url(../../img/database-selected.png) center center no-repeat; + background: url(../img/database-selected.png) center center no-repeat; background-size: contain; } .text{ @@ -278,21 +278,21 @@ text-align: center; .loading-icon{ display: block; - background: url(../../img/loading.gif) center center no-repeat; + background: url(../img/loading.gif) center center no-repeat; background-size: contain; margin: 0 auto; margin-bottom: 18px; } .success-icon{ display: block; - background: url(../../img/success.png) center center no-repeat; + background: url(../img/success.png) center center no-repeat; background-size: contain; margin: 0 auto; margin-bottom: 18px; } .error-icon{ display: block; - background: url(../../img/error.png) center center no-repeat; + background: url(../img/error.png) center center no-repeat; background-size: contain; margin: 0 auto; margin-bottom: 18px; @@ -312,4 +312,7 @@ padding: 5px; margin-top: 10px; } +} +.jndi-notice{ + color: @color-jndi-notice; } \ No newline at end of file diff --git a/src/less/color.less b/src/less/color.less new file mode 100644 index 0000000..a1a49e7 --- /dev/null +++ b/src/less/color.less @@ -0,0 +1,3 @@ +@import "../../node_modules/fineui/src/less/lib/colors.less"; +@color-jndi-notice: @font-color-negative; +@background-color-blue-transparent: rgba(54,133,242,.05); \ No newline at end of file diff --git a/src/less/font.less b/src/less/font.less new file mode 100644 index 0000000..1c9d074 --- /dev/null +++ b/src/less/font.less @@ -0,0 +1,7 @@ +@import "../../node_modules/fineui/src/less/image.less"; +@import "./lib/font.less"; + +.font(link-font, @font-link); +.font(info-font, @font-link-info); +.font(test-font, @font-link-test); +.font(delete-font, @font-link-delete); \ No newline at end of file diff --git a/src/less/index.less b/src/less/index.less index cebf288..e866921 100644 --- a/src/less/index.less +++ b/src/less/index.less @@ -1,4 +1,3 @@ -@import "lib/color"; -@import "resource/app"; -@import "resource/jndi"; -@import "resource/font"; \ No newline at end of file +@import "color"; +@import "app"; +@import "font"; \ No newline at end of file diff --git a/src/less/lib/color.less b/src/less/lib/color.less deleted file mode 100644 index 604b677..0000000 --- a/src/less/lib/color.less +++ /dev/null @@ -1,4 +0,0 @@ -@import "constant"; - -@color-jndi-notice: @font-color-negative; -@background-color-blue-transparent: rgba(54,133,242,.05); \ No newline at end of file diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less deleted file mode 100644 index 671ec05..0000000 --- a/src/less/lib/constant.less +++ /dev/null @@ -1,106 +0,0 @@ -//常量库 - -//classified - -// -@font-size-12: 12px; -@font-size-13: 13px; -@font-size-14: 14px; -@font-size-16: 16px; -@font-size-18: 18px; -@font-size-22: 22px; -@font-size-24: 24px; -@font-size-30: 30px; -@font-size-40: 40px; -@font-size-50: 50px; -@font-size-60: 60px; -@font-size-70: 70px; -@radius-2: 2px; -@radius-6: 6px; - -@opacity-15: 0.15; -@opacity-20: 0.2; - -//font color -@font-color-black: #232e40;// -@font-color-normal: #3d4d66;// -@font-color-normal-theme-dark: #d6e0dc;// -@font-color-light-gray: #647185; -@font-color-light-gray-theme-dark: #afb7c6; -@font-color-disabled: #9ea6b2;// -@font-color-disabled-theme-dark: #878d9f;// -@font-color-tips: #9ea6b2;// -@font-color-tips-theme-dark: #6b7084;// -@font-color-light-disabled: #d0d4da;// -@font-color-light-disabled-theme-dark: #606479; -@font-color-gray: #999999; -@font-color-white: #ffffff;// -@font-color-white-theme-dark: #242640;// -@font-color-light-highlight: #eaf2fd; -@font-color-medium-highlight: #d7e7fc; -@font-color-highlight: #3685f2; -@font-color-blue: #23beef; -@font-color-light-blue: #e9f8fd; -@font-color-success: #13cd66; -@font-color-warning: #faaa39;// -@font-color-negative: #ff4949;// -@font-color-yellow: #ffc101;// - -//background color -@background-color-black: #232E40;// -@background-color-light-black: #3d4d66; -@background-color-light-black-theme-dark: #d6e0dc;// -@background-color-default: #ffffff;// -@background-color-default-theme-dark: #242640;// -@background-color-normal: #f7f8fa;// -@background-color-normal-theme-dark: #191B2B;// -@background-color-light-highlight: #eaf2fd; -@background-color-medium-highlight: #d7e7fc; -@background-color-highlight: #3685f2; -@background-color-blue: #23beef; -@background-color-light-blue: #e9f8fd; -@background-color-dark: #d4dadd; -@background-color-light-gray: #F2F4F7; -@background-color-light-gray-theme-dark: #2F3149; -@background-color-dark-gray: #d0d4da; -@background-color-dark-gray-theme-dark: #606479; -@background-color-disabled: #F2F4F7; -@background-color-disabled-theme-dark: #2F3149; -@background-color-yellow: #ffc101;// - -@background-color-negative: #ff4949; -@background-color-light-negative: #ffecec; -@background-color-dark-negative: #3A2940; -@background-color-light-warning: #feeed7; -@background-color-warning: #faaa39; - -@background-color-dark-success: #13cd66; -@background-color-light-success: #e1f4e7; -@background-color-normal-success: #647185; - -//border color -@border-color-default: #ffffff; -@border-color-black: #232e40; -@border-color-line: #e8eaed; -@border-color-line-theme-dark: #3a3c53; -@border-color-light-line: #f2f4f7; -@border-color-light-line-theme-dark: #2F3149; -@border-color-dark-line: #9EA6B2; -@border-color-dark-line-theme-dark: #878D9F; -@border-color-highlight: #3685f2; - -@border-color-warning: #fbb03b; -@border-color-negative: #FF4949; -@border-color-success: #13cd66; -@border-color-light-negative: #f4cbcb; -@border-color-normal-success: #eddea2; - -//split color -@border-color-disabled: #d0d4da; -@border-color-disabled-theme-dark: #606479; - -//scroll color -@scroll-color: #3d4d66; -@scroll-color-theme-dark: #ffffff; - -@water-mark-color-theme-dark: #878d9f; diff --git a/src/less/lib/image.less b/src/less/lib/image.less deleted file mode 100644 index 232beba..0000000 --- a/src/less/lib/image.less +++ /dev/null @@ -1,18 +0,0 @@ -@color-bi-font-native: inherit; - -.font(@class,@content, @color: @color-bi-font-native) { - @fc: "\@{content}"; - .@{class} { - & .b-font { - *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')"; - } - & .b-font:before { - content: @fc; - color: @color; - } - &.disabled .b-font:before { - content: @fc; - color: @color; - } - } -} \ No newline at end of file diff --git a/src/less/resource/font.less b/src/less/resource/font.less deleted file mode 100644 index 15cca2e..0000000 --- a/src/less/resource/font.less +++ /dev/null @@ -1,7 +0,0 @@ -@import "../lib/font"; -@import "../lib//image"; - -.font(link-font, @font-link); -.font(info-font, @font-link-info); -.font(test-font, @font-link-test); -.font(delete-font, @font-link-delete); \ No newline at end of file diff --git a/src/less/resource/jndi.less b/src/less/resource/jndi.less deleted file mode 100644 index 570167f..0000000 --- a/src/less/resource/jndi.less +++ /dev/null @@ -1,3 +0,0 @@ -.jndi-notice{ - color: @color-jndi-notice; -} \ No newline at end of file