Skip to content

Commit 178e241

Browse files
authored
Merge pull request #13 from proplayer919/main
General improvements, formatting, readability, etc
2 parents 1bef82a + 3389bc1 commit 178e241

File tree

18 files changed

+452
-418
lines changed

18 files changed

+452
-418
lines changed

.github/workflows/deploy.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
on:
22
push:
33
branches:
4-
- main # Only trigger on changes to the 'main' branch
4+
- main # Only trigger on changes to the 'main' branch
55

66
jobs:
77
deploy:
@@ -17,8 +17,8 @@ jobs:
1717
- name: Deploy to Neocities
1818
uses: bcomnes/deploy-to-neocities@v3
1919
with:
20-
api_key: ${{ secrets.NEOCITIES_API_TOKEN }} # Use secret for Neocities API key
21-
cleanup: true # Set to true to remove orphaned files on Neocities
22-
neocities_supporter: false # Set to true if you have a supporter account
23-
preview_before_deploy: true # Optional: preview the deployment plan before applying
24-
dist_dir: '.' # Deploy everything from the root directory
20+
api_key: ${{ secrets.NEOCITIES_API_TOKEN }} # Use secret for Neocities API key
21+
cleanup: true # Set to true to remove orphaned files on Neocities
22+
neocities_supporter: false # Set to true if you have a supporter account
23+
preview_before_deploy: true # Optional: preview the deployment plan before applying
24+
dist_dir: "." # Deploy everything from the root directory

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.vscode
2+
*.code-workspace
3+
node_modules
4+
dist
5+
.env
6+
.DS_Store
7+
coverage

.vscode/settings.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

.well-known/atproto-did

Lines changed: 0 additions & 1 deletion
This file was deleted.

README.md

Lines changed: 60 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,158 +1,96 @@
1-
![Ferret's Corner](https://ferretosan.neocities.org/artwork.png)
1+
# Ferretosan Website
22

3-
<details open>
4-
<summary><h1>About This Repo</h1></summary>
3+
Welcome to the Ferretosan website repository! This project features a retro pixel art aesthetic and is built with pure HTML, CSS, and JavaScript.
54

6-
The amazing website of Ferretosan. (The artwork is better than the actual website though lol)
5+
## About
76

8-
Feel free to contribute to this project and fix the 7 billion bugs. 🐛 Make sure to read the contribution guidelines before contributing ofc.
7+
This site showcases Ferretosan's artwork and web design. Contributions are welcome to help improve the site and fix bugs. Some code is AI-generated.
98

10-
Parts of this code are AI generated.
9+
## Contribution Guidelines
1110

12-
</details>
11+
Before contributing, please read the following:
1312

14-
<details>
15-
<summary><h1>Contribution</h1></summary>
13+
- Only submit code suitable for a personal website (no inappropriate content).
14+
- Not all contributions may be accepted or used.
15+
- Major framework changes are discouraged; keep it pure HTML/CSS/JS.
16+
- Your code may be modified or removed as needed.
1617

17-
Before contributing to Ferret's corner, make sure to read these things:
18+
### Contributors
1819

19-
* Please only add code that you would want personally on your website (no obscene things, etc)
20-
* Your code may just be like not used, sorry, I can't spend all day and all night accepting PRs
21-
* Because I suck, I might delete your code (this relates to what I said above)
22-
* Don't completely change the framework or something I want to keep it just PURE HTML/CSS/JS
20+
- [Ferretosan](https://github.com/ferretosan)
21+
- [proplayer919](https://github.com/proplayer919)
2322

24-
## AWESOME Contributors
25-
* [Ferretosan](https://github.com/ferretosan)
23+
## Patch Notes
2624

27-
</details>
25+
### Versioning
2826

29-
<details>
30-
<summary><h1>Patch Notes</h1></summary>
27+
- **Major Release (1.0.0):** Significant redesigns or layout changes.
28+
- **Minor Release (0.1.0):** Noticeable changes, such as background or feature updates.
29+
- **Patch Release (0.0.1):** Small fixes or additions.
3130

32-
<details>
33-
<summary><h2>How patch notes work</h2></summary>
31+
### Release 9.x.x
3432

35-
* The first number (x.y.y - x is the number) is the website's **major release**. This basically is each time the website drastically changes, like whole new `style.css`, layouts, etc. Currently we're on version 9!
36-
* The second number (y.x.y) is the minor release. This is where I make a change that is noticeable, but not changing the whole thing. This could be like a background change or even just working on the website with different goals, etc. I'm not bothering to put the latest minor release in here as it is quite fickle.
37-
* The third number (y.y.x) is the patch release. This number goes up every time I make a new version of the website. Like a minor `style.css` change or adding some stuffs, idk I forgot what I was going to write here!
33+
#### 9.1.1 - Pixel Art
3834

39-
</details>
35+
- Placeholder for future pixel art additions.
4036

41-
<details>
42-
<summary><h2>Release 9.0.x</h2></summary>
37+
#### 9.1.0 - Banner Image
4338

44-
### 9.1.1 - Pixel Art
39+
- Added a banner image and minor CSS updates.
4540

46-
* no pixel art yet tho lmao
41+
#### 9.0.0 - Complete Retro Redesign & Modern Features
4742

48-
### 9.1.0 - Banner Image
43+
- Major visual overhaul with pixel art style.
44+
- Custom font integration.
45+
- Simplified background and sharp, pixelated edges.
46+
- Responsive grid layouts for albums and photos.
47+
- Retro 88x31 button collection.
48+
- Scroll animations using Intersection Observer.
49+
- Improved navigation and UX.
50+
- External CSS file for styles.
51+
- Enhanced typography and accessibility.
52+
- Retro gaming-inspired UI.
4953

50-
* literrally just added a banner image and some simple css changes
54+
### Release 8.x.x
5155

52-
### 9.0.0 - Complete Retro Redesign & Modern Features
56+
#### 8.0.2 - Layout
5357

54-
* **🎨 Major Visual Overhaul**
55-
* Complete redesign from pastel playful to retro pixel art aesthetic
56-
* New custom font integration (Basiic font)
57-
* Dark purple gradient background simplified to solid color
58-
* Removed all rounded corners for sharp, pixelated edges
59-
* Chunky borders and offset box shadows for retro game UI feel
58+
- Layout adjustments.
59+
- Added webring.
6060

61-
* **🖼️ Image & Media Improvements**
62-
* Proper img tags for all Unsplash photos (no more plain URLs!)
63-
* Added pixelated rendering for album covers to preserve pixel art quality
64-
* Responsive grid layouts for both albums and photos
65-
* Hover effects with translate animations instead of scaling
61+
#### 8.0.1 - Mobile
6662

67-
* **🎛️ 88x31 Button Collection**
68-
* Added entire collection of retro 88x31 buttons
69-
* Includes HTML5, Any Browser, Firefox, Discord, Apple, and more
70-
* Positioned prominently under intro text
71-
* Proper pixelated rendering and hover effects
63+
- Improved responsive design.
64+
- Re-added collapsible headings.
7265

73-
* **✨ Scroll Animations**
74-
* Intersection Observer-based scroll animations
75-
* Fade-in, slide-in-left, slide-in-right, and scale-in effects
76-
* Staggered timing for smooth progressive reveals
77-
* Performance optimized with modern browser APIs
66+
#### 8.0.0
7867

79-
* **🔗 Navigation & UX Improvements**
80-
* Hash-based anchor navigation for smooth scrolling
81-
* Restructured links - entire list items now clickable (a > li instead of li > a)
82-
* Updated social media links with proper URLs
83-
* Improved hover states and visual feedback
68+
- Added sidebars and supporting website ads.
69+
- Reintroduced blog and music pages.
70+
- New layout.
8471

85-
* **📁 Code Organization**
86-
* Moved all styles to external CSS file (style.css)
87-
* Clean separation of HTML structure and styling
88-
* Simplified CSS without complex gradients and transparency
72+
### Release 7.1.x
8973

90-
* **🌐 Typography & Accessibility**
91-
* Monospace Courier New fallback for retro feel
92-
* Improved text shadows and contrast
93-
* Better font weight and sizing hierarchy
94-
* Custom scrollbar styling
74+
#### 7.1.5
9575

96-
* **🎮 Retro Gaming Aesthetic**
97-
* Chunky pixel art borders throughout
98-
* Blocky button interactions
99-
* Terminal/console inspired color palette
100-
* No rounded corners anywhere for authentic pixel feel
76+
- Improved patch notes formatting.
10177

102-
</details>
78+
#### 7.1.4
10379

104-
<details>
105-
<summary><h2>Release 8.0.x</h2></summary>
80+
- Added patch notes section.
10681

107-
### 8.0.2 - Layout
82+
#### 7.1.3
10883

109-
* Changed the layout a little
110-
* Added "god fucking dammit kris where the fuck are we" webring
84+
- Cleaned up styling.
85+
- Added ASCII art to sections.
11186

112-
### 8.0.1 - Mobile
87+
#### 7.1.2/7.1.1
11388

114-
* Responsive design ig
115-
* Also i re-added the collapsing headings cuz why not
89+
- Updated metadata and styling.
90+
- Changed background.
91+
- New blog post styling.
11692

117-
### 8.0.0 (Patch Revision 1)
93+
#### 7.1.0
11894

119-
* Added sidebars
120-
* Ringlink/NavLink Ads
121-
* For supporting websites btw
122-
* Readded pages
123-
* Blog
124-
* Music
125-
* Oh yea, a NEW ENTIRE LAYOUT
126-
127-
</details>
128-
129-
<details>
130-
<summary><h2>Release 7.1.x</h2></summary>
131-
132-
### 7.1.5 - Making the patch notes look more beefier!
133-
134-
* Basically just removed the collapsible feature
135-
136-
### 7.1.4 - Patch notes...
137-
138-
* *FINALLY* added patch notes
139-
140-
### 7.1.3 - Style.css cuteness level = 10000!
141-
142-
* Cleaned up styling
143-
* Added some cute ASCII art to the sections
144-
145-
### 7.1.2/7.1.1 - Metadata and styling!
146-
147-
* Worked on metadata
148-
* Changed background
149-
* Added new styling for blog posts
150-
151-
### 7.1.0 - Backgrounds and socials!
152-
153-
* Added background
154-
* Added image cards (taken from VoxelCube1/voxelcube1.gihthub.io)
155-
156-
</details>
157-
158-
</details>
95+
- Added background and image cards.
96+
- Updated social links.

blog/aesprite.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ I've heard of Aseprite before and before, so it was my first idea when I needed
1010

1111
But, alas, I bought Aseprite - and that's where I am today.
1212

13-
Yes ikik little blog post womp womp
13+
Yes ikik little blog post womp womp

blog/chromebooks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ I hate Chromebooks. I mean, they're supposedly the fastest computer that can run
44

55
Today I'm going to cover why I absolutely hate Chromebooks, and what could redeem them.
66

7-
## Why I hate them.
7+
## Why I hate them
88

99
Chromebooks may seem like some amazing things that will let you browse the web with ease. Let me tell you a funny story.
1010

1111
I had to do a science project and I needed to have an encyvlopedia and Google Docs open. I opened my Google Docs thing, and it was already starting to lag with nothing else open. I opened the encyclopedia, and ... nothing happened when I moved the mouse. I managed to actively crash a Chromebook with 2 tabs.
1212

13-
### Lightning round!
13+
### Lightning round
1414

1515
Number 1. There's good Chromebooks ... that are garbage. Even the so-called good chromebooks with like 8gb ram and a decent processor fail to run YouTube and Google Docs. A good analogy ChatGPT gave me is that's a digital whack-a-mole. To be honest, very true.
1616

blog/mcjob.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## Introduction
22

33
So, do you choose Minecraft Java Edition or Minecraft Bedrock Edition? Well, there are reasons for both, and I'll cover why you might choose one or another. But, this might be a little bit biasted because I am a massive Java player on Prism.
4+
45
## Bedrock Edition
56

67
It's no secret that Microsoft is trying to make Bedrock the main version of Minecraft, and for a big reason. Bedrock is being pushed forward because it is on almost any device and operating system, except for Linux and Mac. Another reason is that Bedrock is more profitable - look at the marketplace! A texture pack for 30 dollars!? Why do I have to pay? Yes, you can manually find some on some very strange websites, but just why?
@@ -11,7 +12,7 @@ And then, if you want to truly customize your experience with mods, then you hav
1112

1213
What if you want to play an older version? You can't. So, you now pay for a game to not be able to enjoy it, and can't play older versions for some old memories, I think that Microsoft is torturing their very fragile playerbase. Well, you can - but do you really want to visit some really sketchy sites? Oh, you don't? Too bad, so sad.
1314

14-
##Java Edition
15+
## Java Edition
1516

1617
Java Editon was the first version of Minecraft, so it but be better - and it is. Very, very better. But, every good thing has problems. Let's start with optimization. Java Editon runs on outdated OpenGL technology, so it is bound to be slow as OpenGL was originally made for Windows 98, so from 1998 - that's a long time ago! Even on decent hardware, you can be expecting around 60 frames per second on deafult settings. That's not very good. But, with some amazing mods, you can be expecting around 300 frames - much better!
1718

File renamed without changes.

0 commit comments

Comments
 (0)