aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--middleware/ignismiddleware.py4
-rw-r--r--static/css/styles.css11
2 files changed, 13 insertions, 2 deletions
diff --git a/middleware/ignismiddleware.py b/middleware/ignismiddleware.py
index 2b51a740..85c2c0e2 100644
--- a/middleware/ignismiddleware.py
+++ b/middleware/ignismiddleware.py
@@ -25,8 +25,8 @@ class IgnisMiddleware(MiddlewareMixin):
def __call__(self, request):
response = self.get_response(request)
- # id request is from localhost, do not process
- if re.match(r"^localhost", request.get_host()):
+ # id request is from localhost or 127.0.0.1, do not process
+ if re.match(r"^localhost", request.get_host()) or re.match(r"^127.0.0.1", request.get_host()):
return response
# Do not process non-HTML responses
diff --git a/static/css/styles.css b/static/css/styles.css
index 0c6235dd..fe2ecf7c 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -15,10 +15,13 @@ body {
}
.skiptranslate {
+<<<<<<< HEAD
visibility: hidden !important;
}
.skiptranslate > iframe {
+=======
+>>>>>>> 164950f013807651da5dca224a70fadef6986953
display: none !important;
}
@@ -295,7 +298,15 @@ blockquote {
box-sizing: border-box;
border-radius: 8px;
text-align: left !important;
+<<<<<<< HEAD
overflow-x: scroll;
+=======
+ overflow-x: auto;
+
+ // Custom Horizontal Scrollbar
+ scrollbar-width: thin;
+ scrollbar-color: #311b4f #311b4f26;
+>>>>>>> 164950f013807651da5dca224a70fadef6986953
}
.comment {