Merge pull request #9 from monerooo/master

Code clean up & Style fix
This commit is contained in:
rottenstonks 2022-04-02 07:46:58 -05:00 committed by GitHub
commit eacbd48599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 196 additions and 223 deletions

View File

@ -1 +1,3 @@
<footer class="footer"><span>2022 - Revuo Monero.</span></footer> <footer class="footer">
<span>2022 - Revuo Monero.</span>
</footer>

View File

@ -14,5 +14,4 @@
<a href="{{ site.baseurl }}" class="wk">Weekly</a> <a href="{{ site.baseurl }}" class="wk">Weekly</a>
<a href="/periodicals/" class="pd">Periodical</a> <a href="/periodicals/" class="pd">Periodical</a>
</div> </div>
</header> </header>

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="en">
{% include head.html %} {% include head.html %}
@ -23,40 +23,33 @@
<!-- Main content --> <!-- Main content -->
<div id="container"> <div id="container">
<main> <main>
{{ content }} {{ content }}
</main> </main>
<!-- Pagination links --> <!-- Pagination links -->
<div class="pagination"> <div class="pagination">
{% if paginator.total_pages > 1 %} {% if paginator.total_pages > 1 %}
<div class="page-numbers"><p> <div class="page-numbers">
<p>
{% if paginator.previous_page %} {% if paginator.previous_page %}
<a href="{{ paginator.previous_page_path}}" class="page-button prev">Prev</a> <a href="{{ paginator.previous_page_path}}" class="page-button prev">Prev</a>
{% endif %} {% endif %}
{% for page in (1..paginator.total_pages) %} {% for page in (1..paginator.total_pages) %}
{% assign total = paginator.total_pages %} {% assign total = paginator.total_pages %}
{% if page == paginator.page %} {% if page == paginator.page %}
{{ page }} of {{total}} {{ page }} of {{total}}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if paginator.next_page %} {% if paginator.next_page %}
<a href="{{ paginator.next_page_path}}" class="page-button next">Next</a> <a href="{{ paginator.next_page_path}}" class="page-button next">Next</a>
{% endif %} {% endif %}
</p></div> </p>
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<!-- Footer --> <!-- Footer -->
@ -65,6 +58,6 @@
<!-- Script --> <!-- Script -->
{% include script.html %} {% include script.html %}
</div> </div><!-- div#wrap -->
</body> </body>
</html> </html>

View File

@ -2,7 +2,5 @@
layout: revuo-period layout: revuo-period
--- ---
<article id="page"> <article id="page">
{{ content }} {{ content }}
</article> </article>

View File

@ -5,9 +5,7 @@ layout: default
<h2>{{ page.title }}</h2> <h2>{{ page.title }}</h2>
<time datetime="{{ page.date | date_to_xmlschema }}" class="by-line">{{ page.date | date_to_string }}</time> <time datetime="{{ page.date | date_to_xmlschema }}" class="by-line">{{ page.date | date_to_string }}</time>
<div class="content"> <div class="content">
{{ content }} {{ content }}
</div> </div>
</article> </article>

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="en">
{% include head.html %} {% include head.html %}
@ -24,11 +24,8 @@
<!-- Main content --> <!-- Main content -->
<div id="container"> <div id="container">
<main> <main>
{{ content }} {{ content }}
</main> </main>
<!-- Pagination links --> <!-- Pagination links -->
@ -60,14 +57,14 @@
</div> </div>
{% endif %} {% endif %}
</div> </div><!-- div#container -->
<!-- Footer --> <!-- Footer -->
{% include footer.html %} {% include footer.html %}
<!-- Script --> <!-- Script -->
{% include script.html %} {% include script.html %}
</div> </div><!-- div#periodical -->
</div> </div><!-- div#wrap -->
</body> </body>
</html> </html>

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="en">
{% include head.html %} {% include head.html %}
@ -26,9 +26,7 @@
<div id="container"> <div id="container">
<main> <main>
{{ content }} {{ content }}
</main> </main>
<!-- Pagination links --> <!-- Pagination links -->
@ -41,13 +39,8 @@
{% for page in (1..paginator.total_pages) %} {% for page in (1..paginator.total_pages) %}
{% assign total = paginator.total_pages %} {% assign total = paginator.total_pages %}
{% if page == paginator.page %} {% if page == paginator.page %}
<p class="page-numbers-display">{{ page }} of {{total}}</p> <p class="page-numbers-display">{{ page }} of {{total}}</p>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@ -58,14 +51,14 @@
{% endif %} {% endif %}
</div> </div>
</div> </div><!-- div#container -->
<!-- Footer --> <!-- Footer -->
{% include footer.html %} {% include footer.html %}
<!-- Script --> <!-- Script -->
{% include script.html %} {% include script.html %}
</div> </div><!-- div#weekly -->
</div> </div><!-- div#wrap -->
</body> </body>
</html> </html>

View File

@ -1,4 +0,0 @@
---
---
@import "minima";

View File

@ -36,6 +36,7 @@
//background-color: lightblue; //background-color: lightblue;
//} //}
// Default Style (Dark)
:root { :root {
--primary-color: #888888; --primary-color: #888888;
--secondary-color: #666666; --secondary-color: #666666;
@ -45,11 +46,11 @@
--block-bg-color: #2f3234; --block-bg-color: #2f3234;
--block-bg-color-secondary: #444444; --block-bg-color-secondary: #444444;
--block-bg-color-heading: #333333; --block-bg-color-heading: #333333;
--table-color: #fff; --table-color: #cecece;
--head-nav-bg-color: transparent; --head-nav-bg-color: transparent;
--head-nav-text-color: #888888; --head-nav-text-color: #d56f2a;
} }
// Was entered incorrectly.. Dark = Light
[data-theme="dark"] { [data-theme="dark"] {
--primary-color: #666666; --primary-color: #666666;
--secondary-color: #555555; --secondary-color: #555555;
@ -59,7 +60,7 @@
--block-bg-color: #d7d7d7; --block-bg-color: #d7d7d7;
--block-bg-color-secondary: #c0c0c0; --block-bg-color-secondary: #c0c0c0;
--block-bg-color-heading: #a5a5a5; --block-bg-color-heading: #a5a5a5;
--table-color: #cecece; --table-color: #ffffff;
--head-nav-bg-color: transparent; --head-nav-bg-color: transparent;
--head-nav-text-color: #d56f2a; --head-nav-text-color: #d56f2a;
} }
@ -81,16 +82,16 @@ h1 {
a { a {
color: var(--primary-color); color: var(--primary-color);
} }
.moneroversary-table, .moneroversary-table,
.price-table { .price-table {
color: var(--table-color); color: var(--table-color);
} }
#weekly .revuo-classes a.wk {
background-color: var(--head-nav-bg-color);
color: var(--head-nav-text-color);
}
#periodical .revuo-classes a.pd, #wrap.periodical .revuo-classes a.pd:active, #wrap.periodical .revuo-classes a.pd:focus { #weekly .revuo-classes a.wk,
#periodical .revuo-classes a.pd,
#wrap.periodical .revuo-classes a.pd:active,
#wrap.periodical .revuo-classes a.pd:focus {
background-color: var(--head-nav-bg-color); background-color: var(--head-nav-bg-color);
color: var(--head-nav-text-color); color: var(--head-nav-text-color);
} }

View File

@ -5,15 +5,11 @@ image: /img/revuo-monero.png
--- ---
<!-- Posts --> <!-- Posts -->
<ul id="posts"> <ul id="posts">
{% for post in paginator.posts %} {% for post in paginator.posts %}
<li class="post"> <li class="post">
<h2><a href="{% if site.baseurl == "/" %}{{ post.url }}{% else %}{{ post.url | prepend: site.baseurl }}{% endif %}.html">{{ post.title }}</a></h2> <h2><a href="{% if site.baseurl == "/" %}{{ post.url }}{% else %}{{ post.url | prepend: site.baseurl }}{% endif %}.html">{{ post.title }}</a></h2>
<time datetime="{{ post.date | date_to_xmlschema }}" class="by-line">{{ post.date | date_to_string }}</time> <time datetime="{{ post.date | date_to_xmlschema }}" class="by-line">{{ post.date | date_to_string }}</time>
<p>{{ post.excerpt }}</p> <p>{{ post.excerpt }}</p>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>

View File

@ -19,8 +19,8 @@ function switchTheme(e) {
if (e.target.checked) { if (e.target.checked) {
document.documentElement.setAttribute('data-theme', 'dark'); document.documentElement.setAttribute('data-theme', 'dark');
localStorage.setItem('theme', 'dark'); localStorage.setItem('theme', 'dark');
} } else {
else { document.documentElement.setAttribute('data-theme', 'light'); document.documentElement.setAttribute('data-theme', 'light');
localStorage.setItem('theme', 'light'); localStorage.setItem('theme', 'light');
} }
} }