From ea20a5bf89a418e0d76108734bebb4580f7f88ff Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 3 Jul 2020 15:54:55 +0000 Subject: [PATCH 1/2] Update dependency @11ty/eleventy-navigation to ^0.1.6 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c33f34f..2539483 100644 --- a/package-lock.json +++ b/package-lock.json @@ -240,9 +240,9 @@ } }, "@11ty/eleventy-navigation": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@11ty/eleventy-navigation/-/eleventy-navigation-0.1.5.tgz", - "integrity": "sha512-bZFJx/6seJ7HYfqbirbDNzc+UExNZk9areu5qEVHDuDByt0G7CR5W6J6YJG8WX2j5v8fXacJvWziOU5nW9Iitw==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@11ty/eleventy-navigation/-/eleventy-navigation-0.1.6.tgz", + "integrity": "sha512-ZGZebFEEDiJoS7BvxxiWrKdsCodNkqCsQ7S75IIvaPynHvojqcCVtS4uZk54K+LC+YqL5+T716TlsMG6Mc2p0g==", "dev": true, "requires": { "dependency-graph": "^0.8.1" diff --git a/package.json b/package.json index 1003dd9..248dd20 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@11ty/eleventy": "^0.11.0", - "@11ty/eleventy-navigation": "^0.1.5", + "@11ty/eleventy-navigation": "^0.1.6", "cpx": "^1.5.0", "node-sass": "^4.14.1", "node-sass-tilde-importer": "^1.0.2", From 6ebcd13e67ec4c1a437ad5e7ce64319d0f799949 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Fri, 3 Jul 2020 19:38:24 +0200 Subject: [PATCH 2/2] added beta flag for services added jitsi service --- scss/main.scss | 25 ++++++++++++++++++++++++- sites/_data/services.json | 13 ++++++++++++- sites/_includes/layouts/services.njk | 2 +- sites/_includes/services-extended.html | 5 ++++- sites/_includes/services-simple.html | 5 ++++- sites/de/index.html | 2 +- sites/en/index.html | 2 +- 7 files changed, 47 insertions(+), 7 deletions(-) diff --git a/scss/main.scss b/scss/main.scss index ca1135c..2c51c5e 100644 --- a/scss/main.scss +++ b/scss/main.scss @@ -40,7 +40,7 @@ a { color: #fea500; &:hover { - color: darken(#fea500, .5); + color: #d78c00; } } @@ -121,6 +121,24 @@ a { top: 0; bottom: 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 { @@ -148,6 +166,11 @@ a { h2 { margin-left: 0.5rem; } + + .beta { + top: 0; + right: -1rem; + } } } } diff --git a/sites/_data/services.json b/sites/_data/services.json index 2006cea..3be64d3 100644 --- a/sites/_data/services.json +++ b/sites/_data/services.json @@ -51,10 +51,21 @@ { "id": "firefox-sync", "name": "Firefox Sync", - "icon": "fab fa-firefox", + "icon": "fab fa-firefox-browser", "summary": { "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." } + }, + { + "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." + } } ] diff --git a/sites/_includes/layouts/services.njk b/sites/_includes/layouts/services.njk index de4675f..2ea3600 100644 --- a/sites/_includes/layouts/services.njk +++ b/sites/_includes/layouts/services.njk @@ -5,6 +5,6 @@ layout: base.njk {{ content | safe }} -
+
{% include 'services-extended.html' %}
diff --git a/sites/_includes/services-extended.html b/sites/_includes/services-extended.html index 1e5a986..2c3863f 100644 --- a/sites/_includes/services-extended.html +++ b/sites/_includes/services-extended.html @@ -1,7 +1,10 @@ {%- for service in services %}
- + + {% if service.beta == true %} +
TEST-PHASE
+ {% endif %}

{{service.name}}{% if service.url %}
- + + {% if service.beta == true %} +
TEST-PHASE
+ {% endif %}

{{service.name}}

 diff --git a/sites/de/index.html b/sites/de/index.html index 8d4d8cc..5bbdf57 100644 --- a/sites/de/index.html +++ b/sites/de/index.html @@ -20,7 +20,7 @@ eleventyNavigation:

Dienste

-
+
{% include services-simple.html %}
diff --git a/sites/en/index.html b/sites/en/index.html index 366b187..b7d7def 100644 --- a/sites/en/index.html +++ b/sites/en/index.html @@ -20,7 +20,7 @@ eleventyNavigation:

Services

-
+
{% include services-simple.html %}