Skip to content

Commit cb42a41

Browse files
committed
Update for Jekyll 4 and major cleanup
1 parent 32dc600 commit cb42a41

Some content is hidden

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

54 files changed

+39
-3612
lines changed

Gemfile

+5-23
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,13 @@
11
source "https://rubygems.org"
22

3-
# Hello! This is where you manage which Jekyll version is used to run.
4-
# When you want to use a different version, change it below, save the
5-
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
6-
#
7-
# bundle exec jekyll serve
8-
#
9-
# This will help ensure the proper Jekyll version is running.
10-
# Happy Jekylling!
11-
gem "jekyll", "~> 3.8.5"
3+
gem "jekyll", "~> 4.0"
124

13-
# If you have any plugins, put them here!
145
group :jekyll_plugins do
15-
gem "jekyll-feed"
16-
gem "jekyll-minifier"
17-
gem "jekyll-assets"
18-
gem "jekyll-paginate"
196
gem "bootstrap-sass"
207
gem "jekyll-bootstrap-sass"
21-
gem "font-awesome-sass", "~> 4"
22-
gem "jekyll-font-awesome-sass"
23-
gem "coffee-script"
248
end
259

26-
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
27-
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
28-
29-
# Performance-booster for watching directories on Windows
30-
gem "wdm", "~> 0.1.0" if Gem.win_platform?
31-
10+
## Windows does not include zoneinfo files, so bundle the tzinfo-data gem
11+
#gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
12+
## Performance-booster for watching directories on Windows
13+
#gem "wdm", "~> 0.1.0" if Gem.win_platform?

_assets/css/main.scss

-66
This file was deleted.

_assets/js/all.js.coffee

-8
This file was deleted.

_config.yml

+3-17
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,11 @@ contact_address: "TechAachen e.V.<br /> Templergraben 55 <br /> 52056 Aachen"
2626
markdown: kramdown
2727

2828
plugins:
29-
- jekyll-minifier
30-
- jekyll-paginate
31-
- jekyll-assets
3229
- jekyll-bootstrap-sass
33-
- jekyll-font-awesome-sass
30+
# - jekyll-font-awesome-sass
3431

35-
assets:
36-
digest: true
37-
prefix: "/assets"
38-
sources:
39-
- "_assets/css"
40-
- "_assets/js"
41-
compress:
42-
css: sass
43-
js: uglifier
44-
source_maps: false
45-
46-
bootstrap:
47-
assets: true
32+
#bootstrap:
33+
# assets: true
4834

4935
font-awesome:
5036
assets: true

_includes/head.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<title>{{ site.title_meta }}</title>
1212
<link rel="canonical" href="https://techaachen.de/">
1313

14-
{% asset main.css %}
14+
<!-- <link href="/font-awesome/css/font-awesome.min.css" rel="stylesheet"> -->
15+
<link href="/css/main.css" rel="stylesheet">
1516

1617
</head>

_includes/scripts.html

+7-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
{% asset all.js %}
1+
<script src="/js/jquery.js" type=text/javascript></script>
2+
<script src="/js/jquery.easing.min.js" type=text/javascript></script>
3+
<script src="/js/jquery.fittext.js" type=text/javascript></script>
4+
<script src="/js/bootstrap.min.js" type=text/javascript></script>
5+
<script src="/js/wow.min.js" type=text/javascript></script>
6+
<script src="/js/creative.js" type=text/javascript></script>
7+
<script src="/js/memberExtend.js" type=text/javascript></script>

_layouts/front.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{% include projekte.html %}
1212
{% include contact.html %}
1313
{% include team.html %}
14-
{% mitgliederversammlung.html %}
14+
{% include mitgliederversammlung.html %}
1515
{% include persons.html %}
1616
{% include impressum.html %}
1717
{% include scripts.html %}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

css/main.scss

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
---
3+
@charset "utf-8";
4+
5+
@import "bootstrap";
6+
7+
$fa-font-path: "/font-awesome/fonts";
8+
@import 'font-awesome/font-awesome';
9+
10+
// variables.less
11+
$theme-primary: #bccf00;
12+
$theme-dark: #000;
13+
$theme-darkgrey: #555;
14+
$theme-lightgrey: #b1b1b1;
15+
16+
$flex-break-dual: 1200px;
17+
$flex-break-single: 480px;
18+
19+
@import "mixins";
20+
@import "base";
21+
//@import "animate";

0 commit comments

Comments
 (0)