SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit 3f488808 authored by Jorran de Wit's avatar Jorran de Wit
Browse files

Merge branch 'stylingissues' into development

parents 824fb681 0fc9a21d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 37 deletions
journals/templates/journals/scipost_physics.html
+ 4
− 8
View file @ 3f488808
......@@ -33,10 +33,8 @@
<div class="publicationHeaderList">
<div class="row">
{% for paper in current_issue.publication_set.all|dictsort:"paper_nr" %}
<div class="col-md-6">
<div class="panel">
{{ paper.header_as_li }}
</div>
<div class="col-12">
{{ paper.header_as_li }}
</div>
{% endfor %}
</div>
......@@ -56,10 +54,8 @@
<div class="publicationHeaderList">
<div class="row">
{% for paper in latest_issue.publication_set.all|dictsort:"paper_nr" %}
<div class="col-md-6">
<div class="panel">
{{ paper.header_as_li }}
</div>
<div class="col-12">
{{ paper.header_as_li }}
</div>
{% endfor %}
</div>
......
journals/templates/journals/scipost_physics_issue_detail.html
+ 1
− 1
View file @ 3f488808
......@@ -32,7 +32,7 @@
<div class="publicationHeaderList">
<div class="row">
{% for paper in papers %}
<div class="col-md-6">
<div class="col-12">
<div class="panel">
{{ paper.header_as_li }}
</div>
......
journals/templates/journals/scipost_physics_recent.html
+ 2
− 4
View file @ 3f488808
......@@ -31,10 +31,8 @@
<div class="publicationHeaderList">
<div class="row">
{% for paper in recent_papers %}
<div class="col-md-6">
<div class="panel">
{{ paper.header_as_li }}
</div>
<div class="col-12">
{{ paper.header_as_li }}
</div>
{% endfor %}
</div>
......
scipost/static/scipost/assets/config/preconfig.scss
+ 8
− 0
View file @ 3f488808
......@@ -24,6 +24,14 @@ $scipost-orange: #FFA300;
$blue: $scipost-lightblue !default;
$body-color: $scipost-darkblue !default;
// Forms
//
$btn-padding-x: .5rem;
$btn-padding-y: .25rem;
$btn-transition: none;
$input-padding-x: .5rem;
$input-padding-y: .25rem;
// Fonts
//
$font-family-sans-serif: 'Merriweather Sans', "Helvetica Neue", Arial, sans-serif !default;
......
scipost/static/scipost/assets/css/_form.scss
+ 3
− 2
View file @ 3f488808
......@@ -7,7 +7,7 @@
}
.has-error .form-control {
border-color: #d9534f;
border-color: #d9534f;
}
.form-control + .help-block {
......@@ -16,7 +16,8 @@
font-weight: 600;
}
form.small .form-group {
.form-group,
.row.form-group {
margin-bottom: 0.5rem;
}
......
scipost/static/scipost/assets/css/_journals.scss
+ 6
− 1
View file @ 3f488808
......@@ -31,7 +31,12 @@
}
.publicationHeader {
.panel & .publicationTitle {
padding: 0.75rem;
height: 100%;
background-color: #f8f8f8;
border-bottom: 10px solid #fff;
& .publicationTitle {
margin: -0.75rem -0.75rem 0.5rem -0.75rem;
}
}
......
scipost/static/scipost/assets/css/_navbar.scss
+ 10
− 3
View file @ 3f488808
......@@ -10,15 +10,21 @@
padding-left: 1rem;
border: 1px solid transparent;
border-radius: 0.1rem;
-webkit-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
word-wrap: break-word;
white-space: nowrap;
-webkit-transition: all 0.1s ease-in-out;
-o-transition: all 0.1s ease-in-out;
transition: all 0.1s ease-in-out;
@include hover-focus {
background-color: $white;
}
}
.navbar-collapse.show .nav-item {
margin-bottom: .25rem;
}
.active > .nav-link {
border-color: $scipost-darkblue;
}
......@@ -31,6 +37,7 @@
margin-right: 0.5rem;
}
}
.navbar-brand {
height: 38px;
margin: 0;
......
scipost/static/scipost/assets/css/_type.scss
+ 11
− 2
View file @ 3f488808
......@@ -18,12 +18,21 @@ h1, h2, h3, h4, h5, h6 {
text-shadow: none;
font-weight: 500;
}
h3.highlight {
background-color: #f4f4f4;
&.tight {
display: inline-block;
padding: 3px 5px;
margin-bottom: 3px;
}
}
hr,
hr.hr12 {
height: 3px;
border: 0;
box-shadow: 0 1px 2px 0 #ccc;
background: rgba(104, 133, 195, 0.5);
box-shadow: none !important;
background: rgba(0, 43, 73, 0.73);
margin-bottom: 1rem;
&.small {
......
scipost/templates/scipost/navbar.html
+ 1
− 1
View file @ 3f488808
<nav class="navbar navbar-light navbar-toggleable-md">
<nav class="navbar navbar-light navbar-toggleable-sm">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#header-navbar">
<span class="navbar-toggler-icon"></span>
</button>
......
submissions/models.py
+ 15
− 15
View file @ 3f488808
......@@ -688,15 +688,15 @@ class Report(models.Model):
def print_contents(self):
context = Context({'strengths': self.strengths, 'weaknesses': self.weaknesses,
'report': self.report, 'requested_changes': self.requested_changes})
output = ('<div class="row"><div class="col-6">'
'Strengths:</div><div class="col-6">{{ strengths }}</div></div>'
'<div class="row"><div class="col-6">'
'Weaknesses:</div><div class="col-6">{{ weaknesses }}</div></div>'
'<div class="row"><div class="col-6">'
'Report:</div><div class="col-6">{{ report }}</div></div>'
'<div class="row"><div class="col-6">'
'Requested changes:</div>'
'<div class="col-6">{{ requested_changes }}</div></div>'
output = ('<div class="row"><div class="col-12"><h3 class="highlight tight">'
'Strengths</h3><div class="pl-md-4">{{ strengths }}</div></div></div>'
'<div class="row"><div class="col-12"><h3 class="highlight tight">'
'Weaknesses</h3><div class="pl-md-4">{{ weaknesses }}</div></div></div>'
'<div class="row"><div class="col-12"><h3 class="highlight tight">'
'Report</h3><div class="pl-md-4">{{ report }}</div></div></div>'
'<div class="row"><div class="col-12"><h3 class="highlight tight">'
'Requested changes</h3><div class="pl-md-4">'
'<p>{{ requested_changes }}</p>'
'<div class="reportRatings"><ul>'
'<li>validity: ' + ranking_choices_dict[self.validity] + '</li>'
'<li>significance: ' + ranking_choices_dict[self.significance] + '</li>'
......@@ -704,7 +704,7 @@ class Report(models.Model):
'<li>clarity: ' + ranking_choices_dict[self.clarity] + '</li>'
'<li>formatting: ' + quality_spec_dict[self.formatting] + '</li>'
'<li>grammar: ' + quality_spec_dict[self.grammar] + '</li>'
'</ul></div>')
'</ul></div></div></div></div>')
template = Template(output)
return template.render(context)
......@@ -723,12 +723,12 @@ class Report(models.Model):
output += ('<a href="/contributor/{{ author_id }}">'
'{{ author_first_name }} {{ author_last_name }}</a>'
' on {{ date_submitted }}</h3></div>'
'<div class="row"><div class="col-6">Qualification:</div>'
'<div class="col-6">'
+ ref_qualif_dict[self.qualification] + '</div></div>')
'<div class="row"><div class="col-12"><h3 class="highlight tight">Qualification</h3>'
'<div class="pl-md-4">'
+ ref_qualif_dict[self.qualification] + '</div></div></div>')
output += self.print_contents()
output += '<h3>Remarks for editors</h3><p>{{ remarks_for_editors }}</p>'
output += '<h3>Recommendation</h3><p>%s</p>' % report_rec_dict[self.recommendation]
output += '<div class="row"><div class="col-12"><h3>Remarks for editors</h3><div class="pl-md-4">{{ remarks_for_editors }}</div></div></div>'
output += '<div class="row"><div class="col-12"><h3>Recommendation</h3><div class="pl-md-4">%s</div></div></div>' % report_rec_dict[self.recommendation]
template = Template(output)
return template.render(context)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

SciPost Code Repository