Skip to content

Commit db32176

Browse files
ninjamuffin99Kade-github
authored andcommitted
Funkin' Branding + QOL
dont cache anything in http-server Std.instance() -> Std.downcast() (fixes deprecation warning?) add vscode file association for .mtt files -> .html funkin branding make it easier to test/build the site and styles Co-Authored-By: Cameron Taylor <[email protected]>
1 parent ee77c1a commit db32176

File tree

17 files changed

+2260
-102
lines changed

17 files changed

+2260
-102
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,8 @@ jobs:
3939
haxelib install highlighting.hxml --always --quiet
4040
haxelib list
4141
42-
- name: Make build.sh executable
43-
run: chmod +x build.sh
44-
4542
- name: Run build script
46-
run: ./build.sh
43+
run: haxe build.hxml
4744

4845
- name: Upload build artifacts (optional)
4946
uses: actions/upload-artifact@v4

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{"files.associations": {
2+
"*.mtt": "html"
3+
}
4+
}

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ Install from npm:
2424
npm install
2525
```
2626

27-
Either run `build.bat` or `build.sh` depending on your platform.
28-
29-
(joke is, they're the same file)
27+
Run `haxe build.hxml`.
3028

3129
The main repo tells users to run it through neko, so we do that as well. But we also run highlighting.hxml for the code highlighting.
3230

assets/content/layout.mtt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<link rel="stylesheet" type="text/css" href="css/haxe-nav.min.css" />
1414
<link rel="stylesheet" type="text/css" href="css/fonts.min.css" />
1515

16-
<link rel="icon" href="https://haxe.org/favicon.ico" />
16+
<link rel="icon" href="ico/favicon.ico" />
1717
<link rel="canonical" href="::currentPage.absoluteUrl::" ::cond currentPage.absoluteUrl != null:: />
1818
<link href="::basePath::rss.xml" rel="alternate" type="application/atom+xml" title="RSS Feed Friday Night Funkin' Cookbook" />
1919

@@ -56,8 +56,8 @@
5656
<nav class="section nav dark">
5757
<div class="navbar navbar-fixed-top navbar-inverse">
5858
<div class="navbar-inner">
59-
<button class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse" type="button"><span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button> <a class="brand haxe-logo" href="https://haxe.org/"><img alt="Haxe" height="21" onerror="this.src='https://haxe.org/img/haxe-logo-horizontal-on-dark.png'" src="https://haxe.org/img/haxe-logo-horizontal-on-dark.svg" width="107" /></a>
60-
<a class="brand sub ide" href="./">Friday Night Funkin'</a>
59+
<button class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse" type="button"><span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button> <a class="brand haxe-logo" href="https://funkin.me/"><img alt="Funkin' Cookbook" height="21" onerror="this.src='img/funkin-cookbook-logo.png'" src="svg/funkin-logo-export.svg" width="150" /></a>
60+
<a class="brand sub ide" href="./">CODE</a>
6161

6262
<div class="nav-collapse collapse">
6363
<ul class="nav">
@@ -75,6 +75,9 @@
7575
</ul>
7676
</li>
7777
<li class="divider"></li>
78+
<li>
79+
<a class="sub" href="https://thekade.net/funkin-api/funkin/">Documentation</a>
80+
</li>
7881
</ul>
7982
</div>
8083
</div>
@@ -87,7 +90,7 @@
8790
<div class="container">
8891
<div class="copyright">
8992
<p>
90-
&copy;::DateTools.format(now, "%Y")::&nbsp;<a class="hf-link" href="https://funkin.me/" rel="external nofollow noopener" title="Funkin' Crew Website">The Funkin' Crew</a> |
93+
&copy;::DateTools.format(now, "%Y")::&nbsp;<a class="hf-link" href="https://funkin.me/" rel="external nofollow noopener" title="Funkin' Crew Inc Website">The Funkin' Crew Inc.</a> |
9194
&nbsp;Created with <a href="https://github.com/HaxeFoundation/code-cookbook" title="Haxe Code Cookbook on GitHub" rel="external nofollow noopener">Code Cookbook on GitHub</a>
9295
</p>
9396
<p class="last-modified">Last deploy: ::DateTools.format(now, "%b %d, %Y")::</p>

assets/includes/css/haxe-nav.css

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ nav .navbar .nav>li>.dropdown-menu:after {
9494

9595
/** SUB BRAND LOGOS **/
9696

97-
.navbar .brand.haxe-logo { padding-right:0; margin: 3px 0 0 0px; }
97+
.navbar .brand.haxe-logo { position:relative; padding-right:0; margin: 3px 0 0 0px; right: 5px; }
9898
.navbar .brand.haxe-logo:hover { opacity:.9; }
9999

100100
.navbar .brand.haxe-logo:after {
@@ -103,6 +103,7 @@ nav .navbar .nav>li>.dropdown-menu:after {
103103
/* create arrow */
104104
width: 0;
105105
height: 0;
106+
margin:0 5px 0 5px;
106107
border-top: 22px solid transparent;
107108
border-bottom: 22px solid transparent;
108109
border-left: 7px solid #13110f; /* same color as nav bar */
@@ -119,7 +120,7 @@ nav .navbar .nav>li>.dropdown-menu:after {
119120
padding:14px 20px 13px 20px;
120121
margin:0 10px 0 0;
121122
font:bold 18px "arial black", "open sans";
122-
line-height:22px;
123+
line-height:26px;
123124
color:rgb(255,255,255);
124125
}
125126
.navbar .brand.sub:hover {
@@ -128,7 +129,6 @@ nav .navbar .nav>li>.dropdown-menu:after {
128129
}
129130

130131
.navbar .brand.sub:before {
131-
content:".."; /* two dots */
132132
position:absolute;
133133
margin-left:-33px;
134134
margin-top:-28px;
@@ -138,6 +138,16 @@ nav .navbar .nav>li>.dropdown-menu:after {
138138
color:#fff200;
139139
}
140140

141+
.navbar .sub {
142+
text-shadow: 1px 1px 3px #000;
143+
144+
margin-left: -10px;
145+
146+
font: 18px "Open Sans", sans-serif;
147+
line-height:22px;
148+
color:rgb(255,255,255);
149+
}
150+
141151
/** SUB BRAND COLORS **/
142152

143153
.navbar .brand.sub.try:before {

assets/includes/css/haxe-nav.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/includes/ico/favicon.ico

11 KB
Binary file not shown.
1.96 KB
Loading
Lines changed: 57 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)