From 6797075461235915e2f4ed0f93051f81054f0e4d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 25 Jun 2020 11:36:35 +0200 Subject: [PATCH 1/4] Fix settings menu Signed-off-by: Thomas Citharel --- js/src/common.scss | 4 + .../components/Settings/SettingMenuItem.vue | 19 +- .../Settings/SettingMenuSection.vue | 28 +- js/src/components/Settings/SettingsMenu.vue | 83 ++- js/src/graphql/user.ts | 1 + js/src/i18n/en_US.json | 3 +- js/src/i18n/fr_FR.json | 3 +- js/src/types/setting-menu.model.ts | 8 - .../views/Account/children/EditIdentity.vue | 129 +++-- js/src/views/Admin/Dashboard.vue | 102 ++-- js/src/views/Admin/Follows.vue | 88 ++-- js/src/views/Admin/Profiles.vue | 138 ++--- js/src/views/Admin/Settings.vue | 488 +++++++++--------- js/src/views/Admin/Users.vue | 154 +++--- js/src/views/Group/GroupMembers.vue | 47 +- js/src/views/Group/Settings.vue | 82 +-- js/src/views/Moderation/Logs.vue | 282 +++++----- js/src/views/Moderation/Report.vue | 395 +++++++------- js/src/views/Moderation/ReportList.vue | 74 +-- js/src/views/Settings.vue | 153 +----- js/src/views/Settings/AccountSettings.vue | 282 +++++----- js/src/views/Settings/Notifications.vue | 12 + js/src/views/Settings/Preferences.vue | 79 +-- 23 files changed, 1363 insertions(+), 1291 deletions(-) delete mode 100644 js/src/types/setting-menu.model.ts diff --git a/js/src/common.scss b/js/src/common.scss index b2aac58d6..0167467e4 100644 --- a/js/src/common.scss +++ b/js/src/common.scss @@ -17,6 +17,10 @@ a { } } +nav.breadcrumb ul li a { + text-decoration: none; +} + input.input { border-color: $input-border-color !important; } diff --git a/js/src/components/Settings/SettingMenuItem.vue b/js/src/components/Settings/SettingMenuItem.vue index f68005fc6..ef61a6afe 100644 --- a/js/src/components/Settings/SettingMenuItem.vue +++ b/js/src/components/Settings/SettingMenuItem.vue @@ -1,24 +1,25 @@ diff --git a/js/src/components/Settings/SettingsMenu.vue b/js/src/components/Settings/SettingsMenu.vue index 419ce3f3b..845d3976a 100644 --- a/js/src/components/Settings/SettingsMenu.vue +++ b/js/src/components/Settings/SettingsMenu.vue @@ -1,27 +1,88 @@