diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afab5c818..06eba8c3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,6 +39,7 @@ lint: - cd js - yarn install #- yarn run lint || export EXITVALUE=1 + - yarn run prettier -c . - yarn run build - cd ../ - exit $EXITVALUE diff --git a/js/.eslintrc.js b/js/.eslintrc.js index 08bd69d4c..0a836b8c7 100644 --- a/js/.eslintrc.js +++ b/js/.eslintrc.js @@ -50,10 +50,12 @@ module.exports = { ignorePatterns: ["src/typings/*.d.ts", "vue.config.js"], - overrides: [{ - files: ["**/__tests__/*.{j,t}s?(x)", "**/tests/unit/**/*.spec.{j,t}s?(x)"], - env: { - mocha: true, + overrides: [ + { + files: ["**/__tests__/*.{j,t}s?(x)", "**/tests/unit/**/*.spec.{j,t}s?(x)"], + env: { + mocha: true, + }, }, - }], + ], }; diff --git a/js/cypress.json b/js/cypress.json index 88838d668..17b7cd741 100644 --- a/js/cypress.json +++ b/js/cypress.json @@ -4,4 +4,4 @@ "baseUrl": "http://localhost:4000", "viewportWidth": 1920, "viewportHeight": 1080 -} \ No newline at end of file +} diff --git a/js/public/index.html b/js/public/index.html index 19244db53..6535abfcd 100644 --- a/js/public/index.html +++ b/js/public/index.html @@ -1,22 +1,22 @@ + + + + + + + - - - - - - - - - - -
- - - - \ No newline at end of file + + +
+ + + diff --git a/js/src/common.scss b/js/src/common.scss index b2aac58d6..373e1d810 100644 --- a/js/src/common.scss +++ b/js/src/common.scss @@ -1,6 +1,6 @@ a { text-decoration: underline; - text-decoration-color: #ED8D07; + text-decoration-color: #ed8d07; text-decoration-thickness: 2px; &.navbar-item, @@ -17,6 +17,10 @@ a { } } +nav.breadcrumb ul li a { + text-decoration: none; +} + input.input { border-color: $input-border-color !important; } @@ -49,4 +53,4 @@ $color-black: #000; .mention .mention { background: initial; margin-right: 0; -} \ No newline at end of file +} 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 @@