diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index 80ca7658..7fe21cf9 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -8,10 +8,9 @@ - - - Цвет - + +
Цвет
+ {{ textColor }} @@ -24,21 +23,32 @@
- - Шрифт +
Шрифт
+ + + + + + + + + + + + + + + +
- - Текст - +
Текст
- - Строка статуса - +
Строка статуса
@@ -183,6 +193,7 @@ class SettingsPage extends Vue { .el-form { border-top: 2px solid #bbbbbb; + margin-bottom: 15px; } .el-form-item { @@ -194,6 +205,11 @@ class SettingsPage extends Vue { .color-picked { margin-left: 10px; position: relative; - top: -9px; + top: -11px; +} + +.partHeader { + font-weight: bold; + margin-bottom: 5px; } \ No newline at end of file diff --git a/client/element.js b/client/element.js index 7510923a..6f18602e 100644 --- a/client/element.js +++ b/client/element.js @@ -35,6 +35,9 @@ import './theme/tab-pane.css'; import ElTooltip from 'element-ui/lib/tooltip'; import './theme/tooltip.css'; +import ElCol from 'element-ui/lib/col'; +import './theme/col.css'; + import ElContainer from 'element-ui/lib/container'; import './theme/container.css'; @@ -50,6 +53,15 @@ import './theme/main.css'; import ElInput from 'element-ui/lib/input'; import './theme/input.css'; +import ElInputNumber from 'element-ui/lib/input-number'; +import './theme/input-number.css'; + +import ElSelect from 'element-ui/lib/select'; +import './theme/select.css'; + +import ElOption from 'element-ui/lib/option'; +import './theme/option.css'; + import ElTable from 'element-ui/lib/table'; import './theme/table.css'; @@ -82,8 +94,8 @@ import './theme/message-box.css'; const components = { ElMenu, ElMenuItem, ElButton, ElCheckbox, ElTabs, ElTabPane, ElTooltip, - ElContainer, ElAside, ElMain, ElHeader, - ElInput, ElTable, ElTableColumn, + ElCol, ElContainer, ElAside, ElMain, ElHeader, + ElInput, ElInputNumber, ElSelect, ElOption, ElTable, ElTableColumn, ElProgress, ElSlider, ElForm, ElFormItem, ElColorPicker, };