Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gemfile.lock #172

Merged
merged 5 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.1)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.2)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
ffi (1.15.5)
ffi (1.16.3)
forwardable-extended (2.6.0)
google-protobuf (3.21.12-x86_64-linux)
google-protobuf (3.24.4-x86_64-linux)
html-proofer (3.19.4)
addressable (~> 2.3)
mercenary (~> 0.3)
Expand All @@ -23,9 +23,9 @@ GEM
typhoeus (~> 1.3)
yell (~> 2.0)
http_parser.rb (0.8.0)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.3.1)
jekyll (4.3.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand Down Expand Up @@ -53,39 +53,39 @@ GEM
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.1)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
nokogiri (1.13.10-x86_64-linux)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
parallel (1.22.1)
parallel (1.23.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.1)
racc (1.6.2)
public_suffix (5.0.3)
racc (1.7.1)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (4.0.1)
rexml (3.2.6)
rouge (4.1.3)
safe_yaml (1.0.5)
sass-embedded (1.57.1)
google-protobuf (~> 3.21)
rake (>= 10.0.0)
sass-embedded (1.63.6)
google-protobuf (~> 3.23)
rake (>= 13.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
typhoeus (1.4.0)
ethon (>= 0.9.0)
unicode-display_width (2.3.0)
webrick (1.7.0)
unicode-display_width (2.5.0)
webrick (1.8.1)
yell (2.2.2)

PLATFORMS
Expand Down
4 changes: 2 additions & 2 deletions _data/archiv/unternehmen_2019.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
{
{
"name": "Amprion",
"title": "Das starke Netz für Energie.",
"caption": "Ein stabiles Stromnetz ist die Basis für eine sichere Energieversorgung und eine leistungsfähige Volkswirtschaft. Die Verantwortung für das Höchstspannungsnetz in Deutschland liegt bei vier Übertragungsnetzbetreibern. Amprion ist einer von ihnen.",
Expand Down Expand Up @@ -104,4 +104,4 @@
"logo": "/img/logos/zeb.jpg",
"url": "https://www.zeb-consulting.com"
}
]
]
24 changes: 12 additions & 12 deletions _data/archiv/unternehmen_2020.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@
"url": "https://www.verfassungsschutz.de/de/karriere"
},
{
"name": "Cohausz & Florack",
"title": "You create – we protect",
"caption": "Ideen stecken in jedem klugen Kopf. Und sind bei uns in guten Händen. Wir helfen Ihnen dabei, Ihre Ideen zu schützen.",
"logo": "/img/logos/C&F.jpg",
"url": "https://www.cohausz-florack.de"
"name": "Cohausz & Florack",
"title": "You create – we protect",
"caption": "Ideen stecken in jedem klugen Kopf. Und sind bei uns in guten Händen. Wir helfen Ihnen dabei, Ihre Ideen zu schützen.",
"logo": "/img/logos/C&F.jpg",
"url": "https://www.cohausz-florack.de"
},
{
"name": "Cryoelectra",
"title": "",
"caption": "",
"logo": "/img/logos/cryoelectra.jpeg",
"url": "https://www.cryoelectra.com"
"name": "Cryoelectra",
"title": "",
"caption": "",
"logo": "/img/logos/cryoelectra.jpeg",
"url": "https://www.cryoelectra.com"
},
{
"name": "d-fine",
Expand Down Expand Up @@ -110,5 +110,5 @@
"caption": "",
"logo": "/img/logos/Safetec.jpg",
"url": "https://www.safetec-strahlenschutz.de/"
},
]
}
]
6 changes: 2 additions & 4 deletions _data/archiv/unternehmen_2021.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,5 @@
"caption": "Warth & Klein Grant Thornton gehört zu den führenden mittelständischen Wirtschaftsprüfungsgesellschaften in Deutschland.",
"logo": "/img/logos/wkgt.jpg",
"url": "https://www.wkgt.com/"
},


]
}
]
58 changes: 29 additions & 29 deletions _data/archiv/unternehmen_2022.json

Large diffs are not rendered by default.

93 changes: 51 additions & 42 deletions _data/archiv/unternehmen_2023.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _includes/archiv/katalog_2019.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="row justify-content-center">
<div class="col text-center">
<h2 class="h2-fontsize">PhysiKon 2019</h2>
<img style="size: 100%" src="documents/2019_Physikon_Katalog_online_Titel.png" alt="">
<img style="size: 100%" src="/documents/2019_Physikon_Katalog_online_Titel.png" alt="">
</div>

<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion _includes/archiv/katalog_2020.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="row justify-content-center">
<div class="col text-center">
<h2 class="h2-fontsize">PhysiKon 2020 (ausgefallen)</h2>
<img style="size: 100%" src="documents/2020_Physikon_Katalog_online_Titel.png" alt="">
<img style="size: 100%" src="/documents/2020_Physikon_Katalog_online_Titel.png" alt="">
</div>

<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion _includes/archiv/katalog_2021.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="row justify-content-center">
<div class="col text-center">
<h2 class="h2-fontsize">PhysiKon 2021</h2>
<img style="size: 100%" src="documents/2021_Physikon_Katalog_online_Titel.png" alt="">
<img style="size: 100%" src="/documents/2021_Physikon_Katalog_online_Titel.png" alt="">
</div>

<div class="row">
Expand Down
6 changes: 3 additions & 3 deletions _includes/index/header.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="jumbotron jumbotron-fluid physikon-jumbotron px-3 text-white text-center">
<img class="header-logo" src="img/logos-physikon/logo-pfeil-gruen.svg" alt="PhysiKon">
<img class="header-logo" src="/img/logos-physikon/logo-pfeil-gruen.svg" alt="PhysiKon">
{% comment %}
<h2 class="gray">17. – 19. April 2024 Online-Vorträge <br>
13 – 18 Uhr <a href="https://tu-dortmund.zoom.us/meeting/register/tJEvcO-hqTwoE9XUJGa-DMRQ6jSmnImSYf3J">Zoom</a>
Expand Down Expand Up @@ -49,10 +49,10 @@ <h1>Jobmesse für MINT-Studierende</h1>

<div class="row">
<div class="col-12 col-lg-6 mt-3">
<img src="img/logo_weiss.svg" alt="" style="width: 100%; max-width: 350px;">
<img src="/img/logo_weiss.svg" alt="" style="width: 100%; max-width: 350px;">
</div>
<div class="col-12 col-lg-6 mt-3">
<img src="img/tud_logo_negativ.svg" alt="" style="width: 100%; max-width: 350px;">
<img src="/img/tud_logo_negativ.svg" alt="" style="width: 100%; max-width: 350px;">
</div>
</div>
</header>
7 changes: 4 additions & 3 deletions _includes/index/map.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!-- OpenLayers -->

<link rel="stylesheet" href="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.2.0/css/ol.css" type="text/css">
<link rel="stylesheet" href="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.2.0/css/ol.css"
type="text/css">
<div id="map" class="map-iframe"></div>

<script src="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.2.0/build/ol.js"></script>
Expand Down Expand Up @@ -29,7 +30,7 @@
scale: 0.075,
anchorXUnits: 'fraction',
anchorYUnits: 'fraction',
src: 'img/location.svg',
src: '/img/location.svg',
}),
text: new ol.style.Text({
text: 'Campus Treff',
Expand All @@ -51,4 +52,4 @@
});

map.addLayer(markerVectorLayer);
</script>
</script>
2 changes: 1 addition & 1 deletion _includes/index/organisation.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2 class="text-center text-gray text-uppercase text-secondary mb-0 h2-fontsize"
</p>

<div align="center" class="pt-5 pb-5 mb-1">
<img style="max-width: 300px;" class="card-img-bottom" src="img/pep.svg" alt="<unternehmen>">
<img style="max-width: 300px;" class="card-img-bottom" src="/img/pep.svg" alt="<unternehmen>">

</div>
</div>
12 changes: 6 additions & 6 deletions _includes/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<div class="container">


<a class="navbar-brand js-scroll-trigger bg-secondary" href="/index.html">
<img src="img/logos-physikon/logo-pfeil-gruen-inverse.svg" alt="" style="width: 100%">
<a class="navbar-brand js-scroll-trigger bg-secondary" href="/">
<img src="/img/logos-physikon/logo-pfeil-gruen-inverse.svg" alt="" style="width: 100%">
</a>

<!-- Navbar (mobile) -->
Expand All @@ -18,14 +18,14 @@
<!-- Navbar Items-->
<ul class="navbar-nav ml-auto">
<li class="nav-item mx-1 mx-lg-3">
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger text-center" href="katalog.html">Katalog</a>
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger text-center" href="/katalog/">Katalog</a>
<li class="nav-item mx-1 mx-lg-1">
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger text-center" href="programm.html">Programm</a>
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger text-center" href="/programm/">Programm</a>
<li class="nav-item mx-1 mx-lg-1">
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger text-center" href="unternehmen.html">Für
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger text-center" href="/unternehmen/">Für
Unternehmen</a>
<li class="nav-item mx-1 mx-lg-1">
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger text-center" href="archiv.html">Archiv</a>
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger text-center" href="/archiv/">Archiv</a>
<li class="nav-item mx-1 mx-lg-1">
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger text-center"
href="https://pep-dortmund.org/jobboerse/" target="_blank" rel="noopener noreferrer">Jobbörse</a>
Expand Down
1 change: 0 additions & 1 deletion _includes/programm/programm.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ <h3>Online-Programm </h3>
Das Ministerium für Schule und Bildung NRW hat seine Teilnahme an der PhysiKon (Onlinevortrag 17.04.23 sowie
Messestand am 20.04.23) abgesagt.

</p>

{% endcomment %}

Expand Down
4 changes: 2 additions & 2 deletions _includes/scripts.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct"
crossorigin="anonymous"></script>
<script src="js/custom.js"></script>
<script src="js/freelancer.min.js"></script>
<script src="/js/custom.js"></script>
<script src="/js/freelancer.min.js"></script>
3 changes: 2 additions & 1 deletion archiv.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
layout: archiv_layout
permalink: /archiv/
title: PhysiKon Archiv
description: Archiv der vergangenen Jahre
---
---
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
layout: index_layout
permalink: /
title: PhysiKon 2024
---
1 change: 1 addition & 0 deletions katalog.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
layout: katalog_layout
permalink: /katalog/
title: PhysiKon 2024 - Katalog
description: Lerne die Unternehmen der PhysiKon kennen!
---
1 change: 1 addition & 0 deletions programm.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
layout: programm_layout
permalink: /programm/
title: PhysiKon 2024 - Programm
description: Das Online-Programm der Physikon dieses Jahr. Meldet Euch für die Zoom-Vorträge an!
---
1 change: 1 addition & 0 deletions unternehmen.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
layout: unternehmen_layout
permalink: /unternehmen/
title: PhysiKon 2024 - Für Unternehmen
description: Alle wichtigen Informationen um Ihr Unternehmen auf der PhysiKon zu präsentieren.
---
Loading