Skip to content

Commit

Permalink
Merge pull request #49 from NotFenixio/main
Browse files Browse the repository at this point in the history
Changing those ugly scrollbars into prettier ones
  • Loading branch information
redstone-dev authored Aug 8, 2023
2 parents 4515e81 + 90f9e0e commit 349bb66
Show file tree
Hide file tree
Showing 8 changed files with 509 additions and 432 deletions.
764 changes: 387 additions & 377 deletions static/master-styles.css

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions static/styles-choco.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ body {
background-color: #282320;
}

::-webkit-scrollbar-thumb {
background: #b75d24;
border-radius: 10px;
}

::-webkit-scrollbar-thumb:hover {
background: #91491d;
}
h1,
h2,
h3,
Expand Down
13 changes: 11 additions & 2 deletions static/styles-gruvbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ body {
background-color: #282828;
}

::-webkit-scrollbar-thumb {
background: #4a423f;
border-radius: 10px;
}

::-webkit-scrollbar-thumb:hover {
background: #3f3836;
}

.omni {
margin-left: 10em;
margin-right: 10em;
Expand Down Expand Up @@ -319,12 +328,12 @@ section {
margin: 0.1em;
background: #3c3836;
padding: 10px;
border-radius: 10px;
border-radius: 20px;
color: #fbf1c7;
border: 6px solid #3c3836;
}

section:first-child:not(.width-third) {
border: 6px solid #3c3836;
background: transparent;
}

Expand Down
9 changes: 9 additions & 0 deletions static/styles-hackerman.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ body {
color: lime;
}

::-webkit-scrollbar-thumb {
background: #083d00;
border-radius: 10px;
}

::-webkit-scrollbar-thumb:hover {
background: #062e00;
}

* {
border-radius: 0px !important
}
Expand Down
9 changes: 9 additions & 0 deletions static/styles-ice.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ body {
background-color: #202d38;
}

::-webkit-scrollbar-thumb {
background: #585d61;
border-radius: 10px;
}

::-webkit-scrollbar-thumb:hover {
background: #43484c;
}

h1,
h2,
h3,
Expand Down
9 changes: 9 additions & 0 deletions static/styles-newspaper.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ body {
background-color: #c8c8c8;
}

::-webkit-scrollbar-thumb {
background: #ffffff;
border-radius: 10px;
}

::-webkit-scrollbar-thumb:hover {
background: #bababa;
}

h1,
h2,
h3,
Expand Down
9 changes: 9 additions & 0 deletions static/styles-nord.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ body {
background-color: #2e3440;
}

::-webkit-scrollbar-thumb {
background: #3f4655;
border-radius: 10px;
}

::-webkit-scrollbar-thumb:hover {
background: #292e38;
}

h1,
h2,
h3,
Expand Down
120 changes: 67 additions & 53 deletions templates/forums.html
Original file line number Diff line number Diff line change
@@ -1,58 +1,72 @@
{% extends "_base.html" %}

{% block title %}Forums{% endblock %}

{% block content %}

<div class="omni">

<section>
<h1>Forum Browser</h1>
<p>Browse the Scratch forums</p>
<p>Note: may be slow (pfps take a while to load)</p>
</section>

{% if pinned_subforums %}
<section>
<h2>Pinned subforums</h2>
<div class="scrollpane sp-forum">
{% for subforum in pinned_subforums %}
<div class="sp-item">
<p>
<a href="unpin-subforum/{{subforum}}" class="unpin-btn"><i class="fa-solid fa-thumbtack pin-icon"></i></a>
<a href="forums/{{subforum}}?page=0">{{ subforum }}</a>
<a href="unpin-subforum/{{subforum}}" class="unpin-btn"><button>Unpin</button></a>
</p>
</div>
{% endfor %}
</div>
</section>
{% endif %}

{% for title, subforums in data %}
<section>
<h2>{{ title }}</h2>
<div class="scrollpane sp-forum sp-vert">
{% for subforum in subforums %}
<div class="sp-item">
<p>
<a href="forums/{{subforum}}?page=0">{{ subforum }}</a>
<a href="pin-subforum/{{subforum}}">
{% if not subforum in pinned_subforums %}
<i class="fa-solid fa-thumbtack pin-btn"></i>
{% else %}
<span class="pin-btn">Already pinned</span>
{% endif %}
</a>
</p>
</div>
{% endfor %}
</div>
</section>
{% endfor %}

<section>
<button>Change signature (not functional yet)</button>
</section>
<section>
<h1>Forum Browser</h1>
<a href="{{ url_for('saved_posts') }}">View saved posts</a>
</section>
{% if pinned_subforums %}
<section>
<h2>Pinned subforums</h2>
<div class="scrollpane sp-forum">
{% for subforum in pinned_subforums %}
<div class="sp-item">
<p>
<a href="unpin-subforum/{{subforum}}" class="unpin-btn"><i class="fa-solid fa-thumbtack pin-icon"></i></a>
<a href="forums/{{subforum}}?page=0">{{ subforum }}</a>
<a href="unpin-subforum/{{subforum}}" class="unpin-btn"><button>Unpin</button></a>
</p>
</div>
{% endfor %}
</div>
</section>
{% endif %}
{% for title, subforums in data %}
{% if title == "Welcome" or title == "Interests Beyond Scratch" %}
<section>
<h2>{{ title }}</h2>
<div class="scrollpane sp-forum sp-vert" style="overflow: hidden;">
{% for subforum in subforums %}
<div class="sp-item">
<p>
<a href="forums/{{subforum}}?page=0">{{ subforum }}</a>
<a href="pin-subforum/{{subforum}}">
{% if not subforum in pinned_subforums %}
<i class="fa-solid fa-thumbtack pin-btn"></i>
{% else %}
<span class="pin-btn">Already pinned</span>
{% endif %}
</a>
</p>
</div>
{% endfor %}
</div>
</section>
{% else %}
<section>
<h2>{{ title }}</h2>
<div class="scrollpane sp-forum sp-vert">
{% for subforum in subforums %}
<div class="sp-item">
<p>
<a href="forums/{{subforum}}?page=0">{{ subforum }}</a>
<a href="pin-subforum/{{subforum}}">
{% if not subforum in pinned_subforums %}
<i class="fa-solid fa-thumbtack pin-btn"></i>
{% else %}
<span class="pin-btn">Already pinned</span>
{% endif %}
</a>
</p>
</div>
{% endfor %}
</div>
</section>
{% endif %}
{% endfor %}
<section>
<button>Change signature (not functional yet)</button>
</section>
</div>
{% endblock %}
{% endblock %}

0 comments on commit 349bb66

Please sign in to comment.