jenkins-bot has submitted this change and it was merged.

Change subject: Add 'lock' icon
......................................................................


Add 'lock' icon

Drawn based on resources/src/mediawiki.special/images/icon-lock.png
in MediaWiki, intended to replace it there.

Trevor came up with the icons, the MediaWiki one was based on something he got 
from May.

Change-Id: I73bb418a4c3cf6bc189e428c935755fa2bfaa87d
---
M demos/pages/icons.js
M src/themes/apex/images.json
A src/themes/apex/images/icons/lock.svg
M src/themes/mediawiki/images.json
A src/themes/mediawiki/images/icons/lock.svg
5 files changed, 15 insertions(+), 0 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  Esanders: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index c4b87b9..a8fdd78 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -14,6 +14,7 @@
                        'help',
                        'info',
                        'link',
+                       'lock',
                        'menu',
                        'next',
                        'picture',
diff --git a/src/themes/apex/images.json b/src/themes/apex/images.json
index aa8ee4f..fb2baba 100644
--- a/src/themes/apex/images.json
+++ b/src/themes/apex/images.json
@@ -15,6 +15,7 @@
                        "help": { "file": "help.svg" },
                        "info": { "file": "info.svg" },
                        "link": { "file": "link.svg" },
+                       "lock": { "file": "lock.svg" },
                        "menu": { "file": "menu.svg" },
                        "next": { "file": "move-ltr.svg" },
                        "picture": { "file": "picture.svg" },
diff --git a/src/themes/apex/images/icons/lock.svg 
b/src/themes/apex/images/icons/lock.svg
new file mode 100644
index 0000000..76328f3
--- /dev/null
+++ b/src/themes/apex/images/icons/lock.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 
24">
+    <g id="lock">
+           <path d="M12 6c-2.21 0-4 1.79-4 
4v1H7v7h10v-7h-1v-1c0-2.21-1.79-4-4-4zm0 2c1.105 0 2 .895 2 
2v1h-4v-1c0-1.105.895-2 2-2z"/>
+       </g>
+</svg>
diff --git a/src/themes/mediawiki/images.json b/src/themes/mediawiki/images.json
index ee043df..055b7d4 100644
--- a/src/themes/mediawiki/images.json
+++ b/src/themes/mediawiki/images.json
@@ -37,6 +37,7 @@
                        "help": { "file": "help.svg" },
                        "info": { "file": "info.svg" },
                        "link": { "file": "link.svg" },
+                       "lock": { "file": "lock.svg" },
                        "menu": { "file": "menu.svg" },
                        "next": { "file": "move-ltr.svg" },
                        "picture": { "file": "picture.svg" },
diff --git a/src/themes/mediawiki/images/icons/lock.svg 
b/src/themes/mediawiki/images/icons/lock.svg
new file mode 100644
index 0000000..86fd1e3
--- /dev/null
+++ b/src/themes/mediawiki/images/icons/lock.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 
24">
+    <g id="lock">
+        <path d="M14 9.06c0-1.562-.656-2.342-2-2.342-1.344 0-1.992.775-2 
2.33V10h4zm3-.036V10h2v10H7c-.46 
0-1.168-.156-1.497-.485-.33-.327-.503-.727-.503-1.195V10h2v-.964c0-.914.19-1.75.574-2.517.383-.767.92-1.407
 1.606-1.852C9.867 4.223 11.14 4 12 4c1.243 0 2.852.473 3.71 1.44.86.97 1.29 
2.186 1.29 3.584z"/>
+    </g>
+</svg>

-- 
To view, visit https://gerrit.wikimedia.org/r/183619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I73bb418a4c3cf6bc189e428c935755fa2bfaa87d
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz DziewoƄski <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to