ui: 优化滚动条显示

packages/ui-default/components/editor/EditorComponent.jsx

@@ -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 <div ref={this.ref}></div>;
-  }
-}

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

packages/ui-default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.12.12",
+  "version": "4.12.13",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",

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') }}
     <li class="menu__seperator"></li>
-    {{ sidemenu.render_item('web', 'home_settings', {category:'domain'}, label='Domain Settings') }}
+    {{ sidemenu.render_item('web', 'home_settings', {category:'domain'}, label='Domain Settings', menu_item='home_domain') }}
-    {{ sidemenu.render_item('web', 'home_domain', label='My Domains') }}
+    {{ sidemenu.render_item('web', 'home_domain', label='My Domains', memu_item='home_domains') }}
     {% if handler.user.hasPriv(PRIV.PRIV_CREATE_FILE) %}
       <li class="menu__seperator"></li>
       {{ sidemenu.render_item('file', 'home_files', label='My Files') }}
     {% endif %}
     <li class="menu__seperator"></li>
-    {{ sidemenu.render_item('wrench', 'home_settings', {category:'account'}, label='Account 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')}}
+    {{ sidemenu.render_item('sliders', 'home_settings', {category:'preference'}, label='Preference Settings', menu_item='home_preference')}}
     {{ sidemenu.render_item('security', 'home_security') }}
   </ol>
 </div>

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 '#' %}
-<li class="menu__item" id="menu-item-{{ page_name }}">
+<li class="menu__item" id="menu-item-{{ menu_item|default(page_name) }}">
   <a href="{{ target_url }}" class="menu__link{% if handler.request.path == target_url %} active{% endif %}">
   {% if icon_name %}
     <span class="icon icon-{{ icon_name }}"></span>

packages/ui-default/templates/partials/setting.html

@@ -1,5 +1,5 @@
 <form method="post">
-{%- for family, family_settings in settings|groupby('family') -%}
+{%- for family, family_settings in settings|groupby('family') -%}{%- if family != 'setting_storage' %}
   <div class="section__header">
     <h1 class="section__title" id="{{ family }}" data-heading>{{ _(family) }}</h1>
   </div>
@@ -83,7 +83,7 @@
   {% endif %}
   {%- endfor -%}
   </div>
-{%- endfor -%}
+{%- endif -%}{%- endfor -%}
   <div class="section__body">
     <input type="hidden" name="csrfToken" value="{{ handler.csrfToken }}">
     <input type="submit" class="rounded primary button" value="{{ _('Save All Changes') }}">