diff --git a/packages/ui-default/components/editor/EditorComponent.jsx b/packages/ui-default/components/editor/EditorComponent.jsx deleted file mode 100644 index baea7a6c2..000000000 --- a/packages/ui-default/components/editor/EditorComponent.jsx +++ /dev/null @@ -1,38 +0,0 @@ -import React from 'react'; -import Vditor from 'vditor'; -import { config } from './index'; - -export default class MarkdownEditor extends React.PureComponent { - constructor(props) { - super(props); - this.ref = React.createRef(); - } - - async componentDidMount() { - await new Promise((resolve) => { - this.editor = new Vditor(this.ref.current, { - ...config, - after: resolve, - input(value) { this.props.onChange(value); }, - cache: { id: Math.random().toString() }, - }); - }); - } - - componentWillUnmount() { - this.editor.destory(); - this.editor.detach(); - } - - value() { - return this.editor.getValue(); - } - - focus() { - return this.editor.focus(); - } - - render() { - return
; - } -} diff --git a/packages/ui-default/misc/structure.styl b/packages/ui-default/misc/structure.styl index 828881a91..f42776c69 100644 --- a/packages/ui-default/misc/structure.styl +++ b/packages/ui-default/misc/structure.styl @@ -16,6 +16,22 @@ .mode--scratchpad .scratchpad--hide display: none +::-webkit-scrollbar + width: 8px; + height: 8px; + +::-webkit-scrollbar-track + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.2); + border-radius: 8px; + +::-webkit-scrollbar-thumb + border-radius: 8px; + background: #bbb; + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.25); + +::-webkit-scrollbar-thumb:window-inactive + background: rgba(0,255,0,0.4); + .main padding: rem(20px 0) flex: 1 diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index ddb2bb88b..a4a1cfbed 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.12.12", + "version": "4.12.13", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/components/home.html b/packages/ui-default/templates/components/home.html index a9d0959ef..cb58e6701 100644 --- a/packages/ui-default/templates/components/home.html +++ b/packages/ui-default/templates/components/home.html @@ -5,15 +5,15 @@ {{ sidemenu.render_item('account--circle', 'user_detail', {uid:handler.user._id}, label='My Profile') }} {{ sidemenu.render_item('comment--multiple', 'home_messages') }} - {{ sidemenu.render_item('web', 'home_settings', {category:'domain'}, label='Domain Settings') }} - {{ sidemenu.render_item('web', 'home_domain', label='My Domains') }} + {{ sidemenu.render_item('web', 'home_settings', {category:'domain'}, label='Domain Settings', menu_item='home_domain') }} + {{ sidemenu.render_item('web', 'home_domain', label='My Domains', memu_item='home_domains') }} {% if handler.user.hasPriv(PRIV.PRIV_CREATE_FILE) %} {{ sidemenu.render_item('file', 'home_files', label='My Files') }} {% endif %} - {{ sidemenu.render_item('wrench', 'home_settings', {category:'account'}, label='Account Settings') }} - {{ sidemenu.render_item('sliders', 'home_settings', {category:'preference'}, label='Preference Settings')}} + {{ sidemenu.render_item('wrench', 'home_settings', {category:'account'}, label='Account Settings', menu_item='home_account') }} + {{ sidemenu.render_item('sliders', 'home_settings', {category:'preference'}, label='Preference Settings', menu_item='home_preference')}} {{ sidemenu.render_item('security', 'home_security') }} diff --git a/packages/ui-default/templates/components/sidemenu.html b/packages/ui-default/templates/components/sidemenu.html index 8a9ebcc64..e077b349d 100644 --- a/packages/ui-default/templates/components/sidemenu.html +++ b/packages/ui-default/templates/components/sidemenu.html @@ -1,6 +1,6 @@ -{% macro render_item(icon_name, page_name, args={}, label=none) %} +{% macro render_item(icon_name, page_name, args={}, label=none, menu_item=none) %} {% set target_url = url(page_name, args) if page_name else '#' %} -