diff --git a/journals/templates/journals/_base.html b/journals/templates/journals/_base.html
index 59bbc2287f5c6e5678c2f371db49681158011d19..8a2320a0397a6418f89ab15920564373ab9c8f67 100644
--- a/journals/templates/journals/_base.html
+++ b/journals/templates/journals/_base.html
@@ -17,8 +17,8 @@
</div>
{% endblock %}
-{% block secondary_navbar %}
-<div class="container mt-3">
+
+{% block content %}
<div class="row">
<div class="col-12 journal-head">
<h1 class="banner"><a href="{{ journal.get_absolute_url }}">{{journal}}</a></h1>
@@ -33,17 +33,6 @@
</ul>
</div>
</div>
-</div>
-{% endblock secondary_navbar %}
-
-
-{% block content %}
- <div class="row">
- <div class="col-12">
- <h2 class="{% block header_text_class %}highlight-empty text-blue m-0 py-2 px-0{% endblock %}">{{header_text}}</h2>
- {% block journal_header_block %}{% endblock %}
- </div>
- </div>
{% endblock %}
{% block secondary_footer %}
diff --git a/journals/templates/journals/_publication_card_content.html b/journals/templates/journals/_publication_card_content.html
index b18c2eff801ff3d451803edebaf9e1a39b8ae0c4..8cbbaa9667c7b485f45125c8c8c0b5de9344d451 100644
--- a/journals/templates/journals/_publication_card_content.html
+++ b/journals/templates/journals/_publication_card_content.html
@@ -1,5 +1,5 @@
<div class="card-header">
- <h3 class="py-0"><a href="{{publication.get_absolute_url}}">{{ publication.title }}</a></h3>
+ <h3 class="my-0"><a href="{{publication.get_absolute_url}}">{{ publication.title }}</a></h3>
</div>
<div class="card-body publication-{{publication.id}}">
<div class="row justify-content-between mb-0">
diff --git a/journals/templates/journals/journal_landing_page.html b/journals/templates/journals/journal_landing_page.html
index efa2600875e1d6977f687bed15ef316869d1a33a..ad5f593fdfb6d0b07d637160e679a4f41e05e72d 100644
--- a/journals/templates/journals/journal_landing_page.html
+++ b/journals/templates/journals/journal_landing_page.html
@@ -8,6 +8,7 @@
{% endblock %}
{% block content %}
+{{ block.super }}
<div class="row">
<div class="col-12">
<ul class="nav nav-tabs" id="journals-about-tab" role="tablist">
diff --git a/journals/templates/journals/publication_list.html b/journals/templates/journals/publication_list.html
index c57705078285e0cc593ed42217f58ccf109d555b..290047d6dc705e781843d418cc6d92a1e17790f6 100644
--- a/journals/templates/journals/publication_list.html
+++ b/journals/templates/journals/publication_list.html
@@ -20,7 +20,7 @@
<div class="row">
<div class="col-12 ordering">
- <h1 class="mt-4">Publications</h1>
+ <h1>Publications</h1>
<p>
Order by:
@@ -53,7 +53,7 @@
{% block sidebar %}
<div class="row">
<div class="col-12">
- <h2 class="mt-4">Recent Issues</h2>
+ <h2>Recent Issues</h2>
<div class="mb-1 pl-2">
<a href="?{% url_replace issue='' page='' subject='' %}" class="{% active_get_request 'issue' '' %}">All Issues</a>
</div>
diff --git a/journals/templates/partials/journals/publication_li_content.html b/journals/templates/partials/journals/publication_li_content.html
index 9bb1406455a4bc4b18b6c3516416460ce667c9e3..4df9e3715121beb480c7de2bddca9beb5d79cc17 100644
--- a/journals/templates/partials/journals/publication_li_content.html
+++ b/journals/templates/partials/journals/publication_li_content.html
@@ -1,5 +1,5 @@
<div class="li publication">
- <h5 class="subject">{{publication.get_subject_area_display}}</h5>
+ <h5 class="subject"><a href="{% url 'journals:publications' %}?subject={{ publication.subject_area }}" class="muted-link">{{ publication.get_subject_area_display }}</a></h5>
<h3 class="title"><a href="{{publication.get_absolute_url}}">{{publication.title}}</a></h3>
<p class="authors">{{ publication.author_list }}</p>
diff --git a/scipost/static/scipost/assets/config/preconfig.scss b/scipost/static/scipost/assets/config/preconfig.scss
index 0f2e91c7119e543ac5a466c22467511c3fa8fd3f..518ce2e67e9ca8fa18752492e5ba9de97c3b7880 100644
--- a/scipost/static/scipost/assets/config/preconfig.scss
+++ b/scipost/static/scipost/assets/config/preconfig.scss
@@ -116,7 +116,7 @@ $font-size-lg: 1.0rem;
$h1-font-size: 1.5rem;
$h2-font-size: 1.25rem;
-$h3-font-size: 1.1rem;
+$h3-font-size: 1.05rem;
$h4-font-size: 1.0rem;
$h5-font-size: 0.8rem;
$h6-font-size: 0.8rem;
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index 3f5bf6cb0d124dae923a332d7a7764feac9dcebe..58dcbac79216d7687d2228414c26469f593299dc 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -62,7 +62,7 @@ header {
}
p {
- margin: 25px;
+ margin: 15px 25px;
}
.content {
diff --git a/scipost/static/scipost/assets/css/_grid.scss b/scipost/static/scipost/assets/css/_grid.scss
index 830985e1e0f70127977649347de113f884a4e832..0eeba0177a80163d343f5d486e26da13ad1ca9cd 100644
--- a/scipost/static/scipost/assets/css/_grid.scss
+++ b/scipost/static/scipost/assets/css/_grid.scss
@@ -6,9 +6,14 @@
main {
margin-top: 0;
margin-bottom: 5rem;
- padding-top: 0.5rem;
+ padding-top: 0.05rem;
background-color: $white;
box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, .05);
+
+ &.container {
+ padding-top: $grid-gutter-width;
+ padding-bottom: $grid-gutter-width;
+ }
}
.row {
@@ -47,21 +52,18 @@ footer.secondary {
}
-.container-inner {
- padding: ($grid-gutter-width / 2);
- background-color: $white;
-}
+// .container-inner {
+// padding: ($grid-gutter-width / 2);
+// background-color: $white;
+// }
.container {
- max-width: 1475px;
+ max-width: 1500px;
}
@media screen and (min-width: 768px) {
- .container-inner {
- padding: $grid-gutter-width;
- }
.container {
- padding-left: 30px;
- padding-right: 30px;
+ padding-left: $grid-gutter-width;
+ padding-right: $grid-gutter-width;
}
}
diff --git a/scipost/static/scipost/assets/css/_nav.scss b/scipost/static/scipost/assets/css/_nav.scss
index 4ec42f0cf7eda9703dc32549da66b565e8062346..52b552088e82562ee1e69c837ab654461eb47cf1 100644
--- a/scipost/static/scipost/assets/css/_nav.scss
+++ b/scipost/static/scipost/assets/css/_nav.scss
@@ -76,3 +76,15 @@
// text-align: center;
// padding: 3rem;
// }
+
+.nav-tabs .nav-link {
+ background-color: #f8f8f8;
+ border-radius: 0;
+ border-color: #e0e0e0;
+ border-bottom: 0;
+ margin: 0 3px;
+
+ &.active {
+ border-top: 3px solid $scipost-darkblue;
+ }
+}
diff --git a/scipost/static/scipost/assets/css/_navbar.scss b/scipost/static/scipost/assets/css/_navbar.scss
index e507e4ab6b876496a05ab101a4419dd49409f5cc..96066078aedf0487e76dd5db5d4971741e58362a 100644
--- a/scipost/static/scipost/assets/css/_navbar.scss
+++ b/scipost/static/scipost/assets/css/_navbar.scss
@@ -44,6 +44,7 @@
}
.form-wrapper {
+ margin-right: - $grid-gutter-width;
float: right;
height: 100%;
padding: $navbar-padding-y 0.5rem;
@@ -66,7 +67,7 @@
.btn {
border: 0;
outline: none;
- color: $scipost-lightblue;
+ color: $scipost-darkblue;
position: absolute;
right: 0;
background: transparent;
@@ -75,7 +76,11 @@
padding: 4px 10px;
&:hover {
- color: $scipost-darkblue;
+ color: $scipost-lightblue;
+
+ span {
+ text-decoration: underline;
+ }
}
}
}
diff --git a/scipost/static/scipost/assets/css/_typography.scss b/scipost/static/scipost/assets/css/_typography.scss
index a4eba1ce4de11068d69b077f98ad7fd09205ad83..03607cde32bbede6554b849ca22d6e4f2eed17a9 100644
--- a/scipost/static/scipost/assets/css/_typography.scss
+++ b/scipost/static/scipost/assets/css/_typography.scss
@@ -7,6 +7,10 @@ a {
text-decoration: none;
cursor: pointer;
outline: none;
+
+ &.muted-link {
+ color: inherit;
+ }
}
a:hover {
color: $scipost-darkblue;
@@ -29,16 +33,16 @@ h1 > a {
color: $scipost-darkblue;
}
-h3,
-.h3,
-h4,
-.h4,
-h5,
-.h5,
-h6
-.h6 {
- margin-bottom: 0;
-}
+// h3,
+// .h3,
+// h4,
+// .h4,
+// h5,
+// .h5,
+// h6
+// .h6 {
+// margin-bottom: 0;
+// }
.text-black {
color: $scipost-darkblue;
diff --git a/scipost/templates/scipost/base.html b/scipost/templates/scipost/base.html
index b6f07df2f343a043d8e6a334d6554815c0a8766b..be505c1b78c8c17a3e728dd4885c15011a57a5ac 100644
--- a/scipost/templates/scipost/base.html
+++ b/scipost/templates/scipost/base.html
@@ -2,14 +2,12 @@
{% block base %}
- <main class="{% block container_class %}container pb-5{% endblock %}">
- <div class="container-inner">
- {% block page_header %}{% endblock page_header %}
+ <main class="{% block container_class %}container {% endblock %}">
+ {% block page_header %}{% endblock page_header %}
- {% block content %}{% endblock content %}
+ {% block content %}{% endblock content %}
- {% block content_footer %}{% endblock content_footer %}
- </div>
+ {% block content_footer %}{% endblock content_footer %}
</main>
{% block secondary_footer %}{% endblock secondary_footer %}
diff --git a/scipost/templates/scipost/base_for_sidebar.html b/scipost/templates/scipost/base_for_sidebar.html
index 2a047af1aac7e730a8a22b20b1035c29c640a7cc..005ab71fde0b4fd4625a8d874a5414c27b8ff5d1 100644
--- a/scipost/templates/scipost/base_for_sidebar.html
+++ b/scipost/templates/scipost/base_for_sidebar.html
@@ -5,7 +5,7 @@
{% block base %}
<main class="container">
<div class="row">
- <div class="col-md-8 col-lg-9">
+ <div class="col-md-8 col-lg-9 pr-lg-3">
{% block page_header %}{% endblock page_header %}
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index d979059db6faf5b8803f039bceb269bca1b6a5d7..df75367cb7f653df73083c7653fcd321ec44f1c3 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -35,7 +35,7 @@
<div class="row">
<div class="col-lg-6">
<!-- Latest publications -->
- <div class="card card-publications bg-light px-1 my-3 scipost-bar">
+ <div class="card card-publications bg-light px-1 mb-2 scipost-bar">
<div class="card-body pb-0">
<h2 class="title">Latest Publications</h2>
<p class="mb-1"><a href="{% url 'journals:publications' %}">View all Publications.</a></p>
@@ -53,7 +53,7 @@
<div class="col-lg-6">
<!-- Latest submissions -->
- <div class="card card-submissions bg-light px-1 my-3 scipost-bar">
+ <div class="card card-submissions bg-light px-1 mb-2 scipost-bar">
<div class="card-body pb-0">
<h2 class="title">Latest Submissions</h2>
<p class="mb-1"><a href="{% url 'submissions:submissions' %}">View all Submissions.</a></p>
@@ -72,7 +72,7 @@
{% endblock %}
{% block sidebar %}
- <div class="p-3 my-3 bg-light scipost-bar border" id="register">
+ <div class="p-3 mb-3 bg-light scipost-bar border" id="register">
<h2><a href="{% url 'scipost:ExpSustDrive2018' %}">Expansion and Sustainability Drive 2018</a></h2>
<p class="m-0">It is time for us to be bold and unleash the next steps in our implementation plans. Read more <a href="{% url 'scipost:ExpSustDrive2018' %}">here</a> on how you can concretely help. Follow developments at <a href="https://twitter.com/hashtag/SciPostDrive2018">#SciPostDrive2018</a>.</p>
</div>
diff --git a/scipost/templates/scipost/navbar.html b/scipost/templates/scipost/navbar.html
index 4bce705cdecbf53563f3996bde95a743f4ac6240..34e0f445343c09422d3336c4529035ca0d4a582b 100644
--- a/scipost/templates/scipost/navbar.html
+++ b/scipost/templates/scipost/navbar.html
@@ -93,7 +93,7 @@
<form action="{% url 'scipost:search' %}" method="get" class="form-inline my-2 my-lg-0 search-form">
<input class="form-control" aria-label="Search" id="id_q" name="q" type="text" value="{{ search_query|default:'' }}">
<button class="btn btn-outline-success my-0" type="submit">
- <i class="fa fa-search"></i> Search
+ <i class="fa fa-search"></i> <span class="text">Search</span>
</button>
</form>
</div>
diff --git a/submissions/templates/partials/submissions/submission_li.html b/submissions/templates/partials/submissions/submission_li.html
index c0202ef2b1bb890db63491bf6f117dbe91c77d1f..038204a7b7db8b1acfa83b63d6e7baaf0e5a583c 100644
--- a/submissions/templates/partials/submissions/submission_li.html
+++ b/submissions/templates/partials/submissions/submission_li.html
@@ -1,5 +1,5 @@
<div class="li submission">
- <h5 class="subject">{{ submission.get_subject_area_display }}</h5>
+ <h5 class="subject"><a href="{% url 'submissions:submissions' %}?subject_area={{ submission.subject_area }}" class="muted-link">{{ submission.get_subject_area_display }}</h5>
<h3 class="title"><a href="{{ submission.get_absolute_url }}">{{ submission.title }}</a></h3>
<p class="authors">by {{ submission.author_list }}</p>
{% block card_footer %}{% endblock %}