Merge branch 'master' into test
gitea/hedera-web/pipeline/head There was a failure building this commit
Details
gitea/hedera-web/pipeline/head There was a failure building this commit
Details
This commit is contained in:
commit
209d2e2606
|
|
@ -1,4 +1,6 @@
|
|||
|
||||
.address-list .htk-list .side {
|
||||
hedera-address-list {
|
||||
.htk-list .side {
|
||||
padding-right: 16px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
tip="_AddAddress"
|
||||
on-click="this.onAddAddressClick()"/>
|
||||
</div>
|
||||
<div id="form" class="address-list">
|
||||
<div id="form" class="hedera-address-list">
|
||||
<div class="box vn-w-sm">
|
||||
<htk-radio-group
|
||||
id="default-address"
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
tip="_Accept"
|
||||
on-click="iter.performOperations()"/>
|
||||
</div>
|
||||
<div id="form" class="address">
|
||||
<div id="form" class="hedera-address">
|
||||
<div class="form box vn-w-sm vn-pa-lg">
|
||||
<h5 class="vn-mb-md">
|
||||
<t>AddEditAddress</t>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
}
|
||||
}
|
||||
.title ._subtitle {
|
||||
font-size: .7rem;
|
||||
font-size: .85rem;
|
||||
color: #bbb;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ const tinymce = require('tinymce/tinymce');
|
|||
require('tinymce/icons/default');
|
||||
require('tinymce/themes/silver');
|
||||
require('tinymce/skins/ui/oxide/skin.css');
|
||||
require('tinymce/models/dom');
|
||||
require('tinymce/plugins/advlist');
|
||||
require('tinymce/plugins/code');
|
||||
require('tinymce/plugins/emoticons');
|
||||
|
|
@ -48,19 +49,21 @@ export default new Class({
|
|||
|
||||
tinymce.init({
|
||||
target: this.$.htmlEditor
|
||||
,plugins: [
|
||||
"advlist autolink lists link image charmap print preview hr"
|
||||
,"anchor pagebreak searchreplace wordcount visualblocks"
|
||||
,"visualchars code fullscreen insertdatetime media nonbreaking"
|
||||
,"save table directionality emoticons template paste"
|
||||
]
|
||||
,plugins:
|
||||
' advlist autolink lists link image charmap preview'
|
||||
+' anchor pagebreak searchreplace wordcount visualblocks'
|
||||
+' visualchars code fullscreen insertdatetime media nonbreaking'
|
||||
+' save table directionality emoticons template'
|
||||
,toolbar1:
|
||||
" print preview | link image media emoticons blockquote"
|
||||
+" | insertfile undo redo | bold italic"
|
||||
+" | alignleft aligncenter alignright alignjustify"
|
||||
+" | bullist numlist outdent indent"
|
||||
+" | styleselect | fontselect fontsizeselect"
|
||||
+" | forecolor backcolor"
|
||||
' print preview paste'
|
||||
+'|link image media emoticons blockquote hr'
|
||||
+'|insertfile undo redo'
|
||||
+'|bold italic'
|
||||
+'|alignleft aligncenter alignright alignjustify'
|
||||
+'|bullist numlist outdent indent'
|
||||
+'|styleselect'
|
||||
+'|fontselect fontsizeselect'
|
||||
+'|forecolor backcolor '
|
||||
,image_advtab: true
|
||||
,init_instance_callback: this._onEditorInit.bind(this)
|
||||
,skin: false
|
||||
|
|
@ -75,7 +78,7 @@ export default new Class({
|
|||
|
||||
_onEditorInit(editor) {
|
||||
this.editor = editor;
|
||||
editor.getDoc().body.style.fontSize = '1em';
|
||||
editor.getDoc().body.style.fontSize = '1rem';
|
||||
this.setEditorText();
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,32 @@
|
|||
.new .box {
|
||||
.hedera-new {
|
||||
.box {
|
||||
position: relative;
|
||||
}
|
||||
.new .htk-image {
|
||||
}
|
||||
.htk-image {
|
||||
height: 100px;
|
||||
overflow: hidden;
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
.new .htk-image > button {
|
||||
}
|
||||
.htk-image > button {
|
||||
display: block;
|
||||
}
|
||||
.new .htk-image > img {
|
||||
}
|
||||
.htk-image > img {
|
||||
margin-top: -40%;
|
||||
width: 100%;
|
||||
height: initial;
|
||||
}
|
||||
.new .tag-priority {
|
||||
}
|
||||
.tag-priority {
|
||||
display: flex;
|
||||
gap: 16px;
|
||||
}
|
||||
.new .tag-priority > *{
|
||||
}
|
||||
.tag-priority > *{
|
||||
flex: 1;
|
||||
}
|
||||
.new textarea {
|
||||
}
|
||||
textarea {
|
||||
min-height: 500px;
|
||||
}
|
||||
.tox-tinymce {
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
tip="_Accept"
|
||||
on-click="this.onAcceptClick()"/>
|
||||
</div>
|
||||
<div id="form" class="new">
|
||||
<div id="form" class="hedera-new">
|
||||
<div class="box form vn-w-sm">
|
||||
<htk-image
|
||||
form="iter"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
|
||||
.news .item .photo {
|
||||
.hedera-news {
|
||||
.item .photo {
|
||||
height: 80px;
|
||||
width: 80px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
tip="_AddNew"
|
||||
on-click="hash.setAll({form: 'news/new', new: null})"/>
|
||||
</div>
|
||||
<div id="form" class="news">
|
||||
<div id="form" class="hedera-news">
|
||||
<htk-repeater form-id="iter" class="box htk-list vn-w-sm">
|
||||
<db-model property="model" id="news-model" updatable="true">
|
||||
<custom>
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
text-decoration: underline;
|
||||
}
|
||||
input {
|
||||
margin: .3em;
|
||||
margin: 4px;
|
||||
}
|
||||
input[type=text],
|
||||
input[type=password] {
|
||||
margin: 0;
|
||||
padding: 0 5px;
|
||||
width: 100%;
|
||||
height: 2.6em;
|
||||
height: 36px;
|
||||
border-radius: 0;
|
||||
border-top: none;
|
||||
border-left: none;
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
margin: 0;
|
||||
width: initial;
|
||||
height: initial;
|
||||
margin-right: .5em;
|
||||
margin-right: 7px;
|
||||
}
|
||||
input[type=submit],
|
||||
input[type=button],
|
||||
|
|
@ -75,9 +75,9 @@ $login-margin-between: 55px;
|
|||
.version-code {
|
||||
color: red;
|
||||
text-align: right;
|
||||
margin: .2em auto;
|
||||
margin: 3px auto;
|
||||
font-weight: bold;
|
||||
height: 1.4em;
|
||||
height: 20px;
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -128,15 +128,22 @@ $login-margin-between: 55px;
|
|||
position: relative;
|
||||
}
|
||||
.wrapper {
|
||||
width: 0;
|
||||
overflow: visible;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
}
|
||||
._submit {
|
||||
position: relative;
|
||||
}
|
||||
.htk-spinner {
|
||||
margin: .3em 1em;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
margin-top: -12px;
|
||||
right: 24px;
|
||||
|
||||
& > .spinner {
|
||||
border-top-color: white;
|
||||
border-left-color: white;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@
|
|||
</label>
|
||||
</div>
|
||||
<div class="enter">
|
||||
<input id="submit" type="submit" value="_Login"/>
|
||||
<div class="wrapper">
|
||||
<button id="submit" type="submit">
|
||||
<t>Login</t>
|
||||
<htk-spinner id="spinner"/>
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
<div>
|
||||
<a class="button guest" href="#!form=cms/home&guest=true">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
.htk-spinner {
|
||||
width: 1.8em;
|
||||
height: 1.8em;
|
||||
width: 25px;
|
||||
height: 25px;
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{
|
||||
"name": "hedera-web",
|
||||
"version": "22.46.9",
|
||||
"version": "22.46.19",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "hedera-web",
|
||||
"version": "22.46.9",
|
||||
"version": "22.46.19",
|
||||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"js-yaml": "^3.12.1",
|
||||
"mootools": "^1.5.2",
|
||||
"promise-polyfill": "^8.2.3",
|
||||
"require-yaml": "0.0.1",
|
||||
"tinymce": "^5.10.6"
|
||||
"tinymce": "^6.3.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/preset-env": "^7.20.2",
|
||||
|
|
@ -28,6 +28,7 @@
|
|||
"glob": "^8.0.3",
|
||||
"html-webpack-plugin": "^5.5.0",
|
||||
"json-loader": "^0.5.7",
|
||||
"mini-css-extract-plugin": "^2.7.0",
|
||||
"node-sass": "^7.0.1",
|
||||
"raw-loader": "^4.0.2",
|
||||
"sass-loader": "^12.6.0",
|
||||
|
|
@ -6329,6 +6330,72 @@
|
|||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/mini-css-extract-plugin": {
|
||||
"version": "2.7.0",
|
||||
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.0.tgz",
|
||||
"integrity": "sha512-auqtVo8KhTScMsba7MbijqZTfibbXiBNlPAQbsVt7enQfcDYLdgG57eGxMqwVU3mfeWANY4F1wUg+rMF+ycZgw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"schema-utils": "^4.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 12.13.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/webpack"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"webpack": "^5.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/mini-css-extract-plugin/node_modules/ajv": {
|
||||
"version": "8.11.2",
|
||||
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
|
||||
"integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"fast-deep-equal": "^3.1.1",
|
||||
"json-schema-traverse": "^1.0.0",
|
||||
"require-from-string": "^2.0.2",
|
||||
"uri-js": "^4.2.2"
|
||||
},
|
||||
"funding": {
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/epoberezkin"
|
||||
}
|
||||
},
|
||||
"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
|
||||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
|
||||
"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"fast-deep-equal": "^3.1.3"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"ajv": "^8.8.2"
|
||||
}
|
||||
},
|
||||
"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
|
||||
"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@types/json-schema": "^7.0.9",
|
||||
"ajv": "^8.8.0",
|
||||
"ajv-formats": "^2.1.1",
|
||||
"ajv-keywords": "^5.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 12.13.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/webpack"
|
||||
}
|
||||
},
|
||||
"node_modules/minimalistic-assert": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
|
||||
|
|
@ -8881,9 +8948,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"node_modules/tinymce": {
|
||||
"version": "5.10.6",
|
||||
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.10.6.tgz",
|
||||
"integrity": "sha512-bnF2LUoycDsoZZLQBNHbOijrmoJuEeR1rQdqgo4s77BedufpOVnDh00OZKbseHeTMCxhVH05wvOqxLsi6vpeZw=="
|
||||
"version": "6.3.0",
|
||||
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.3.0.tgz",
|
||||
"integrity": "sha512-UeOKdbDbBoAT2A8WQr/D4AqzqPloTY/B/zJXCGlPz5L4YOmwUCqXAFTxN1tkysRq994UIZZUJZezC7WmCDx5ag=="
|
||||
},
|
||||
"node_modules/to-fast-properties": {
|
||||
"version": "2.0.0",
|
||||
|
|
@ -14574,6 +14641,50 @@
|
|||
"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
|
||||
"dev": true
|
||||
},
|
||||
"mini-css-extract-plugin": {
|
||||
"version": "2.7.0",
|
||||
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.0.tgz",
|
||||
"integrity": "sha512-auqtVo8KhTScMsba7MbijqZTfibbXiBNlPAQbsVt7enQfcDYLdgG57eGxMqwVU3mfeWANY4F1wUg+rMF+ycZgw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"schema-utils": "^4.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"ajv": {
|
||||
"version": "8.11.2",
|
||||
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
|
||||
"integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"fast-deep-equal": "^3.1.1",
|
||||
"json-schema-traverse": "^1.0.0",
|
||||
"require-from-string": "^2.0.2",
|
||||
"uri-js": "^4.2.2"
|
||||
}
|
||||
},
|
||||
"ajv-keywords": {
|
||||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
|
||||
"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"fast-deep-equal": "^3.1.3"
|
||||
}
|
||||
},
|
||||
"schema-utils": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
|
||||
"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@types/json-schema": "^7.0.9",
|
||||
"ajv": "^8.8.0",
|
||||
"ajv-formats": "^2.1.1",
|
||||
"ajv-keywords": "^5.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"minimalistic-assert": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
|
||||
|
|
@ -16509,9 +16620,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"tinymce": {
|
||||
"version": "5.10.6",
|
||||
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.10.6.tgz",
|
||||
"integrity": "sha512-bnF2LUoycDsoZZLQBNHbOijrmoJuEeR1rQdqgo4s77BedufpOVnDh00OZKbseHeTMCxhVH05wvOqxLsi6vpeZw=="
|
||||
"version": "6.3.0",
|
||||
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.3.0.tgz",
|
||||
"integrity": "sha512-UeOKdbDbBoAT2A8WQr/D4AqzqPloTY/B/zJXCGlPz5L4YOmwUCqXAFTxN1tkysRq994UIZZUJZezC7WmCDx5ag=="
|
||||
},
|
||||
"to-fast-properties": {
|
||||
"version": "2.0.0",
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
"glob": "^8.0.3",
|
||||
"html-webpack-plugin": "^5.5.0",
|
||||
"json-loader": "^0.5.7",
|
||||
"mini-css-extract-plugin": "^2.7.0",
|
||||
"node-sass": "^7.0.1",
|
||||
"raw-loader": "^4.0.2",
|
||||
"sass-loader": "^12.6.0",
|
||||
|
|
@ -36,7 +37,7 @@
|
|||
"mootools": "^1.5.2",
|
||||
"promise-polyfill": "^8.2.3",
|
||||
"require-yaml": "0.0.1",
|
||||
"tinymce": "^5.10.6"
|
||||
"tinymce": "^6.3.0"
|
||||
},
|
||||
"scripts": {
|
||||
"front": "webpack serve --open",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
const path = require('path');
|
||||
const webpack = require('webpack');
|
||||
const AssetsWebpackPlugin = require('assets-webpack-plugin');
|
||||
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
|
||||
const merge = require('webpack-merge').merge;
|
||||
const wpConfig = require('./webpack.config.json');
|
||||
|
||||
|
|
@ -27,9 +28,17 @@ const baseConfig = {
|
|||
presets: ['@babel/preset-env']
|
||||
}
|
||||
}
|
||||
}, {
|
||||
test: /tinymce\/.*\/skin\.css$/i,
|
||||
use: [MiniCssExtractPlugin.loader, 'css-loader']
|
||||
}, {
|
||||
test: /tinymce\/.*\/content\.css$/i,
|
||||
loader: 'css-loader',
|
||||
options: {esModule: false}
|
||||
}, {
|
||||
test: /\.css$/,
|
||||
use: [/*'style-loader', */'css-loader'],
|
||||
use: ['style-loader', 'css-loader'],
|
||||
exclude: [/node_modules/]
|
||||
}, {
|
||||
test: /\.yml$/,
|
||||
use: ['json-loader', 'yaml-loader']
|
||||
|
|
@ -74,7 +83,8 @@ const baseConfig = {
|
|||
_DEV_MODE: devMode,
|
||||
_DEV_SERVER_PORT: wpConfig.devServerPort,
|
||||
_PUBLIC_PATH: JSON.stringify(publicPath)
|
||||
})
|
||||
}),
|
||||
new MiniCssExtractPlugin()
|
||||
],
|
||||
optimization: {
|
||||
runtimeChunk: true,
|
||||
|
|
|
|||
Loading…
Reference in New Issue