diff options
| author | Joas Schilling <coding@schilljs.com> | 2022-07-12 13:12:50 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2022-07-12 13:12:50 +0300 |
| commit | 6bb4f3ee7ef4da272a44f25c1221b82b43ae5ff7 (patch) | |
| tree | 5acae3e6a4913b56b356f645247ceb3346bb21f3 | |
| parent | b7aeb333ac083721b2ebff40c5c06c852e8dfb05 (diff) | |
Move app.scss into App.vuebugfix/7373/remove-app.scss
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | css/app.scss | 10 | ||||
| -rw-r--r-- | css/merged.scss | 1 | ||||
| -rw-r--r-- | src/App.vue | 16 |
3 files changed, 13 insertions, 14 deletions
diff --git a/css/app.scss b/css/app.scss deleted file mode 100644 index bfb367665..000000000 --- a/css/app.scss +++ /dev/null @@ -1,10 +0,0 @@ -// Rules for the App.css entry point - -body { - overflow: hidden; -} - -/* FIXME: remove after https://github.com/nextcloud/nextcloud-vue/issues/2097 is solved */ -.mx-datepicker-main.mx-datepicker-popup { - z-index: 10001 !important; -} diff --git a/css/merged.scss b/css/merged.scss index e382a76cb..4b60b1274 100644 --- a/css/merged.scss +++ b/css/merged.scss @@ -1,2 +1 @@ @import './icons'; -@import './app'; diff --git a/src/App.vue b/src/App.vue index 94d0f8dac..97861b2da 100644 --- a/src/App.vue +++ b/src/App.vue @@ -493,10 +493,20 @@ export default { </script> <style lang="scss"> -/** override toastify position due to top bar */ -body.has-topbar .toastify-top { - margin-top: 105px; +body { + overflow: hidden; + + /** override toastify position due to top bar */ + &.has-topbar .toastify-top { + margin-top: 105px; + } } + +/* FIXME: remove after https://github.com/nextcloud/nextcloud-vue/issues/2097 is solved */ +.mx-datepicker-main.mx-datepicker-popup { + z-index: 10001 !important; +} + </style> <style lang="scss" scoped> |