diff --git a/scipost_django/journals/templates/journals/base.html b/scipost_django/journals/templates/journals/base.html
index 4aa6045677136c27e31cae96fca8f706c9c97b16..06713fd48ce7e7c39917f6a9dc8cd87d04f302aa 100644
--- a/scipost_django/journals/templates/journals/base.html
+++ b/scipost_django/journals/templates/journals/base.html
@@ -10,7 +10,6 @@
{% block meta_description %}{{ block.super }} Journals{% endblock meta_description %}
{% block pagetitle %}: {{ journal }}{% endblock pagetitle %}
-{% block body_class %}{{ block.super }} journals{% endblock %}
{% block breadcrumb %}
<div class="breadcrumb-container">
diff --git a/scipost_django/scipost/static/scipost/assets/config/preconfig.scss b/scipost_django/scipost/static/scipost/assets/config/preconfig.scss
index be0be842b16a0dd10e2a6cb6a4ac9a16e6731419..f1ad8374fa3b289e8d7e23d7818b7f96c5188aed 100644
--- a/scipost_django/scipost/static/scipost/assets/config/preconfig.scss
+++ b/scipost_django/scipost/static/scipost/assets/config/preconfig.scss
@@ -83,8 +83,6 @@ $breadcrumb-divider-color: $scipost-orange;
//
$dropdown-border-radius: $border-radius-base;
$dropdown-border-color: $scipost-darkblue;
-$dropdown-item-padding-y: 0.35rem;
-$dropdown-item-padding-x: 1.0rem;
// Forms
//
@@ -116,7 +114,6 @@ $list-group-active-border-color: $scipost-lightestblue;
//
$font-family-sans-serif: 'Merriweather Sans', "Helvetica Neue", Arial, sans-serif;
$headings-font-family: $font-family-sans-serif;
-// $headings-line-height: $line-height-lg;
$font-family-serif: $font-family-sans-serif;
$font-family-monospace: $font-family-sans-serif;
$font-family-base: $font-family-sans-serif;
diff --git a/scipost_django/scipost/static/scipost/assets/css/_general.scss b/scipost_django/scipost/static/scipost/assets/css/_general.scss
index bf2df13c5fa5f6a8fba05ca3055ca37052c3211a..7563de47514eaa67bc5754d355678e7227578694 100644
--- a/scipost_django/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost_django/scipost/static/scipost/assets/css/_general.scss
@@ -276,18 +276,3 @@ header {
background-color: #f9f9f9 !important;
}
}
-
-@media screen and (min-width: 992px) {
- .backdrop {
- position: absolute;
- left: 0;
- top: 0;
- z-index: 20;
- width: 100%;
- height: 100%;
- background-color: #000;
- opacity: 0.3;
- display: none;
- cursor: pointer;
- }
-}
diff --git a/scipost_django/scipost/static/scipost/assets/css/_homepage.scss b/scipost_django/scipost/static/scipost/assets/css/_homepage.scss
index 027aa7066b4a78a0f311c60c0d7e0a98dc3d954d..1cc79f86191bd01c6a958b8a40e9456925b713c9 100644
--- a/scipost_django/scipost/static/scipost/assets/css/_homepage.scss
+++ b/scipost_django/scipost/static/scipost/assets/css/_homepage.scss
@@ -220,47 +220,3 @@
}
}
-
-#portal-tablist {
-
- background-color: $scipost-blue50;
- list-style: none;
- padding: 0;// 0 4px 0;
- margin: 0;
-
- li button, li a {
- border: 2px solid $scipost-blue50;
- color: #eee;
- font-size: 0.8rem;
- font-weight: 800;
- display: inline-block;
- // background-color: #d3e3f6;
- padding: 5px 15px;
- margin-right: 8px;
- margin-top: 0.2rem;
- margin-bottom: 0.2rem;
- //margin-bottom: 8px;
- border-radius: 4px;
- cursor: pointer;
- transition: 100ms;
- }
-
- li button.active {
- background-color: $scipost-darkblue;
- //color: black;
- text-decoration: underline;
- }
-
- li button:hover, li a:hover {
- //background-color: $scipost-lightestblue;//#b8c8db;
- border: 2px solid $scipost-darkblue;
- //color: black;
- text-decoration: underline;
- }
-
- // li button.active:hover {
- // background-color: $scipost-lightestblue;
- // color: black;
- // }
-
-}
diff --git a/scipost_django/scipost/static/scipost/assets/css/_navbar.scss b/scipost_django/scipost/static/scipost/assets/css/_navbar.scss
index 08988f19ad15809f9dc4050804909c386b8c68b5..b5b04373b461345081345dbb713d2081e75d62ce 100644
--- a/scipost_django/scipost/static/scipost/assets/css/_navbar.scss
+++ b/scipost_django/scipost/static/scipost/assets/css/_navbar.scss
@@ -53,9 +53,9 @@
.dropdown-menu {
min-width: 255px;
padding: 0.45rem 0.75rem;
- background: $white;
- color: $scipost-darkblue;
- border-color: #e0e0e0;
+ background: $scipost-blue50;
+ color: $white;
+ //border-color: #e0e0e0;
top: 36px;
box-shadow: 0px 1px 2px 0px #e0e0e0;
@@ -69,9 +69,9 @@
.dropdown-item {
background-color: transparent;
- padding: 0.5rem 0.625rem;
+ //padding: 0.5rem 0.625rem;
line-height: 1.5;
- color: $scipost-darkblue;
+ //color: $scipost-darkblue;
white-space: normal;
a {
@@ -132,8 +132,8 @@
}
.dropdown-menu {
- background: #7a94c5;
- border: 0;
+ background: $scipost-blue50;//#7a94c5;
+ border: 2px solid $scipost-darkblue;
box-shadow: none;
padding: 0.75rem 0 !important;
margin: 0;
@@ -149,7 +149,7 @@
}
.dropdown-item {
- padding-top: 0.75rem 0.625rem;
+ //padding-top: 0.75rem 0.625rem;
white-space: normal;
}
@@ -270,3 +270,41 @@ header .nav-item {
}
}
}
+
+#portal-tablist {
+
+ background-color: $scipost-blue50;
+ list-style: none;
+ padding: 0;// 0 4px 0;
+ margin: 0;
+
+ li button, li a {
+ border: 2px solid $scipost-blue50;
+ color: #eee;
+ font-size: 0.8rem;
+ font-weight: 800;
+ display: inline-block;
+ // background-color: #d3e3f6;
+ padding: 5px 15px;
+ margin-right: 8px;
+ margin-top: 0.2rem;
+ margin-bottom: 0.2rem;
+ //margin-bottom: 8px;
+ border-radius: 4px;
+ cursor: pointer;
+ transition: 100ms;
+ }
+
+ li button.active {
+ background-color: $scipost-darkblue;
+ //color: black;
+ text-decoration: underline;
+ }
+
+ li button:hover, li a:hover {
+ //background-color: $scipost-lightestblue;//#b8c8db;
+ border: 2px solid $scipost-darkblue;
+ //color: black;
+ text-decoration: underline;
+ }
+}
diff --git a/scipost_django/scipost/static/scipost/assets/js/scripts.js b/scipost_django/scipost/static/scipost/assets/js/scripts.js
index 254e2f21398841cf5621b439d935f2aa65902888..20139b174328aed318cd1fa19375552409f44a35 100644
--- a/scipost_django/scipost/static/scipost/assets/js/scripts.js
+++ b/scipost_django/scipost/static/scipost/assets/js/scripts.js
@@ -142,13 +142,4 @@ $(function(){
})
$('[data-bs-toggle="tab"][data-sp-autoload="true"]').tab('show');
-
- // Backdrop for main nav dropdowns.
- $('#main-navbar .dropdown').on('shown.bs.dropdown', function () {
- $('.backdrop').show();
- })
- $('#main-navbar .dropdown').on('hide.bs.dropdown hidden.bs.dropdown ', function () {
- $('#backdrop').hide();
- })
-
});
diff --git a/scipost_django/scipost/templates/scipost/navbar.html b/scipost_django/scipost/templates/scipost/navbar.html
index 915bd29fcc8b61d02d4d831bb1cc436116e0e3f4..9a335f3225c6ad1ffc3aa390e6b72a4e43dfbbe2 100644
--- a/scipost_django/scipost/templates/scipost/navbar.html
+++ b/scipost_django/scipost/templates/scipost/navbar.html
@@ -132,7 +132,7 @@
</li>
{% if user.is_authenticated %}
- <li class="nav-item dropdown me-lg-2 ms-lg-auto">
+ <li class="nav-item dropdown mx-2 mx-lg-auto">
<a class="nav-link dropdown-toggle" href="#" id="PersonalDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-trigger="hover">
Logged in as {% if user.last_name %}{% if user.contributor %}{{ user.contributor.profile.get_title_display }} {% endif %}{{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %}</a>
@@ -178,7 +178,7 @@
<a href="{% url 'helpdesk:ticket_create' %}" target="_blank" class="nav-link"><span style="font-size: 80%;" data-bs-toggle="tooltip" data-bs-html="true" title="Notice something wrong?<br/>Open a support ticket">{% include 'bi/sticky-fill.html' %}</span></a>
</li>
{% else %}
- <li class="me-lg-2 ms-lg-auto nav-item{% if request.path == '/login/' %} active{% endif %}">
+ <li class="mx-2 mx-lg-auto nav-item{% if request.path == '/login/' %} active{% endif %}">
<a class="nav-link" href="{% url 'scipost:login' %}?next={{request.path}}">Login or register</a>
</li>
{% endif %}
diff --git a/scipost_django/scipost/templates/scipost/portal/portal.html b/scipost_django/scipost/templates/scipost/portal/portal.html
index f324a0169b64b04ca337ff6be6777be5333e35cb..c48e1bc8f3c87728fd1cb56f78da504de4726925 100644
--- a/scipost_django/scipost/templates/scipost/portal/portal.html
+++ b/scipost_django/scipost/templates/scipost/portal/portal.html
@@ -12,7 +12,7 @@
{% block body_class %}{{ block.super }} homepage home-alt{% endblock %}
{% block meta_description %}{{ block.super }} homepage{% endblock meta_description %}
-{% block pagetitle %}Homepage{% endblock pagetitle %}
+{% block pagetitle %} Homepage{% endblock pagetitle %}
{% block content %}
diff --git a/scipost_django/scipost/templatetags/scipost_extras.py b/scipost_django/scipost/templatetags/scipost_extras.py
index 289ef4adab804e7ed0482d21416356488f192fe2..6526c2a83e269b544dbe8db042cbe084c29fcc33 100644
--- a/scipost_django/scipost/templatetags/scipost_extras.py
+++ b/scipost_django/scipost/templatetags/scipost_extras.py
@@ -76,7 +76,7 @@ def increment_dt(dt):
return random.randint(delta, int(1.25*delta))
except:
pass
- return random.randint(4, 8)
+ return random.randint(8, 12)
#######################