From d0fb574e7a79d653a974aec26e7473085dbefdb5 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Tue, 6 Jun 2017 20:09:13 +0200
Subject: [PATCH] Styling edits
---
SciPost_v1/settings/local_jorran.py | 2 +-
journals/templates/journals/_publication_card_content.html | 1 -
scipost/static/scipost/assets/css/_breadcrumb.scss | 2 ++
scipost/static/scipost/assets/css/_cards.scss | 6 +++++-
scipost/static/scipost/assets/css/_nav.scss | 3 ++-
scipost/static/scipost/assets/css/_navbar.scss | 4 ++++
scipost/templates/scipost/navbar.html | 2 +-
7 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/SciPost_v1/settings/local_jorran.py b/SciPost_v1/settings/local_jorran.py
index a599c9c41..1d47922ef 100644
--- a/SciPost_v1/settings/local_jorran.py
+++ b/SciPost_v1/settings/local_jorran.py
@@ -1,7 +1,7 @@
from .base import *
# THE MAIN THING HERE
-DEBUG = False
+DEBUG = True
# Debug toolbar settings
INSTALLED_APPS += (
diff --git a/journals/templates/journals/_publication_card_content.html b/journals/templates/journals/_publication_card_content.html
index f170f27df..fa49f54b4 100644
--- a/journals/templates/journals/_publication_card_content.html
+++ b/journals/templates/journals/_publication_card_content.html
@@ -1,5 +1,4 @@
<div class="card-header mx-0 px-2">
- <h5 class="text-muted pb-0">{{publication.get_subject_area_display}}
<h3 class="card-title mb-0 "><a href="{{publication.get_absolute_url}}">{{ publication.title }}</a></h3>
</div>
<div class="card-block publication-{{publication.id}}">
diff --git a/scipost/static/scipost/assets/css/_breadcrumb.scss b/scipost/static/scipost/assets/css/_breadcrumb.scss
index ae39d14a6..41ece7b7e 100644
--- a/scipost/static/scipost/assets/css/_breadcrumb.scss
+++ b/scipost/static/scipost/assets/css/_breadcrumb.scss
@@ -1,6 +1,8 @@
.breadcrumb {
margin-top: -0.75rem;
margin-bottom: 0.75rem;
+ border-top: 1px solid #fff;
+ border-bottom: 1px solid #f0f0f0;
.breadcrumb-item {
margin-bottom: 0;
diff --git a/scipost/static/scipost/assets/css/_cards.scss b/scipost/static/scipost/assets/css/_cards.scss
index 982a145be..bbf4c1f53 100644
--- a/scipost/static/scipost/assets/css/_cards.scss
+++ b/scipost/static/scipost/assets/css/_cards.scss
@@ -3,15 +3,19 @@
&.card-grey {
background-color: #F4F4F4;
- border-color: #f1f1f1;
+ border-color: #ddd;
}
&.card-publication {
+ box-shadow: 0 1px 0 0 #ddd;
+
.card-header {
background-color: #eee;
+ border-bottom: 1px solid #ddd;
}
.card-block {
+ border-top: 1px solid #fff;
background-color: #f8f8f8;
}
}
diff --git a/scipost/static/scipost/assets/css/_nav.scss b/scipost/static/scipost/assets/css/_nav.scss
index 1057cd289..8ce562ace 100644
--- a/scipost/static/scipost/assets/css/_nav.scss
+++ b/scipost/static/scipost/assets/css/_nav.scss
@@ -55,7 +55,8 @@ nav.submenu {
padding: 0.75rem 1rem;
background-color: #f9f9f9;
border-radius: 0;
- border-top: 1px solid #ddd;
+ border-top: 1px solid #fff;
+ border-bottom: 1px solid #f0f0f0;
.item {
padding: 0 0.5rem;
diff --git a/scipost/static/scipost/assets/css/_navbar.scss b/scipost/static/scipost/assets/css/_navbar.scss
index 302993352..f0754653f 100644
--- a/scipost/static/scipost/assets/css/_navbar.scss
+++ b/scipost/static/scipost/assets/css/_navbar.scss
@@ -5,6 +5,10 @@
.navbar {
margin-bottom: 0.75rem;
+ &.main-nav {
+ border-bottom: 1px solid #ddd;
+ }
+
.nav-link {
padding-right: .5rem;
padding-left: .5rem;
diff --git a/scipost/templates/scipost/navbar.html b/scipost/templates/scipost/navbar.html
index dddf3e20a..7a5fe0d0a 100644
--- a/scipost/templates/scipost/navbar.html
+++ b/scipost/templates/scipost/navbar.html
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-scroll navbar-light">
+<nav class="navbar navbar-scroll navbar-light main-nav">
<div class="navbar-scroll-inner">
<ul class="navbar-nav mr-auto">
<li class="nav-item{% if request.path == '/' %} active{% endif %}">
--
GitLab