提交 7f6bd4dd 编写于 作者: F Félix Queiruga

add pluginsetupwizard.less to webpack

上级 ff4b5612
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
}, },
"dependencies": { "dependencies": {
"bootstrap-detached": "^3.3.5-v1", "bootstrap-detached": "^3.3.5-v1",
"file-loader": "^5.0.2",
"jenkins-js-modules": "^1.5.0", "jenkins-js-modules": "^1.5.0",
"jquery": "2.1.4", "jquery": "2.1.4",
"jquery-detached": "^2.1.4-v2", "jquery-detached": "^2.1.4-v2",
......
...@@ -652,7 +652,7 @@ THE SOFTWARE. ...@@ -652,7 +652,7 @@ THE SOFTWARE.
<goal>gulp</goal> <goal>gulp</goal>
</goals> </goals>
<configuration> <configuration>
<arguments>jshint bundle</arguments> <arguments>bundle</arguments>
</configuration> </configuration>
</execution> </execution>
......
@import (css) '../css/font-awesome/css/font-awesome.min.css'; @import (css) './font-awesome/css/font-awesome.css';
@import (css) '../css/icomoon/css/icomoon.css'; @import (css) './icomoon/css/icomoon.css';
@import (css) '../css/google-fonts/roboto/css/roboto.css'; @import (css) './google-fonts/roboto/css/roboto.css';
.bootstrap-3 * { .bootstrap-3 * {
// simple reset // simple reset
...@@ -52,14 +52,14 @@ ...@@ -52,14 +52,14 @@
animation-iteration-count: infinite; animation-iteration-count: infinite;
animation-timing-function: linear; animation-timing-function: linear;
} }
.no-spin() { .no-spin() {
-webkit-animation-name: none; -webkit-animation-name: none;
-moz-animation-name: none; -moz-animation-name: none;
-ms-animation-name: none; -ms-animation-name: none;
animation-name: none; animation-name: none;
} }
.modal { .modal {
padding: 20px 0; padding: 20px 0;
} }
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
box-sizing: border-box; box-sizing: border-box;
padding: 4.2em 0 4.8em 0; padding: 4.2em 0 4.8em 0;
} }
.jenkins-version { .jenkins-version {
float: left; float: left;
margin: .7em .5em; margin: .7em .5em;
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
.container.error-container { .container.error-container {
padding: 4em 3em; padding: 4em 3em;
max-width: 100%; max-width: 100%;
h1 { h1 {
color: #a94442; color: #a94442;
} }
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
.plugin { .plugin {
position: relative; position: relative;
&.selected label { &.selected label {
background: #dff0d8; background: #dff0d8;
margin: 4px -7px; margin: 4px -7px;
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
color: #777; color: #777;
} }
} }
label { label {
font-weight: normal; font-weight: normal;
padding: 7px 2px 7px 27px; padding: 7px 2px 7px 27px;
...@@ -411,11 +411,11 @@ ...@@ -411,11 +411,11 @@
} }
} }
} }
@badge-color: #555; @badge-color: #555;
@badge-background: #f8f8f8; @badge-background: #f8f8f8;
@link-color: #337ab7; @link-color: #337ab7;
.website-link { .website-link {
position: relative; position: relative;
height: 15px; height: 15px;
...@@ -467,20 +467,20 @@ ...@@ -467,20 +467,20 @@
padding: 5px 13px; padding: 5px 13px;
margin: 0 0; margin: 0 0;
z-index: 100; z-index: 100;
.badge { .badge {
margin-left: 7px; margin-left: 7px;
padding-left: 9px; padding-left: 9px;
background: @badge-background; background: @badge-background;
color: @badge-color; color: @badge-color;
box-shadow: 0 0 1px 0 rgba(0,0,0,.25); box-shadow: 0 0 1px 0 rgba(0,0,0,.25);
&:after { &:after {
content: '\f0d9'; content: '\f0d9';
font: 15px FontAwesome; font: 15px FontAwesome;
display: inline-block; display: inline-block;
width: 13px; width: 13px;
height: 13px; height: 13px;
margin: -4px -2px 0px 1px; margin: -4px -2px 0px 1px;
vertical-align: middle; vertical-align: middle;
} }
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
&:hover, &.active, &:focus { &:hover, &.active, &:focus {
text-decoration: none; text-decoration: none;
outline: none; outline: none;
.badge { .badge {
background: @badge-color; background: @badge-color;
color: #fff; color: #fff;
...@@ -496,16 +496,16 @@ ...@@ -496,16 +496,16 @@
outline: none; outline: none;
} }
} }
&.selected .toggle-dependency-list { &.selected .toggle-dependency-list {
top: -1px; top: -1px;
right: -1px; right: -1px;
} }
.dep-list { .dep-list {
padding: 10px 0 6px 0; padding: 10px 0 6px 0;
display: none; display: none;
> h3 { > h3 {
margin: 0 25px 4px 0; margin: 0 25px 4px 0;
color: #555555; color: #555555;
...@@ -514,19 +514,19 @@ ...@@ -514,19 +514,19 @@
border-bottom: 1px solid rgba(255, 255, 255, 0.5); border-bottom: 1px solid rgba(255, 255, 255, 0.5);
padding-bottom: 5px; padding-bottom: 5px;
} }
.badge { .badge {
padding: 4px 8px; padding: 4px 8px;
margin: 5px 3px 0 0; margin: 5px 3px 0 0;
background: @badge-background; background: @badge-background;
color: @badge-color; color: @badge-color;
box-shadow: 0 0 1px 0 rgba(0,0,0,.25); box-shadow: 0 0 1px 0 rgba(0,0,0,.25);
&:after { &:after {
content: '\f14c'; content: '\f14c';
font: 11px FontAwesome; font: 11px FontAwesome;
} }
&:hover, &:active, &:focus { &:hover, &:active, &:focus {
color: #fff; color: #fff;
background: @link-color; background: @link-color;
...@@ -534,12 +534,12 @@ ...@@ -534,12 +534,12 @@
} }
} }
} }
&.show-dependencies { &.show-dependencies {
.toggle-dependency-list .badge:after { .toggle-dependency-list .badge:after {
content: '\f0d7'; content: '\f0d7';
} }
.dep-list { .dep-list {
display: block; display: block;
} }
...@@ -618,7 +618,7 @@ ...@@ -618,7 +618,7 @@
z-index: 5; z-index: 5;
top: 33.3%; top: 33.3%;
width: 25%; width: 25%;
.install-console-scroll { .install-console-scroll {
position: absolute; position: absolute;
top: 6px; top: 6px;
...@@ -628,7 +628,7 @@ ...@@ -628,7 +628,7 @@
overflow:auto; overflow:auto;
font: 12px monospace; font: 12px monospace;
} }
@media screen and (max-width: 992px) { @media screen and (max-width: 992px) {
width: 100%; width: 100%;
position: relative; position: relative;
...@@ -657,7 +657,7 @@ ...@@ -657,7 +657,7 @@
content: ' ** '; content: ' ** ';
} }
} }
.dependency-legend { .dependency-legend {
color: #777; color: #777;
position: absolute; position: absolute;
...@@ -840,7 +840,7 @@ ...@@ -840,7 +840,7 @@
} }
} }
} }
.security-panel { .security-panel {
&.security-panel, > iframe { &.security-panel, > iframe {
position: absolute; position: absolute;
...@@ -855,7 +855,7 @@ ...@@ -855,7 +855,7 @@
margin: 0; margin: 0;
} }
} }
.alert { .alert {
font-size: initial; font-size: initial;
} }
......
...@@ -3,8 +3,14 @@ const MiniCSSExtractPlugin = require('mini-css-extract-plugin'); ...@@ -3,8 +3,14 @@ const MiniCSSExtractPlugin = require('mini-css-extract-plugin');
const FixStyleOnlyEntriesPlugin = require("webpack-fix-style-only-entries"); const FixStyleOnlyEntriesPlugin = require("webpack-fix-style-only-entries");
module.exports = { module.exports = {
mode: 'development', // mode: 'development',
entry: { entry: {
// "page-init": [path.join(__dirname, "src/main/js/page-init.js")],
"pluginSetupWizard": [
// path.join(__dirname, "src/main/js/pluginSetupWizard.js"),
path.join(__dirname, "src/main/less/pluginSetupWizard.less"),
],
// "upgradeWizard": [path.join(__dirname, "src/main/js/upgradeWizard.js")],
"add-item": [ "add-item": [
path.join(__dirname, "src/main/js/add-item.js"), path.join(__dirname, "src/main/js/add-item.js"),
path.join(__dirname, "src/main/js/add-item.less"), path.join(__dirname, "src/main/js/add-item.less"),
...@@ -33,18 +39,30 @@ module.exports = { ...@@ -33,18 +39,30 @@ module.exports = {
test: /\.(css|less)$/, test: /\.(css|less)$/,
loader: [MiniCSSExtractPlugin.loader, "css-loader", "less-loader"] loader: [MiniCSSExtractPlugin.loader, "css-loader", "less-loader"]
}, },
{
test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
use: [
{
loader: 'file-loader',
options: {
name: '[name].[ext]',
outputPath: 'fonts/'
}
}
]
},
] ]
}, },
optimization: { optimization: {
// splitChunks: { splitChunks: {
// chunks: 'async', // chunks: 'async',
// cacheGroups: { // cacheGroups: {
// commons: { // commons: {
// test: /[\\/]node_modules[\\/]/, // test: /[\\/]node_modules[\\/]/,
// name: 'vendors', // name: 'vendors',
// chunks: 'all' // chunks: 'all'
// } // }
// } // }
// } }
} }
} }
...@@ -1701,6 +1701,14 @@ figgy-pudding@^3.5.1: ...@@ -1701,6 +1701,14 @@ figgy-pudding@^3.5.1:
resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
file-loader@^5.0.2:
version "5.0.2"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.0.2.tgz#7f3d8b4ac85a5e8df61338cfec95d7405f971caa"
integrity sha512-QMiQ+WBkGLejKe81HU8SZ9PovsU/5uaLo0JdTCEXOYv7i7jfAjHZi1tcwp9tSASJPOmmHZtbdCervFmXMH/Dcg==
dependencies:
loader-utils "^1.2.3"
schema-utils "^2.5.0"
filename-regex@^2.0.0: filename-regex@^2.0.0:
version "2.0.1" version "2.0.1"
resolved "https://repo.jenkins-ci.org/api/npm/npm/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" resolved "https://repo.jenkins-ci.org/api/npm/npm/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
...@@ -4737,6 +4745,14 @@ schema-utils@^2.0.0: ...@@ -4737,6 +4745,14 @@ schema-utils@^2.0.0:
ajv "^6.10.2" ajv "^6.10.2"
ajv-keywords "^3.4.1" ajv-keywords "^3.4.1"
schema-utils@^2.5.0:
version "2.6.1"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f"
integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==
dependencies:
ajv "^6.10.2"
ajv-keywords "^3.4.1"
semver@^4.1.0: semver@^4.1.0:
version "4.3.6" version "4.3.6"
resolved "https://repo.jenkins-ci.org/api/npm/npm/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" resolved "https://repo.jenkins-ci.org/api/npm/npm/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册