From b02f3a09ee669f2809897a3c5308f08e193590b4 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sun, 2 Apr 2017 14:58:10 +0200
Subject: [PATCH] Improve alignment
---
.../journals/_publication_card_content.html | 2 +-
.../templates/journals/scipost_physics.html | 8 +++-----
scipost/static/scipost/assets/css/_cards.scss | 19 +++++++++++++++++++
.../static/scipost/assets/css/_general.scss | 2 +-
.../static/scipost/assets/css/_navbar.scss | 5 +++++
.../scipost/assets/css/scipost-physics.scss | 7 +++----
6 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/journals/templates/journals/_publication_card_content.html b/journals/templates/journals/_publication_card_content.html
index d7bb3cf39..4053b050e 100644
--- a/journals/templates/journals/_publication_card_content.html
+++ b/journals/templates/journals/_publication_card_content.html
@@ -1,4 +1,4 @@
-<div class="card-block publication-{{publication.id}} py-2">
+<div class="card-block publication-{{publication.id}}">
<h3 class="card-title"><a href="{% url 'scipost:publication_detail' publication.doi_string %}">{{ publication.title }}</a></h3>
<p class="card-text">{{ publication.author_list }}</p>
<p class="card-text text-muted">{{ publication.citation }} - published {{ publication.publication_date|date:'j F Y' }} | <a href="javascript:;" class="btn btn-outline-primary btn-sm mx-2" data-toggle="toggle" data-target=".card-block.publication-{{publication.id}} .abstract">Toggle abstract</a> <a href="{% url 'scipost:publication_pdf' publication.doi_string %}" target="_blank">pdf</a></p>
diff --git a/journals/templates/journals/scipost_physics.html b/journals/templates/journals/scipost_physics.html
index 91926416c..6859a27c0 100644
--- a/journals/templates/journals/scipost_physics.html
+++ b/journals/templates/journals/scipost_physics.html
@@ -6,9 +6,7 @@
{% block secondary_navbar %}
<nav class="navbar navbar-secondary">
<div class="container">
- <div>
- <h2 class="banner d-inline-block"><a href="{% url 'journals:scipost_physics' %}">SciPost Physics</a></h2>
- </div>
+ <h2 class="banner d-inline-block mr-2"><a href="{% url 'journals:scipost_physics' %}">SciPost Physics</a></h2>
<ul class="links">
<li><a href="{% url 'journals:scipost_physics_issues' %}">Issues</a></li>
<li><a class="active" href="{% url 'journals:scipost_physics_recent' %}">Recent</a></li>
@@ -39,7 +37,7 @@
<ul class="list-group list-group-flush px-3">
{% for paper in current_issue.publication_set.all|dictsort:"paper_nr" %}
<li class="list-group-item">
- <div class="card card-grey w-100">
+ <div class="card card-grey card-publication">
{% include 'journals/_publication_card_content.html' with publication=paper %}
</div>
</li>
@@ -54,7 +52,7 @@
<ul class="list-group list-group-flush px-3">
{% for paper in latest_issue.publication_set.all|dictsort:"paper_nr" %}
<li class="list-group-item">
- <div class="card card-grey w-100">
+ <div class="card card-grey card-publication">
{% include 'journals/_publication_card_content.html' with publication=paper %}
</div>
</li>
diff --git a/scipost/static/scipost/assets/css/_cards.scss b/scipost/static/scipost/assets/css/_cards.scss
index 78bce205b..13637b2eb 100644
--- a/scipost/static/scipost/assets/css/_cards.scss
+++ b/scipost/static/scipost/assets/css/_cards.scss
@@ -35,3 +35,22 @@
color: $scipost-light;
}
}
+
+.card-publication {
+ width: 100%;
+
+ &.card-grey {
+ background-color: #f8f8f8;
+ }
+
+ .card-block {
+ padding-top: 0.5rem;
+ padding-bottom: 0.5rem;
+
+ .card-title {
+ background-color: #f4f4f4;
+ margin: -0.5rem -0.75rem 0.5rem -0.75rem;
+ padding: .75rem 0.75rem;
+ }
+ }
+}
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index 965f626f7..74b43d229 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -1,6 +1,6 @@
.banner {
background-color: #002b49;
- padding: 15px 20px;
+ padding: 0.9rem 1rem;
text-align: center;
border-radius: 1.4px;
diff --git a/scipost/static/scipost/assets/css/_navbar.scss b/scipost/static/scipost/assets/css/_navbar.scss
index 894acb38c..ce197daf4 100644
--- a/scipost/static/scipost/assets/css/_navbar.scss
+++ b/scipost/static/scipost/assets/css/_navbar.scss
@@ -50,4 +50,9 @@
margin-top: -0.75rem;
margin-bottom: 1.75rem;
background-color: #f8f8f8;
+
+ > .container {
+ margin-bottom: -1.5rem;
+ padding-top: 0.5rem;
+ }
}
diff --git a/scipost/static/scipost/assets/css/scipost-physics.scss b/scipost/static/scipost/assets/css/scipost-physics.scss
index 7f54a7c32..7b0eaae15 100644
--- a/scipost/static/scipost/assets/css/scipost-physics.scss
+++ b/scipost/static/scipost/assets/css/scipost-physics.scss
@@ -1,11 +1,10 @@
.journals .navbar-secondary ul.links {
background-color: #dddddd;
- display: block;
+ display: inline-block;
font-size: 16px;
- padding: 0px;
+ padding: 0;
border-radius: 1.4px;
- margin-top: 0.5rem;
- margin-bottom: -1.5rem;
+ margin: 0;
> li {
display: inline-block;
--
GitLab