Compare commits

...

5 commits

Author SHA1 Message Date
c9d731c203 Merge pull request 'added jitsi' (#12) from develop into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #12
2020-07-03 17:59:05 +00:00
281cbd496b Merge branch 'master' into develop
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2020-07-03 17:58:28 +00:00
6ebcd13e67 added beta flag for services
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
added jitsi service
2020-07-03 19:38:24 +02:00
ff1eed98c8 Merge pull request 'Update dependency @11ty/eleventy-navigation to ^0.1.6' (#11) from renovate/11ty-eleventy-navigation-0.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #11
2020-07-03 16:25:32 +00:00
ea20a5bf89 Update dependency @11ty/eleventy-navigation to ^0.1.6
All checks were successful
continuous-integration/drone/pr Build is passing
2020-07-03 15:54:55 +00:00
9 changed files with 51 additions and 11 deletions

6
package-lock.json generated
View file

@ -240,9 +240,9 @@
} }
}, },
"@11ty/eleventy-navigation": { "@11ty/eleventy-navigation": {
"version": "0.1.5", "version": "0.1.6",
"resolved": "https://registry.npmjs.org/@11ty/eleventy-navigation/-/eleventy-navigation-0.1.5.tgz", "resolved": "https://registry.npmjs.org/@11ty/eleventy-navigation/-/eleventy-navigation-0.1.6.tgz",
"integrity": "sha512-bZFJx/6seJ7HYfqbirbDNzc+UExNZk9areu5qEVHDuDByt0G7CR5W6J6YJG8WX2j5v8fXacJvWziOU5nW9Iitw==", "integrity": "sha512-ZGZebFEEDiJoS7BvxxiWrKdsCodNkqCsQ7S75IIvaPynHvojqcCVtS4uZk54K+LC+YqL5+T716TlsMG6Mc2p0g==",
"dev": true, "dev": true,
"requires": { "requires": {
"dependency-graph": "^0.8.1" "dependency-graph": "^0.8.1"

View file

@ -20,7 +20,7 @@
}, },
"devDependencies": { "devDependencies": {
"@11ty/eleventy": "^0.11.0", "@11ty/eleventy": "^0.11.0",
"@11ty/eleventy-navigation": "^0.1.5", "@11ty/eleventy-navigation": "^0.1.6",
"cpx": "^1.5.0", "cpx": "^1.5.0",
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"node-sass-tilde-importer": "^1.0.2", "node-sass-tilde-importer": "^1.0.2",

View file

@ -40,7 +40,7 @@ a {
color: #fea500; color: #fea500;
&:hover { &:hover {
color: darken(#fea500, .5); color: #d78c00;
} }
} }
@ -121,6 +121,24 @@ a {
top: 0; top: 0;
bottom: 0; bottom: 0;
right: 0; right: 0;
color: #fea500 !important;
&[href]:hover {
color: #d78c00 !important;
}
}
.beta {
position: absolute;
top: 1rem;
right: 0;
font-weight: bold;
background-color: #fea500;
color: #000000;
padding: .5rem 1rem;
border-radius: 10px;
transform: rotate(20deg);
box-shadow: -1px 8px 5px rgba(0, 0, 0, .7);
} }
.inner { .inner {
@ -148,6 +166,11 @@ a {
h2 { h2 {
margin-left: 0.5rem; margin-left: 0.5rem;
} }
.beta {
top: 0;
right: -1rem;
}
} }
} }
} }

View file

@ -51,10 +51,21 @@
{ {
"id": "firefox-sync", "id": "firefox-sync",
"name": "Firefox Sync", "name": "Firefox Sync",
"icon": "fab fa-firefox", "icon": "fab fa-firefox-browser",
"summary": { "summary": {
"de": "Ein Service um Firefox Einstellungen, Lesezeichen, offene Tabs und vieles mehr über verschiedene Geräte zu synchronisieren.", "de": "Ein Service um Firefox Einstellungen, Lesezeichen, offene Tabs und vieles mehr über verschiedene Geräte zu synchronisieren.",
"en": "A service to sync Firefox settings, bookmarks, open tabs and much more between multiple devices." "en": "A service to sync Firefox settings, bookmarks, open tabs and much more between multiple devices."
} }
},
{
"id": "jitsi",
"name": "Jitsi Meet",
"icon": "fas fa-users",
"url": "https://jitsi.sp-codes.de",
"beta": true,
"summary": {
"de": "Eine sichere, einfache und skalierbare Plattform für Videokonferenzen.",
"en": "A secure, simple and scalable platform for video conferencing."
}
} }
] ]

View file

@ -5,6 +5,6 @@ layout: base.njk
{{ content | safe }} {{ content | safe }}
<div class="row"> <div class="row justify-content-center">
{% include 'services-extended.html' %} {% include 'services-extended.html' %}
</div> </div>

View file

@ -1,7 +1,10 @@
{%- for service in services %} {%- for service in services %}
<div class="col-12 col-md-6 col-lg-4 p-3"> <div class="col-12 col-md-6 col-lg-4 p-3">
<div class="service"> <div class="service">
<a class="link" href="/{{locale}}/services/{{service.id}}"></a> <a class="link" {% if service.beta != true %} href="/{{locale}}/services/{{service.id}}" {% endif %}></a>
{% if service.beta == true %}
<div class="beta">TEST-PHASE</div>
{% endif %}
<div class="inner"> <div class="inner">
<i class="{{service.icon}} fa-4x"></i> <i class="{{service.icon}} fa-4x"></i>
<h2 class="mt-2">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i <h2 class="mt-2">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i

View file

@ -1,7 +1,10 @@
{%- for service in services %} {%- for service in services %}
<div class="col-12 col-md-6 p-3"> <div class="col-12 col-md-6 p-3">
<div class="service flat"> <div class="service flat">
<a class="link inner" href="/{{locale}}/services/{{service.id}}"> <a class="link inner" href="/{{locale}}/services{% if service.beta != true %}/{{service.id}}{% endif %}">
{% if service.beta == true %}
<div class="beta">TEST-PHASE</div>
{% endif %}
<i class="{{service.icon}} fa-fw fa-2x"></i> <i class="{{service.icon}} fa-fw fa-2x"></i>
<h2 class="mt-2">{{service.name}}</h2> <h2 class="mt-2">{{service.name}}</h2>
</a> </a>

View file

@ -20,7 +20,7 @@ eleventyNavigation:
<div class="row justify-content-center py-4 border-top"> <div class="row justify-content-center py-4 border-top">
<div class="col-lg-8 col-md-10 col-12"> <div class="col-lg-8 col-md-10 col-12">
<h1 class="heading"><a href="/{{locale}}/services">Dienste</a></h1> <h1 class="heading"><a href="/{{locale}}/services">Dienste</a></h1>
<div class="row"> <div class="row justify-content-center">
{% include services-simple.html %} {% include services-simple.html %}
</div> </div>
</div> </div>

View file

@ -20,7 +20,7 @@ eleventyNavigation:
<div class="row justify-content-center py-4 border-top"> <div class="row justify-content-center py-4 border-top">
<div class="col-lg-8 col-md-10 col-12"> <div class="col-lg-8 col-md-10 col-12">
<h1 class="heading"><a href="/{{locale}}/services">Services</a></h1> <h1 class="heading"><a href="/{{locale}}/services">Services</a></h1>
<div class="row"> <div class="row justify-content-center">
{% include services-simple.html %} {% include services-simple.html %}
</div> </div>
</div> </div>