From b346874ffdce3cfda1ce1498d84f0ffd782c12e3 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Thu, 20 Dec 2018 22:03:15 +0100
Subject: [PATCH] Remove stupid scss
---
.../journals/journal_landing_page.html | 4 +-
news/templates/news/_newsletter_contents.html | 12 +-
.../static/scipost/assets/css/_general.scss | 5 +-
scipost/static/scipost/assets/css/_grid.scss | 5 -
.../static/scipost/assets/css/_homepage.scss | 99 ------------
scipost/static/scipost/assets/css/_nav.scss | 78 ----------
.../static/scipost/assets/css/_navbar.scss | 145 ------------------
.../templates/scipost/index_sidebar_2.html | 8 +-
.../submissions/submission_prefill_form.html | 24 ++-
9 files changed, 23 insertions(+), 357 deletions(-)
diff --git a/journals/templates/journals/journal_landing_page.html b/journals/templates/journals/journal_landing_page.html
index 417092158..d894a1348 100644
--- a/journals/templates/journals/journal_landing_page.html
+++ b/journals/templates/journals/journal_landing_page.html
@@ -32,7 +32,7 @@
<ul class="list-unstyled mt-2">
{% for publication in latest_publications %}
<li>
- <div class="card card-grey card-publication">
+ <div class="card bg-light card-publication">
{% include 'journals/_publication_card_content.html' with publication=publication %}
</div>
</li>
@@ -61,7 +61,7 @@
<ul class="list-unstyled mt-2">
{% for publication in most_cited %}
<li>
- <div class="card card-grey card-publication">
+ <div class="card bg-light card-publication">
{% include 'journals/_publication_card_content.html' with publication=publication include_citation_rate=1 %}
</div>
</li>
diff --git a/news/templates/news/_newsletter_contents.html b/news/templates/news/_newsletter_contents.html
index dfdaf6249..852d9f816 100644
--- a/news/templates/news/_newsletter_contents.html
+++ b/news/templates/news/_newsletter_contents.html
@@ -1,16 +1,14 @@
<div class="row">
<div class="col-12">
- <div class="card card-grey card-news p-3">
+ <div class="card bg-light card-news p-3 mb-4">
<h1>SciPost Newsletter {{ nl.date|date:'Y-m-d' }}</h1>
- <p>{{ nl.intro|safe }}</p>
+ <div>{{ nl.intro|safe }}</div>
</div>
{% for nt in nl.newsletternewsitemstable_set.all|dictsort:'order' %}
- <div class="card card-grey card-news">
- {% include 'news/news_card_content.html' with news=nt.newsitem %}
- </div>
+ {% include 'news/news_card_content.html' with news=nt.newsitem %}
{% endfor %}
- <div class="card card-grey card-news p-3">
- <p>{{ nl.closing|safe }}</p>
+ <div class="card bg-light card-news p-3">
+ {{ nl.closing|safe }}
</div>
</div>
</div>
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index 9acf59de0..ba6614c77 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -1,6 +1,3 @@
-// html {
-// font-size: 12.8px; // Base size for site!
-// }
.fa {
display: inline-block;
@@ -126,6 +123,6 @@ header {
.sidebar {
.bg-light {
- background-color: #f2f2f2 !important;
+ background-color: #f9f9f9 !important;
}
}
diff --git a/scipost/static/scipost/assets/css/_grid.scss b/scipost/static/scipost/assets/css/_grid.scss
index 4fcd112ca..f2ba8cedd 100644
--- a/scipost/static/scipost/assets/css/_grid.scss
+++ b/scipost/static/scipost/assets/css/_grid.scss
@@ -57,11 +57,6 @@ footer.secondary {
}
-// .container-inner {
-// padding: ($grid-gutter-width / 2);
-// background-color: $white;
-// }
-
.container {
max-width: 1500px;
}
diff --git a/scipost/static/scipost/assets/css/_homepage.scss b/scipost/static/scipost/assets/css/_homepage.scss
index 49536af0c..433a12ce0 100644
--- a/scipost/static/scipost/assets/css/_homepage.scss
+++ b/scipost/static/scipost/assets/css/_homepage.scss
@@ -1,64 +1,3 @@
-// .has-sidebar {
-// .content-wrapper {
-// display: flex;
-// flex-wrap: wrap;
-// position: relative;
-// }
-//
-// .sidebar,
-// .main-panel {
-// padding-top: 0;
-// overflow: auto;
-// max-height: 100%;
-// height: 100%;
-// -webkit-overflow-scrolling: touch;
-// }
-//
-// .main-panel {
-// position: relative;
-// z-index: 2;
-// float: left;
-// min-height: 100%;
-// }
-//
-// .sidebar {
-// width: 100%;
-// padding-left: 1rem;
-// padding-right: 1rem;
-// .card {
-// margin-bottom: 1rem;
-// }
-// }
-//
-// &.sidebar-left {
-// .main-panel {
-// order: 2;
-// }
-// .sidebar {
-// order: 1;
-// }
-// }
-// }
-//
-// .sidebar {
-// margin-bottom: 2rem;
-//
-// a {
-// &.active {
-// font-weight: 700;
-// }
-// }
-// }
-//
-// .container.header {
-// padding-top: 0.5rem;
-// margin-bottom: 1.5rem;
-//
-// .highlight {
-// background-color: $white;
-// }
-// }
-
.granting-institutions > a {
width: 25%;
display: inline-block;
@@ -85,44 +24,6 @@
}
}
}
-//
-//
-// @media (min-width: 768px) {
-// .has-sidebar {
-// .main-panel {
-// width: calc(100% - 350px);
-// padding-left: 0;
-// padding-right: 1rem;
-// }
-// .sidebar {
-// width: 350px;
-// padding-right: 0;
-// }
-//
-// &.sidebar-left {
-// .main-panel {
-// padding-right: 0;
-// padding-left: 1rem;
-// }
-// .sidebar {
-// padding-right: 1rem;
-// padding-left: 0;
-// }
-// }
-// }
-// }
-//
-// @media (min-width: 1280px) {
-// .has-sidebar {
-// .main-panel {
-// width: calc(100% - 400px);
-// }
-//
-// .sidebar {
-// width: 400px;
-// }
-// }
-// }
.teaser-box {
diff --git a/scipost/static/scipost/assets/css/_nav.scss b/scipost/static/scipost/assets/css/_nav.scss
index 7ee652978..469f75190 100644
--- a/scipost/static/scipost/assets/css/_nav.scss
+++ b/scipost/static/scipost/assets/css/_nav.scss
@@ -1,81 +1,3 @@
-// .nav.main-nav,
-// nav.main-nav {
-// background-color: #f0f0f0;
-// }
-//
-// .nav.btn-group .nav-item {
-// padding: 0 !important;
-// }
-//
-// .nav > .btn {
-// border-radius: 1.4px;
-// }
-//
-// .tab-nav-container {
-// text-align: center;
-// white-space: nowrap;
-// overflow-x: auto;
-// overflow-y: hidden;
-// position: relative;
-// -webkit-overflow-scrolling: touch;
-//
-// &:after {
-// content: "";
-// display: block;
-// height: 3px;
-// width: 100%;
-// position: absolute;
-// background-color: $scipost-darkblue;
-// z-index: 1;
-// bottom: 1px;
-// border-radius: 99px;
-// box-shadow: 0 1px 0 0 $scipost-lightblue;
-// }
-//
-// .tab-nav-inner {
-// display: inline-block;
-// padding-bottom: 2px;
-// }
-// }
-//
-// .nav.personal-page-nav {
-// .nav-item {
-// background-color: transparent;
-// color: $scipost-lightblue;
-// border: 0;
-// margin-bottom: -3px;
-//
-// .nav-link.active {
-// text-decoration: underline;
-// color: $scipost-darkblue;
-//
-// &:before {
-// border-bottom: 11px solid $scipost-darkblue;
-// border-left: 11px solid transparent;
-// border-right: 11px solid transparent;
-// content: "";
-// display: inline-block;
-// position: absolute;
-// right: 40%;
-// bottom: 3px;
-// }
-// }
-//
-// a {
-// padding-top: 0.5rem;
-// padding-bottom: 1.5rem;
-// }
-// }
-// }
-//
-// .nav {
-// flex-wrap: nowrap;
-// }
-//
-// .tab-pane .loading {
-// text-align: center;
-// padding: 3rem;
-// }
.nav-tabs .nav-link {
background-color: #f8f8f8;
diff --git a/scipost/static/scipost/assets/css/_navbar.scss b/scipost/static/scipost/assets/css/_navbar.scss
index 326c7e693..53b72a433 100644
--- a/scipost/static/scipost/assets/css/_navbar.scss
+++ b/scipost/static/scipost/assets/css/_navbar.scss
@@ -151,150 +151,6 @@
}
}
-// .container-outside {
-// &.main-nav {
-// background-color: $scipost-lightblue;
-//
-// .navbar {
-// background-color: $scipost-lightblue;
-//
-// a {
-// color: $white;
-// }
-// }
-// }
-//
-// &.sub-nav {
-// background-color: $gray-200;
-//
-// .navbar {
-// background-color: $gray-200;
-//
-// a {
-// color: $scipost-lightblue;
-// }
-// }
-//
-// span.nav-link {
-// color: #465d8e;
-// }
-//
-// &.lighter {
-// background-color: #f2f2f2;
-//
-// .navbar {
-// background-color: #f2f2f2;
-// }
-// }
-// }
-// }
-
-
-// .navbar-scroll {
-// white-space: nowrap;
-// overflow-x: auto;
-// overflow-y: auto;
-// -webkit-overflow-scrolling: touch;
-//
-// .navbar-scroll-inner {
-// display: flex !important;
-// width: 100%;
-// }
-// }
-//
-// .navbar-brand {
-// height: 38px;
-// margin: 0;
-// }
-// .navbar-toggler-icon {
-// background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 43, 73, 1.0)");
-// }
-//
-// .navbar-secondary {
-// background-color: transparent;
-//
-// > div {
-// overflow-x: auto;
-// white-space: nowrap;
-// }
-// }
-//
-// .navbar-counter {
-// position: relative;
-//
-// a.dropdown-toggle {
-// min-width: 45px;
-// }
-// }
-//
-// .live_notify_badge {
-// vertical-align: top;
-// margin-left: -15px;
-// margin-top: -5px;
-// height: 16px;
-// min-width: 16px;
-// line-height: 10px;
-// display: none;
-// padding: 0.2em;
-// border-radius: 99px;
-// border: 1px solid $scipost-lightblue;
-// background-color: $white;
-// color: $scipost-lightblue;
-// }
-//
-// .search-nav-form {
-// display: none;
-// position: absolute;
-// right: 0;
-// top: 0;
-// height: 100%;
-//
-// input[name="q"] {
-// position: relative;
-// outline: none;
-// border-radius: 0;
-// font-size: 110%;
-// margin: 0 !important;
-// padding: 0.5rem 0.75rem;
-// height: 100%;
-// border: 6px solid $gray-800;
-// border-left-width: 8px;
-// width: 100px;
-// transition: 0.1s;
-// }
-//
-// &:active input[name="q"],
-// &:focus input[name="q"],
-// &:hover input[name="q"],
-// input[name="q"]:active,
-// input[name="q"]:focus,
-// input[name="q"]:hover {
-// width: 200px;
-// }
-//
-// [type="submit"] {
-// background-color: $gray-800;
-// color: $white;
-// border-radius: 0;
-// padding-left: 0.75rem;
-// padding-right: 0.75rem;
-// height: 100%;
-// position: relative;
-// }
-// [type="submit"]:hover {
-// background-color: $gray-700;
-// }
-// }
-//
-// @media (min-width: 992px) {
-// .search-nav-form {
-// display: flex;
-// }
-//
-// .nav-item.search-item {
-// display: none;
-// }
-// }
header .nav-item {
position: relative;
@@ -317,7 +173,6 @@ header .nav-item {
margin: 0;
border: 1px solid $scipost-lightblue;
outline: none;
- // border-radius: 100px;
input[type='text'] {
width: 100%;
diff --git a/scipost/templates/scipost/index_sidebar_2.html b/scipost/templates/scipost/index_sidebar_2.html
index f9957daa2..6b368e9b6 100644
--- a/scipost/templates/scipost/index_sidebar_2.html
+++ b/scipost/templates/scipost/index_sidebar_2.html
@@ -14,7 +14,7 @@
{% if not user.is_authenticated %}
<!-- Register -->
- <div class="py-3" id="register">
+ <div class="p-3 border bg-light" id="register">
<h2>Register</h2>
<p class="mb-1">Professional scientists (PhD students and above) can become Contributors to SciPost by filling the <a href="{% url 'scipost:register' %}">registration form</a>.</p>
</div><!-- End Register -->
@@ -23,7 +23,7 @@
{% endif %}
<!-- News -->
-<div class="py-3" id="news2">
+<div class="p-3 border bg-light" id="news2">
<h2 class="title">
News
<small><a href="{% url 'scipost:feeds' %}"><i class="fa fa-rss"></i></a></small>
@@ -49,7 +49,7 @@
<hr class="lg">
<!-- Sponsors -->
-<div class="py-3" id="sponsors">
+<div class="p-3 border bg-light" id="sponsors">
<h2>Sponsors</h2>
<p>
@@ -74,7 +74,7 @@ We invite <a href="{% url 'organizations:organizations' %}">organizations benefi
<hr class="lg">
<!-- Summarized -->
-<div class="py-3" id="summarized">
+<div class="p-3 border bg-light" id="summarized">
<h2 class="title"><a href="{% url 'journals:journals' %}" class="text-black">Journals</a></h2>
<p>
SciPost publishes a portfolio of high-quality two-way open access scientific journals.
diff --git a/submissions/templates/submissions/submission_prefill_form.html b/submissions/templates/submissions/submission_prefill_form.html
index 238eaab6d..d972b39d9 100644
--- a/submissions/templates/submissions/submission_prefill_form.html
+++ b/submissions/templates/submissions/submission_prefill_form.html
@@ -35,19 +35,17 @@
<div class="row">
<div class="col-12">
- <div class="card card-grey">
- <div class='card-body'>
- <h3>Please provide the arXiv identifier for your Submission</h3>
- <p><em>(give the identifier without prefix but with version number, as per the placeholder)</em></p>
- <form action="{% url 'submissions:prefill_using_identifier' %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input type="submit" class="btn btn-outline-secondary" value="Query arXiv"/>
- <br>
- <br>
- <a href="{% url 'submissions:submit_manuscript_scipost' %}">Submit manuscript without arXiv instead</a>
- </form>
- </div>
+ <div class="border p-3 bg-light">
+ <h3>Please provide the arXiv identifier for your Submission</h3>
+ <p><em>(give the identifier without prefix but with version number, as per the placeholder)</em></p>
+ <form action="{% url 'submissions:prefill_using_identifier' %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input type="submit" class="btn btn-outline-secondary" value="Query arXiv"/>
+ <br>
+ <br>
+ <a href="{% url 'submissions:submit_manuscript_scipost' %}">Submit manuscript without arXiv instead</a>
+ </form>
</div>
{% else %}
<h3>You are currently not allowed to submit a manuscript.</h3>
--
GitLab