diff --git a/client/components/Reader/SettingsPage/include/ButtonsTab.inc b/client/components/Reader/SettingsPage/ButtonsTab.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/ButtonsTab.inc rename to client/components/Reader/SettingsPage/ButtonsTab.inc diff --git a/client/components/Reader/SettingsPage/include/ConvertTab.inc b/client/components/Reader/SettingsPage/ConvertTab.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/ConvertTab.inc rename to client/components/Reader/SettingsPage/ConvertTab.inc diff --git a/client/components/Reader/SettingsPage/include/KeysTab.inc b/client/components/Reader/SettingsPage/KeysTab.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/KeysTab.inc rename to client/components/Reader/SettingsPage/KeysTab.inc diff --git a/client/components/Reader/SettingsPage/include/OthersTab.inc b/client/components/Reader/SettingsPage/OthersTab.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/OthersTab.inc rename to client/components/Reader/SettingsPage/OthersTab.inc diff --git a/client/components/Reader/SettingsPage/include/PageMoveTab.inc b/client/components/Reader/SettingsPage/PageMoveTab.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/PageMoveTab.inc rename to client/components/Reader/SettingsPage/PageMoveTab.inc diff --git a/client/components/Reader/SettingsPage/include/ProfilesTab.inc b/client/components/Reader/SettingsPage/ProfilesTab.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/ProfilesTab.inc rename to client/components/Reader/SettingsPage/ProfilesTab.inc diff --git a/client/components/Reader/SettingsPage/include/ResetTab.inc b/client/components/Reader/SettingsPage/ResetTab.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/ResetTab.inc rename to client/components/Reader/SettingsPage/ResetTab.inc diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index a88515f3..2cb0dc21 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -37,35 +37,73 @@
- @@include('./include/ProfilesTab.inc'); + @@include('./ProfilesTab.inc');
- @@include('./include/ViewTab.inc'); + + + + + + + + +
+ +
+
+ @@include('./ViewTab/Mode.inc'); +
+ +
+ @@include('./ViewTab/Color.inc'); +
+ +
+ @@include('./ViewTab/Font.inc'); +
+ +
+ @@include('./ViewTab/Text.inc'); +
+ +
+ @@include('./ViewTab/Status.inc'); +
+
- @@include('./include/ButtonsTab.inc'); + @@include('./ButtonsTab.inc');
- @@include('./include/KeysTab.inc'); + @@include('./KeysTab.inc');
- @@include('./include/PageMoveTab.inc'); + @@include('./PageMoveTab.inc');
- @@include('./include/ConvertTab.inc'); + @@include('./ConvertTab.inc');
- @@include('./include/OthersTab.inc'); + @@include('./OthersTab.inc');
- @@include('./include/ResetTab.inc'); + @@include('./ResetTab.inc');
diff --git a/client/components/Reader/SettingsPage/ViewTab/Color.inc b/client/components/Reader/SettingsPage/ViewTab/Color.inc new file mode 100644 index 00000000..b1d7b279 --- /dev/null +++ b/client/components/Reader/SettingsPage/ViewTab/Color.inc @@ -0,0 +1,116 @@ + + + +
+
+ Текст +
+
+ + + +
+
+ +
+
+
+ Фон +
+
+ + + +
+
+ +
+
+
+ Обои +
+
+ + + + + + +
+ + + Добавить файл обоев + + + + + Удалить выбранные обои + + +
+
+ +
+
+
+
+ +
+
+ + diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Font.inc b/client/components/Reader/SettingsPage/ViewTab/Font.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/ViewTab/Font.inc rename to client/components/Reader/SettingsPage/ViewTab/Font.inc diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Mode.inc b/client/components/Reader/SettingsPage/ViewTab/Mode.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/ViewTab/Mode.inc rename to client/components/Reader/SettingsPage/ViewTab/Mode.inc diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Status.inc b/client/components/Reader/SettingsPage/ViewTab/Status.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/ViewTab/Status.inc rename to client/components/Reader/SettingsPage/ViewTab/Status.inc diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Text.inc b/client/components/Reader/SettingsPage/ViewTab/Text.inc similarity index 100% rename from client/components/Reader/SettingsPage/include/ViewTab/Text.inc rename to client/components/Reader/SettingsPage/ViewTab/Text.inc diff --git a/client/components/Reader/SettingsPage/include/ViewTab.inc b/client/components/Reader/SettingsPage/include/ViewTab.inc deleted file mode 100644 index 08a76b68..00000000 --- a/client/components/Reader/SettingsPage/include/ViewTab.inc +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - -
- -
-
- @@include('./ViewTab/Mode.inc'); -
- -
- @@include('./ViewTab/Color.inc'); -
- -
- @@include('./ViewTab/Font.inc'); -
- -
- @@include('./ViewTab/Text.inc'); -
- -
- @@include('./ViewTab/Status.inc'); -
-
\ No newline at end of file diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Color.inc b/client/components/Reader/SettingsPage/include/ViewTab/Color.inc deleted file mode 100644 index 934df86b..00000000 --- a/client/components/Reader/SettingsPage/include/ViewTab/Color.inc +++ /dev/null @@ -1,95 +0,0 @@ - - - -
-
Текст
-
- - - -
-
- -
-
-
Фон
-
- - - -
-
- -
-
-
Обои
-
- - - - - - -
- - Добавить файл обоев - - - Удалить выбранные обои - -
-
- -
-
-
-
- -
-
- -