From 8244287a649af4976bfab99781498bdcf183b33f Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Mon, 24 Jan 2022 14:13:17 +0000 Subject: [PATCH] FIX: inability to scroll modals on dark theme What. The. Hell. --- RIGS/views/rigboard.py | 9 +++-- package-lock.json | 35 ++++++++++++-------- package.json | 2 +- pipeline/source_assets/scss/dark_screen.scss | 3 ++ pipeline/source_assets/scss/screen.scss | 4 --- 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/RIGS/views/rigboard.py b/RIGS/views/rigboard.py index 63138555..709fb1f8 100644 --- a/RIGS/views/rigboard.py +++ b/RIGS/views/rigboard.py @@ -27,7 +27,7 @@ from django.views import generic from z3c.rml import rml2pdf from PyRIGS import decorators -from PyRIGS.views import OEmbedView, is_ajax +from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin from RIGS import models, forms __author__ = 'ghost' @@ -53,10 +53,11 @@ class WebCalendar(generic.TemplateView): context = super().get_context_data(**kwargs) context['view'] = kwargs.get('view', '') context['date'] = kwargs.get('date', '') + # context['page_title'] = "Calendar" return context -class EventDetail(generic.DetailView): +class EventDetail(generic.DetailView, ModalURLMixin): template_name = 'event_detail.html' model = models.Event @@ -66,6 +67,10 @@ class EventDetail(generic.DetailView): if self.object.dry_hire: title += " Dry Hire" context['page_title'] = title + if is_ajax(self.request): + context['override'] = "base_ajax.html" + else: + context['override'] = 'base_assets.html' return context diff --git a/package-lock.json b/package-lock.json index 5e793942..41da14d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "ajax-bootstrap-select": "^1.4.5", "autocompleter": "^6.1.2", "autoprefixer": "^10.4.0", - "bootstrap": "^4.5.2", + "bootstrap": "^4.6.1", "bootstrap-select": "^1.13.17", "clipboard": "^2.0.8", "cssnano": "^5.0.13", @@ -957,9 +957,17 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "node_modules/bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==" + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.1.tgz", + "integrity": "sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + }, + "peerDependencies": { + "jquery": "1.9.1 - 3", + "popper.js": "^1.16.1" + } }, "node_modules/bootstrap-select": { "version": "1.13.18", @@ -5492,9 +5500,9 @@ "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" }, "node_modules/nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -9701,9 +9709,10 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==" + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.1.tgz", + "integrity": "sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==", + "requires": {} }, "bootstrap-select": { "version": "1.13.18", @@ -13422,9 +13431,9 @@ "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" }, "nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==" }, "nanomatch": { "version": "1.2.13", diff --git a/package.json b/package.json index a2fc4772..f8eee687 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "ajax-bootstrap-select": "^1.4.5", "autocompleter": "^6.1.2", "autoprefixer": "^10.4.0", - "bootstrap": "^4.5.2", + "bootstrap": "^4.6.1", "bootstrap-select": "^1.13.17", "clipboard": "^2.0.8", "cssnano": "^5.0.13", diff --git a/pipeline/source_assets/scss/dark_screen.scss b/pipeline/source_assets/scss/dark_screen.scss index 0398e92a..29361c57 100644 --- a/pipeline/source_assets/scss/dark_screen.scss +++ b/pipeline/source_assets/scss/dark_screen.scss @@ -153,4 +153,7 @@ .CodeMirror-cursor { border-color: white !important; } + .modal { + overflow-y: auto !important; //Bootstrap Dark Theme overrides this to none for some insane reason so we need to change it back + } } diff --git a/pipeline/source_assets/scss/screen.scss b/pipeline/source_assets/scss/screen.scss index a92f4428..80466183 100644 --- a/pipeline/source_assets/scss/screen.scss +++ b/pipeline/source_assets/scss/screen.scss @@ -116,10 +116,6 @@ textarea { hyphens: auto; } -.modal-dialog { - z-index: inherit; // bug fix introduced in 52682ce -} - del { background-color: #f2dede; border-radius: 3px;