diff --git a/Readme.md b/Readme.md index 7bd1b62a4..69481fa7b 100644 --- a/Readme.md +++ b/Readme.md @@ -29,7 +29,7 @@ Using npm: npm install dao-style --save ``` -Using a script tag for global use: +Using html tag: ```html diff --git a/examples/plugins/codemirror/index.js b/examples/plugins/codemirror/index.js index f013ba2bd..591e49074 100644 --- a/examples/plugins/codemirror/index.js +++ b/examples/plugins/codemirror/index.js @@ -3,6 +3,7 @@ import VueCodemirror from 'vue-codemirror'; /* eslint-disable */ import 'codemirror/mode/vue/vue'; import 'codemirror/mode/javascript/javascript'; +import 'codemirror/mode/css/css'; import 'codemirror/lib/codemirror.css'; import 'codemirror/theme/monokai.css'; diff --git a/examples/plugins/i18n/en.js b/examples/plugins/i18n/en.js index 8953a1ef4..d3762e6eb 100644 --- a/examples/plugins/i18n/en.js +++ b/examples/plugins/i18n/en.js @@ -47,11 +47,16 @@ export default { method_name: 'Method Name', event_name: 'Event Name', slot_name: 'Slot Name', - show_more: 'Show More', + show_more: 'Load More...', index: { desc: 'A high quality UI Toolkit built on Vue.js.', cr: 'Build and Maintained Open‑Source by {company}', }, + installationPage: { + use_npm: 'Using npm', + use_html: 'Using HTML tag', + usage: 'Usage', + }, status: { component: 'Component', available: 'Available', diff --git a/examples/plugins/i18n/zh.js b/examples/plugins/i18n/zh.js index 3d15b00b6..ab38ab213 100644 --- a/examples/plugins/i18n/zh.js +++ b/examples/plugins/i18n/zh.js @@ -27,7 +27,7 @@ export default { steps: 'Steps 步骤条', svg: 'Svg 图标', 'editable-list': 'Editable List 可编辑列表', - switch: 'Switch 开光', + switch: 'Switch 开关', tab: 'Tab 标签页', table: 'Table 表格', tooltip: 'Tooltip 提示', @@ -47,11 +47,16 @@ export default { method_name: '方法名', event_name: '事件名', slot_name: '插槽名', - show_more: '查看更多', + show_more: '加载更多...', index: { desc: '基于 Vue.js 构建的高质量 UI 工具包', cr: '由 {company} 打造和维护', }, + installationPage: { + use_npm: '使用 npm 安装', + use_html: '使用 HTML 标签引入', + usage: '使用', + }, status: { component: '组件', available: '可用', diff --git a/examples/view/components/code-block/index.vue b/examples/view/components/code-block/index.vue index 438adc5fc..d6f5322d5 100644 --- a/examples/view/components/code-block/index.vue +++ b/examples/view/components/code-block/index.vue @@ -44,6 +44,9 @@ export default { case 'javascript': o.mode = 'text/javascript'; break; + case 'scss': + o.mode = 'text/css'; + break; default: o.mode = 'text/x-vue'; break; @@ -66,7 +69,7 @@ export default { .code-block{ .CodeMirror{ height: auto; - padding: 10px 20px; + padding: 6px 20px; } .CodeMirror-line { font-family: SF Mono,Monaco,Inconsolata,Fira Mono,Droid Sans Mono,Source Code Pro,monospace !important; diff --git a/examples/view/components/docs-section/index.vue b/examples/view/components/docs-section/index.vue index 1311e8974..7fb1b36a9 100644 --- a/examples/view/components/docs-section/index.vue +++ b/examples/view/components/docs-section/index.vue @@ -28,6 +28,7 @@ export default { } &>.content{ padding: 20px 0; + overflow: auto; } } diff --git a/examples/view/components/docs-table/index.vue b/examples/view/components/docs-table/index.vue index 90588f055..f77e50672 100644 --- a/examples/view/components/docs-table/index.vue +++ b/examples/view/components/docs-table/index.vue @@ -14,26 +14,26 @@
@@ -59,8 +59,8 @@
+ |
- @function generate-color($base-color, $level) { - @if $level == -3 { - @return desaturate(lighten($base-color, 36), 15); - } @else if $level == -2 { - @return desaturate(lighten($base-color, 25), 25); - } @else if $level == -1 { - @return lighten($base-color, 4); - } @else if $level == 1 { - @return desaturate(darken($base-color, 7), 11); - } @else if $level == 2 { - @return desaturate(darken($base-color, 13), 7); - } @else if $level == 3 { - @return desaturate(darken($base-color, 19), 9); - } @else { - @return $base-color; - } - }