Skip to content

Commit c51b9e9

Browse files
ninjamuffin99ninjamuffin99
authored
Upgrade to Bootstrap 5(.3.3) (#243)
* bootstrap 5 in progress * buttons and stuff * more icons and buttons... * button positioning * removed bootstrap 3 * npm ci in github actions * node version 20 * no packagelog * npm install defaul
1 parent ca5653c commit c51b9e9

File tree

214 files changed

+889
-87025
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+889
-87025
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ npm-debug.log*
77
out
88
debug.log
99
.DS_Store
10+
package-log.json

‎11ty-source/_layouts/default.liquid

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33

44
{% comment %} <%- @partial('head.html.eco', {title:@getPreparedTitle()}, {description:@getPreparedDescription()}, {keywords:@getPreparedKeywords()}, {author:@site.author or ''}, {styles:@getBlock("styles").add(["/styles/style.css", "/vendor/highlightjs/styles/an-old-hope.min.css"]).toHTML()} ) %> {% endcomment %}
@@ -12,7 +12,7 @@
1212
{{ content }}
1313
</div>
1414

15-
{% renderFile "./11ty-source/_layouts/partials/footer.html" %}
15+
{% renderFile "./11ty-source/_layouts/partials/footer.liquid" %}
1616

1717
{% comment %} <%- @getBlock('scripts').add(@site.scripts).toHTML() %> {% endcomment %}
1818

‎11ty-source/_layouts/demo.liquid

+25-18
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
layout: default.liquid
33
---
44

5-
<br>
6-
<br>
7-
85
<div class="demo-container">
96
{% if targets == "html5" %}
107

@@ -37,22 +34,23 @@ layout: default.liquid
3734
<br>
3835

3936
<h1 class="title">{{ title }}</h1>
40-
41-
<a href="https://github.com/HaxeFlixel/flixel-demos/tree/dev/{{source}}/source" target="_blank" style="float: right;">
42-
<span class="glyphicon glyphicon-book"></span>
37+
<a class="btn icon-link float-end" href="https://github.com/HaxeFlixel/flixel-demos/tree/dev/{{source}}/source" target="_blank">
38+
<i class="bi-box-seam" ></i>
4339
source code
44-
</a>
45-
40+
</a>
4641
{{ content }}
4742

43+
44+
<br>
4845
<hr>
49-
50-
<ul class="pager">
46+
<div>
47+
<ul class="pagination pagination-lg justify-content-between">
5148

5249
{% assign prevDemo = collections.demo-item | getPreviousCollectionItem %}
5350
{% if prevDemo %}
54-
<li class="previous">
55-
<a href="{{prevDemo.url}}" title="Previous">
51+
<li class="page-item">
52+
<a class="page-link" href="{{prevDemo.url}}" title="Previous">
53+
<i class="bi-arrow-left-square"></i>
5654
{% capture imgURL %}src/files/images/demos/{{prevDemo.data.title}}.png{% endcapture %}
5755
{% image imgURL, "Previous", 70, 70 %}
5856
</a>
@@ -61,37 +59,46 @@ layout: default.liquid
6159

6260
{% unless prevDemo %}
6361
{% assign lastDemo = collections.demo-item | last %}
64-
<li class="previous">
65-
<a href="{{lastDemo.url}}" title="Previous">
62+
<li class="page-item">
63+
<a class="page-link" href="{{lastDemo.url}}" title="Previous">
64+
<i class="bi-arrow-left-square"></i>
6665
{% capture imgURL %}src/files/images/demos/{{lastDemo.data.title}}.png{% endcapture %}
6766
{% image imgURL, "Previous", 70, 70 %}
6867
</a>
6968
</li>
7069
{% endunless %}
70+
7171

7272
{% assign nextDemo = collections.demo-item | getNextCollectionItem %}
7373
{% if nextDemo %}
74-
<li class="next">
75-
<a href="{{ nextDemo.url }}" title="Next">
74+
<li class="page-item">
75+
76+
<a class="page-link" href="{{ nextDemo.url }}" title="Next">
7677
{% capture imgURL %}src/files/images/demos/{{ nextDemo.data.title }}.png{% endcapture %}
7778
{% image imgURL, "Next", 70, 70 %}
79+
<i class="bi-arrow-right-square"></i>
7880
</a>
7981
</li>
8082
{% endif %}
8183

8284
{% comment %} gets the first demo, if the "next" one doesn't exist {% endcomment %}
8385
{% unless nextDemo %}
8486
{% assign firstDemo = collections.demo-item | first %}
85-
<li class="next">
86-
<a href="{{ firstDemo.url }}" title="Next">
87+
<li class="page-item">
88+
89+
<a class="page-link" href="{{ firstDemo.url }}" title="Next">
90+
8791
{% capture imgURL %}src/files/images/demos/{{ firstDemo.data.title }}.png{% endcapture %}
8892
{% image imgURL, "Next", 70, 70 %}
93+
<i class="bi-arrow-right-square"></i>
8994
{% comment %} <img src="<%= @getThumbnail("/images/demos/#{@getFirst('demos').attributes.title}.png", "zoomcrop", { w:70, h:70 }) %>" alt="Next">
9095
> {% endcomment %}
9196
</a>
9297
</li>
9398
{% endunless %}
9499
</ul>
100+
</div>
101+
95102

96103
</div>
97104
</div>

‎11ty-source/_layouts/home.liquid

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{{ content }}
1313

1414

15-
{% renderFile "./11ty-source/_layouts/partials/footer.html" %}
15+
{% renderFile "./11ty-source/_layouts/partials/footer.liquid" %}
1616

1717
{% comment %} <%- @getBlock('scripts').add(@site.scripts).toHTML() %> {% endcomment %}
1818

‎11ty-source/_layouts/partials/footer.html ‎11ty-source/_layouts/partials/footer.liquid

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<footer>
22
<div class="footer-main">
3-
<div class=" container">
3+
<div class="container">
44

55
<div class="footer-social">
66

@@ -29,8 +29,8 @@
2929
} (document, "script", "twitter-wjs");</script>
3030

3131
</div>
32-
33-
<div class="footer-powered-by row">
32+
33+
<div class="footer-powered-by d-flex float-end align-items-center">
3434
<p>HaxeFlixel is powered by</p>
3535
<a href="https://haxe.org"><img src="/images/haxe.svg" alt="Haxe" title="Haxe"></a>
3636
+

‎11ty-source/_layouts/partials/head.liquid

+15-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
<head>
22

3-
<meta charset="utf-8"/>
4-
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
3+
<meta charset="utf-8" />
4+
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
66

7-
<title>{{ title }}</title>
7+
<title>{{ title }}</title>
88

9-
<meta name="description" content="HaxeFlixel is a 2D Game Engine that lets you create cross-platform games easier with free, open source technology!"/>
10-
<meta name="keywords" content="<%= @keywords %>"/>
11-
<meta name="author" content="<%= @author %>"/>
12-
<meta name="viewport" content="width=device-width"/>
9+
<meta name="description" content="HaxeFlixel is a 2D Game Engine that lets you create cross-platform games easier with free, open source technology!" />
10+
<meta name="keywords" content="<%= @keywords %>" />
11+
<meta name="author" content="<%= @author %>" />
12+
<meta name="viewport" content="width=device-width, initial-scale=1">
1313

14-
<link rel="icon" href="/images/haxeflixel.svg">
15-
<link rel="shortcut icon" href="/images/favicon.ico">
14+
<link rel="icon" href="/images/haxeflixel.svg">
15+
<link rel="shortcut icon" href="/images/favicon.ico">
1616

17-
<!--[if lt IE 9]>
18-
<script async src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
19-
<![endif]-->
20-
21-
{% comment %} <%- @styles %> {% endcomment %}
22-
<link rel="stylesheet" href="/styles/style.css">
23-
24-
</head>
17+
<!-- [if lt IE 9]>
18+
<script async src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif] -->
19+
{% comment %} <%- @styles %> {% endcomment %}
20+
<link rel="stylesheet" href="/styles/style.css">
21+
</head>

‎11ty-source/_layouts/partials/header-menu.liquid

+77-61
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,79 @@
11
<header>
2-
<nav>
3-
4-
<div class="navbar navbar-inverse navbar-fixed-top">
5-
<div class="container">
6-
7-
<div class="navbar-header">
8-
<button data-target=".navbar-collapse" data-toggle="collapse" class="navbar-toggle" type="button">
9-
<span class="icon-bar" />
10-
<span class="icon-bar" />
11-
<span class="icon-bar" />
12-
</button>
13-
<a href="/" class="navbar-brand"><img src="/images/haxeflixel-header.svg" height="31" alt="HaxeFlixel" /></a>
14-
</div>
15-
16-
<div class="navbar-collapse collapse">
17-
18-
<ul class="nav navbar-nav">
19-
20-
<li class="dropdown {% dropdownActive 'demos' %}">
21-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Examples <span class="caret"></span></a>
22-
<ul class="dropdown-menu inverse-dropdown">
23-
<li><a href="/demos">Demos</a></li>
24-
<li><a href="https://snippets.haxeflixel.com/">Snippets</a></li>
25-
</ul>
26-
</li>
27-
28-
<li class={% dropdownActive 'showcase' %}>
29-
<a href="/showcase">Showcase</a>
30-
</li>
31-
32-
{% comment %} <li <%= @ablog %>> {% endcomment %}
33-
<li class={% dropdownActive 'blog' %}>
34-
<a href="/blog">Blog</a>
35-
</li>
36-
37-
{% comment %} <li <%= @adocs %>> {% endcomment %}
38-
<li class={% dropdownActive 'documentation' %}>
39-
<a href="/documentation">Docs</a>
40-
</li>
41-
42-
<li >
43-
<a href="http://api.haxeflixel.com">API</a>
44-
</li>
45-
46-
{% comment %} <li <%= @aforum %>> {% endcomment %}
47-
<li>
48-
<a href="https://github.com/HaxeFlixel/flixel/discussions">Forum</a>
49-
</li>
50-
51-
</ul>
52-
53-
{% renderFile "./11ty-source/_layouts/partials/search.html" %}
54-
{% comment %} <%- @partial('search.html') %> {% endcomment %}
55-
56-
</div>
57-
58-
</div>
59-
60-
</div>
61-
62-
</nav>
2+
<nav class="navbar navbar-expand-lg bg-body-tertiary">
3+
<div class="container-fluid">
4+
5+
<a href="/" class="navbar-brand"><img
6+
src="/images/haxeflixel-header.svg"
7+
height="31"
8+
alt="HaxeFlixel" /></a>
9+
10+
<button
11+
class="navbar-toggler"
12+
type="button"
13+
data-bs-toggle="collapse"
14+
data-bs-target="#navbarSupportedContent"
15+
aria-controls="navbarSupportedContent"
16+
aria-expanded="false"
17+
aria-label="Toggle navigation">
18+
<span class="navbar-toggler-icon"></span>
19+
</button>
20+
21+
22+
<div class="collapse navbar-collapse" id="navbarNavDropdown">
23+
24+
<ul class="navbar-nav">
25+
26+
<li class="nav-item dropdown {% dropdownActive 'demos' %}">
27+
<a
28+
href="#"
29+
class="nav-link dropdown-toggle"
30+
data-bs-toggle="dropdown"
31+
role="button"
32+
aria-expanded="false">Examples
33+
<span class="caret"></span>
34+
</a>
35+
<ul class="dropdown-menu inverse-dropdown">
36+
<li>
37+
<a class="dropdown-item" href="/demos">Demos</a>
38+
</li>
39+
<li>
40+
<a class="dropdown-item" href="https://snippets.haxeflixel.com/">Snippets</a>
41+
</li>
42+
</ul>
43+
</li>
44+
45+
<li class="nav-item {% dropdownActive 'showcase' %}">
46+
<a class="nav-link" href="/showcase">Showcase</a>
47+
</li>
48+
49+
{% comment %} <li <%= @ablog %>> {% endcomment %}
50+
<li class="nav-item {% dropdownActive 'blog' %}">
51+
<a class="nav-link" href="/blog">Blog</a>
52+
</li>
53+
54+
{% comment %} <li <%= @adocs %>> {% endcomment %}
55+
<li class="nav-item {% dropdownActive 'documentation' %}">
56+
<a class="nav-link" href="/documentation">Docs</a>
57+
</li>
58+
59+
<li class="nav-item">
60+
<a class="nav-link" href="http://api.haxeflixel.com">API</a>
61+
</li>
62+
63+
{% comment %} <li <%= @aforum %>> {% endcomment %}
64+
<li class="nav-item">
65+
<a class="nav-link" href="https://github.com/HaxeFlixel/flixel/discussions">Forum</a>
66+
</li>
67+
68+
</ul>
69+
70+
{% renderFile "./11ty-source/_layouts/partials/search.html" %}
71+
{% comment %} <%- @partial('search.html') %> {% endcomment %}
72+
73+
</div>
74+
75+
</div>
76+
77+
78+
</nav>
6379
</header>

‎11ty-source/cdn-scripts.liquid

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
2-
<script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
1+
<script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
2+
<script
3+
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
4+
integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
5+
crossorigin="anonymous"></script>

‎11ty-source/index.liquid

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: 'home'
33
title: 'Home'
44
---
55

6-
<div class="container">
6+
<div class="container text-center">
77
<div class="home-header home-section">
88

99
<a href="/documentation/about" class="home-big-logo" title="About HaxeFlixel">
@@ -14,10 +14,10 @@ title: 'Home'
1414

1515
<p class="lead-line">Create cross-platform games easier and free.<br> All with one codebase.</p>
1616

17-
<p>
18-
<a class="home-button" href="/documentation/getting-started">Getting Started</a>
19-
<a class="home-button" href="https://github.com/HaxeFlixel">GitHub</a>
20-
</p>
17+
<div class="d-flex justify-content-around">
18+
<a role="button" class="btn btn-outline-primary btn-lg" href="/documentation/getting-started">Getting Started <i class="bi-list-ol" ></i></a>
19+
<a role="button" class="btn btn-outline-primary btn-lg" href="https://github.com/HaxeFlixel">GitHub <i class="bi-github" ></i></a>
20+
</div>
2121

2222
<hr class="backer-hr">
2323

@@ -100,7 +100,7 @@ title: 'Home'
100100

101101
<br/>
102102

103-
<a href="https://haxe.org"><img src="/images/haxe.svg" alt="Haxe Logo" title="Haxe" height="120"></a>
103+
<a href="https://haxe.org" data-bs-toggle="tooltip" data-bs-title="Default tooltip"><img src="/images/haxe.svg" alt="Haxe Logo" title="Haxe" height="120"></a>
104104

105105
<span><b>+</b></span>
106106

@@ -146,7 +146,7 @@ title: 'Home'
146146

147147
<br />
148148

149-
<a class="home-button sponsors-button" href="/sponsors">
149+
<a class="btn btn-primary btn-lg" href="/sponsors">
150150
See all our Sponsors
151151
</a>
152152

‎11ty-source/scripts.njk

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
---
22
permalink: 11ty-bundle.js
33
---
4-
5-
{% include "../src/files/vendor/twitter-bootstrap-3/js/dropdown.js"%}
6-
{% include "../src/files/vendor/twitter-bootstrap-3/js/transition.js"%}
7-
{% include "../src/files/vendor/twitter-bootstrap-3/js/collapse.js"%}

0 commit comments

Comments
 (0)