Skip to content

Commit

Permalink
Board stats migration fixes (#15)
Browse files Browse the repository at this point in the history
* replace hard-coded newest member gif with default avatar

* add .list class so styles target correctly

* remove placeholder recent topics, move real ones into place via utility script

* update recent topics style to suit unchangeable jcink-format

also part of #14
  • Loading branch information
thewildmage authored Jul 14, 2021
1 parent 10958b8 commit f6cc0a2
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 37 deletions.
6 changes: 5 additions & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@

Where a separate license is provided within a directory (as is the case, for example, with the included font Mont by Fontfabric Type Foundry), that license supercedes and fully replaces the ["Remaining"](#remaining) license below, and applies to all contents in the same and any nested directories.

## Jcink Utility Scripts

Jcink Utility Scripts by Coding Camp are used, but not included herein. A copy of the source may be downloaded from [GitHub](https://github.com/coding-camp-canteen/jcink-utility-scripts). This content is licensed under the [MIT License](https://github.com/coding-camp-canteen/jcink-utility-scripts/LICENSE).

## Work Sans Google Font

Works Sans is used, but not included herein. A copy of the source may be downloaded from [Google Fonts](https://fonts.google.com/specimen/Work+Sans). This content is licensed under the [SIL Open Font License Version 1.1](https://github.com/google/fonts/blob/main/ofl/worksans/OFL.txt).

## Mont by Fontfabric Type Foundry

Mont by Fontfabric Type Foundry is included herein. A copy of the source may be downloaded from [dafont.com](https://www.dafont.com/mont.font). This content is licensed under the [FontFabric (tm) Free Font End User License Agreement (FFF EULA) ver. 2.0 June 2015](/dist/assets/fonts/mont/FFF EULA ver. 2.0 June 2015.pdf).
Mont by Fontfabric Type Foundry is included herein. A copy of the source may be downloaded from [dafont.com](https://www.dafont.com/mont.font). This content is licensed under the [FontFabric (tm) Free Font End User License Agreement (FFF EULA) ver. 2.0 June 2015](</dist/assets/fonts/mont/FFF EULA ver. 2.0 June 2015.pdf>).

## Remix Icon

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Notes for later:
- RemixIcon needs to be uploaded to ACP file manager because of same-origin policy enforcment on `use` elements.
- Which also means that any place icons are `use`d, the URLs will need to be updated.
- `macros/AVATAR.html` and `macros/AVATAR_URL.html` should be updated with actual default avatar.
- Recent topics aren't enabled by default. System Settings/Topics, Posts, & Polls/Number of topics to show?

## How to Report a Bug

Expand Down
40 changes: 30 additions & 10 deletions dist/assets/stylesheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,40 @@ body {
box-sizing: border-box;
}

/*
-----
JCINK SPECIFIC
-----
*/

#recent-topics .maintitle {
display: none;
}

#recent-topics .recent-topics-date {
display: none;
}

#recent-topics .recent-topics-info {
border-bottom: 1px solid var(--black-hex);
display: block;
margin: 20px;
width: initial;
}

/*
-----
LEGOS
-----
*/

/*** WRAPPERS ***/
.wrapper {
width: min(calc(100vw - (var(--spacing) * 2)), 1500px);
margin: 50px auto;
background-color: var(--clear);
}

/* ----- LEGOS */
.lego-icon {
block-size: 1.25rem;
inline-size: 1.25rem;
Expand Down Expand Up @@ -894,14 +920,14 @@ body {
padding: 0px 10px;
}

.stats-wrap .online div {
.stats-wrap .online .list {
display: block;
text-transform: uppercase;
margin: 25px;
font-size: 12px;
}

.stats-wrap .online div a {
.stats-wrap .online .list a {
margin-right: 10px;
}

Expand Down Expand Up @@ -939,7 +965,7 @@ body {
border: 2px solid var(--black-hex);
}

.stats-wrap .topics div {
.stats-wrap .topics .list {
display: block;
height: 200px;
text-transform: uppercase;
Expand All @@ -948,12 +974,6 @@ body {
overflow: auto;
}

.stats-wrap .topics div .thread {
display: block;
margin: 20px;
border-bottom: 1px solid var(--black-hex);
}

/*** JULIET POST ROW ***/

.pr-wrap {
Expand Down
35 changes: 9 additions & 26 deletions dist/html-templates/board_stats.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<script
src="https://coding-camp-canteen.github.io/jcink-utility-scripts/dist/move-recent-topics/move-recent-topics.js"
defer
></script>

<div class="stats">
<div class="stats-title">
<span>BOARD STATS</span>
Expand Down Expand Up @@ -25,11 +30,7 @@
<div class="welcome">
<span>Welcome<br /><!-- |newest_member| --></span>

<div class="new-gif">
<img
src="https://media.discordapp.net/attachments/826160786778488873/855129703543603200/image0.gif"
/>
</div>
<div aria-hidden="true" class="new-gif"><{AVATAR}></div>
</div>
</div>
</div>
Expand All @@ -40,7 +41,7 @@
<div class="online">
<div class="now">Online Now</div>
<br />
<div>
<div class="list">
<!-- |online_list| -->
</div>
<div class="total">
Expand All @@ -60,7 +61,7 @@
<div class="online">
<div class="today">Online Today</div>
<br />
<div>
<div class="list">
<!-- |online_today_list| -->
</div>
<div class="total">
Expand All @@ -74,25 +75,7 @@
<div class="topics">
<div class="recent">Recent Topics</div>
<br />
<div>
<thread
><b>a new thread</b> by
<a>Aleksander Danvers</a></thread
>
<thread
><b>a new thread</b> by <a>LEONOR LYONS</a></thread
>
<thread
><b>a new thread</b> by <a>Maria Ejiofor</a></thread
>
<thread
><b>a new thread</b> by<a>damien travers</a></thread
>
<thread
><b>a new thread</b> by
<a>Charles Prentiss</a></thread
>
</div>
<div class="list" id="js-recent-topics-parent"></div>
</div>
</div>
</div>
Expand Down

0 comments on commit f6cc0a2

Please sign in to comment.