From e84b0905684aedd5d51a27d33cc5e5f0fa700521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20Bogsrud?=
 <2082481+haakemon@users.noreply.github.com>
Date: Wed, 17 Jul 2024 07:50:12 +0200
Subject: [PATCH] fix: update lock icon variants to match design

The icons previously had 2px whitespace on top and 1px whitespace on bottom. This has been switched around
so that there is now 1px whitespace on top and 2px whitespace on bottom. This makes the icons look better aligned
when used alone.
---
 lib/expressive/nrk-lock-expressive--active.svg   | 5 ++++-
 lib/expressive/nrk-lock-expressive.svg           | 2 +-
 lib/expressive/nrk-unlock-expressive--active.svg | 5 ++++-
 lib/expressive/nrk-unlock-expressive.svg         | 2 +-
 lib/icon/nrk-lock--active.svg                    | 2 +-
 lib/icon/nrk-lock.svg                            | 6 +++++-
 lib/icon/nrk-unlock--active.svg                  | 5 ++++-
 lib/icon/nrk-unlock.svg                          | 2 +-
 8 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/lib/expressive/nrk-lock-expressive--active.svg b/lib/expressive/nrk-lock-expressive--active.svg
index 2a5e66b6..ea09fa0d 100644
--- a/lib/expressive/nrk-lock-expressive--active.svg
+++ b/lib/expressive/nrk-lock-expressive--active.svg
@@ -1 +1,4 @@
-<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path d="M8 8C8 5.79086 9.79086 4 12 4C14.2091 4 16 5.79086 16 8C16 8.55228 16.4477 9 17 9C17.5523 9 18 8.55228 18 8C18 4.68629 15.3137 2 12 2C8.68629 2 6 4.68629 6 8C6 8.55228 6.44772 9 7 9C7.55228 9 8 8.55228 8 8Z" /><path fill-rule="evenodd" clip-rule="evenodd" d="M6 11C4.34315 11 3 12.3431 3 14V20C3 21.6569 4.34315 23 6 23H18C19.6569 23 21 21.6569 21 20V14C21 12.3431 19.6569 11 18 11H6ZM12 15C12.5523 15 13 15.4477 13 16V19C13 19.5523 12.5523 20 12 20C11.4477 20 11 19.5523 11 19V16C11 15.4477 11.4477 15 12 15Z" /></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 7C8 4.79086 9.79086 3 12 3C14.2091 3 16 4.79086 16 7C16 7.55228 16.4477 8 17 8C17.5523 8 18 7.55228 18 7C18 3.68629 15.3137 1 12 1C8.68629 1 6 3.68629 6 7C6 7.55228 6.44772 8 7 8C7.55228 8 8 7.55228 8 7Z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6 10C4.34315 10 3 11.3431 3 13V19C3 20.6569 4.34315 22 6 22H18C19.6569 22 21 20.6569 21 19V13C21 11.3431 19.6569 10 18 10H6ZM12 14C12.5523 14 13 14.4477 13 15V18C13 18.5523 12.5523 19 12 19C11.4477 19 11 18.5523 11 18V15C11 14.4477 11.4477 14 12 14Z"/>
+</svg>
diff --git a/lib/expressive/nrk-lock-expressive.svg b/lib/expressive/nrk-lock-expressive.svg
index acbba79f..5d63e7ca 100644
--- a/lib/expressive/nrk-lock-expressive.svg
+++ b/lib/expressive/nrk-lock-expressive.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 4a4 4 0 0 0-4 4 1 1 0 0 1-2 0 6 6 0 1 1 12 0 1 1 0 1 1-2 0 4 4 0 0 0-4-4ZM13 16a1 1 0 1 0-2 0v2a1 1 0 1 0 2 0v-2Z"/><path fill-rule="evenodd" d="M3 14a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v6a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3v-6Zm3-1a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-6a1 1 0 0 0-1-1H6Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 3a4 4 0 0 0-4 4 1 1 0 0 1-2 0 6 6 0 1 1 12 0 1 1 0 1 1-2 0 4 4 0 0 0-4-4ZM13 15a1 1 0 1 0-2 0v2a1 1 0 1 0 2 0v-2Z"/><path fill-rule="evenodd" d="M3 13a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v6a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3v-6Zm3-1a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-6a1 1 0 0 0-1-1H6Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/lib/expressive/nrk-unlock-expressive--active.svg b/lib/expressive/nrk-unlock-expressive--active.svg
index 96cb5a5e..3588daca 100644
--- a/lib/expressive/nrk-unlock-expressive--active.svg
+++ b/lib/expressive/nrk-unlock-expressive--active.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8.08 5.199C8.4506 3.3735 10.066 2 12 2c2.2091 0 4 1.7909 4 4v2c0 .5523.4477 1 1 1s1-.4477 1-1V6c0-3.3137-2.6863-6-6-6-2.904 0-5.324 2.062-5.88 4.801-.1099.5413.2398 1.0691.781 1.179.5413.1099 1.0692-.2398 1.179-.781Z"/><path fill-rule="evenodd" d="M6 11c-1.6569 0-3 1.3431-3 3v6c0 1.6569 1.3431 3 3 3h12c1.6569 0 3-1.3431 3-3v-6c0-1.6569-1.3431-3-3-3H6Zm6 4c.5523 0 1 .4477 1 1v3c0 .5523-.4477 1-1 1s-1-.4477-1-1v-3c0-.5523.4477-1 1-1Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.08003 5.19893C8.45056 3.37356 10.066 2 12 2C14.2091 2 16 3.79086 16 6V7C16 7.55228 16.4477 8 17 8C17.5523 8 18 7.55228 18 7V6C18 2.68629 15.3137 0 12 0C9.09609 0 6.67602 2.06196 6.12001 4.80107C6.01014 5.34231 6.35984 5.87015 6.90109 5.98001C7.44233 6.08988 7.97016 5.74018 8.08003 5.19893Z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6 10C4.34315 10 3 11.3431 3 13V19C3 20.6569 4.34315 22 6 22H18C19.6569 22 21 20.6569 21 19V13C21 11.3431 19.6569 10 18 10H6ZM12 14C12.5523 14 13 14.4477 13 15V18C13 18.5523 12.5523 19 12 19C11.4477 19 11 18.5523 11 18V15C11 14.4477 11.4477 14 12 14Z"/>
+</svg>
diff --git a/lib/expressive/nrk-unlock-expressive.svg b/lib/expressive/nrk-unlock-expressive.svg
index a368658d..56148796 100644
--- a/lib/expressive/nrk-unlock-expressive.svg
+++ b/lib/expressive/nrk-unlock-expressive.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 2c-1.934 0-3.5494 1.3736-3.92 3.199-.1098.5412-.6377.8909-1.179.781-.5412-.1099-.8909-.6377-.781-1.179C6.676 2.062 9.096 0 12 0c3.3137 0 6 2.6863 6 6v2c0 .5523-.4477 1-1 1s-1-.4477-1-1V6c0-2.2091-1.7909-4-4-4ZM13 16c0-.5523-.4477-1-1-1s-1 .4477-1 1v2c0 .5523.4477 1 1 1s1-.4477 1-1v-2Z"/><path fill-rule="evenodd" d="M3 14c0-1.6569 1.3431-3 3-3h12c1.6569 0 3 1.3431 3 3v6c0 1.6569-1.3431 3-3 3H6c-1.6569 0-3-1.3431-3-3v-6Zm3-1c-.5523 0-1 .4477-1 1v6c0 .5523.4477 1 1 1h12c.5523 0 1-.4477 1-1v-6c0-.5523-.4477-1-1-1H6Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 2a4 4 0 0 0-3.92 3.2 1 1 0 1 1-1.96-.4A6 6 0 0 1 18 6v1a1 1 0 1 1-2 0V6a4 4 0 0 0-4-4ZM13 15a1 1 0 1 0-2 0v2a1 1 0 1 0 2 0v-2Z"/><path fill-rule="evenodd" d="M3 13a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v6a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3v-6Zm3-1a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-6a1 1 0 0 0-1-1H6Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/lib/icon/nrk-lock--active.svg b/lib/icon/nrk-lock--active.svg
index 4a657943..86cec46d 100644
--- a/lib/icon/nrk-lock--active.svg
+++ b/lib/icon/nrk-lock--active.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path d="M8 8C8 5.79086 9.79086 4 12 4C14.2091 4 16 5.79086 16 8V9H18V8C18 4.68629 15.3137 2 12 2C8.68629 2 6 4.68629 6 8V9H8V8Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 23V11H3V23H21ZM13 15V20H11V15H13Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8 7a4 4 0 1 1 8 0v1h2V7A6 6 0 0 0 6 7v1h2V7Z"/><path fill-rule="evenodd" d="M21 22V10H3v12h18Zm-8-8v5h-2v-5h2Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/lib/icon/nrk-lock.svg b/lib/icon/nrk-lock.svg
index 4ab6e526..7aabf21a 100644
--- a/lib/icon/nrk-lock.svg
+++ b/lib/icon/nrk-lock.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 4a4 4 0 0 0-4 4v1H6V8a6 6 0 1 1 12 0v1h-2V8a4 4 0 0 0-4-4ZM13 19v-4h-2v4h2Z"/><path fill-rule="evenodd" d="M21 11v12H3V11h18ZM5 13v8h14v-8H5Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 3C9.79086 3 8 4.79086 8 7V8H6V7C6 3.68629 8.68629 1 12 1C15.3137 1 18 3.68629 18 7V8H16V7C16 4.79086 14.2091 3 12 3Z"/>
+<path d="M13 18V14H11V18H13Z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21 10V22H3V10H21ZM5 12V20H19V12H5Z"/>
+</svg>
diff --git a/lib/icon/nrk-unlock--active.svg b/lib/icon/nrk-unlock--active.svg
index 4194a716..f7b6bed0 100644
--- a/lib/icon/nrk-unlock--active.svg
+++ b/lib/icon/nrk-unlock--active.svg
@@ -1 +1,4 @@
-<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path d="M8.08001 5.19893C8.45054 3.37356 10.066 2 12 2C14.2091 2 16 3.79086 16 6V9H18V6C18 2.68629 15.3137 0 12 0C9.09607 0 6.67599 2.06196 6.11998 4.80107C6.11998 4.80107 6 5.5 6 6H8C8 5.5 8.08001 5.19893 8.08001 5.19893Z" /><path fill-rule="evenodd" clip-rule="evenodd" d="M21 11H3V23H21V11ZM13 15V20H11V15H13Z" /></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.08001 5.19893C8.45054 3.37356 10.066 2 12 2C14.2091 2 16 3.79086 16 6V8H18V6C18 2.68629 15.3137 0 12 0C9.09607 0 6.67599 2.06196 6.11998 4.80107C6.11998 4.80107 6 5.5 6 6H8C8 5.5 8.08001 5.19893 8.08001 5.19893Z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21 10H3V22H21V10ZM13 14V19H11V14H13Z"/>
+</svg>
diff --git a/lib/icon/nrk-unlock.svg b/lib/icon/nrk-unlock.svg
index 1c6b33e7..4b217ab0 100644
--- a/lib/icon/nrk-unlock.svg
+++ b/lib/icon/nrk-unlock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 2c-1.934 0-3.5494 1.3736-3.92 3.199 0 0-.08.301-.08.801H6c0-.5.12-1.199.12-1.199C6.676 2.062 9.096 0 12 0c3.3137 0 6 2.6863 6 6v3h-2V6c0-2.2091-1.7909-4-4-4ZM13 19v-4h-2v4h2Z"/><path fill-rule="evenodd" d="M3 11h18v12H3V11Zm2 2v8h14v-8H5Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 2a4 4 0 0 0-3.92 3.2S8 5.5 8 6H6c0-.5.12-1.2.12-1.2A6 6 0 0 1 18 6v2h-2V6a4 4 0 0 0-4-4ZM13 18v-4h-2v4h2Z"/><path fill-rule="evenodd" d="M3 10h18v12H3V10Zm2 2v8h14v-8H5Z" clip-rule="evenodd"/></svg>
\ No newline at end of file