Merge Zorin OS icon PR by @k-caps

lukas-w · Jul 9, 2020 · d8666ab · d8666ab
2 parents 9506475 + 190b25c
commit d8666ab
Show file tree

Hide file tree

Showing 12 changed files with 403 additions and 358 deletions.
diff --git a/.fontcustom-manifest.json b/.fontcustom-manifest.json
@@ -1,7 +1,7 @@
 {
   "checksum": {
-    "previous": "ee881bbe8bf5dff44159481633aa3319274bb2329d6b7f3301597de71e7e23ca",
-    "current": "ee881bbe8bf5dff44159481633aa3319274bb2329d6b7f3301597de71e7e23ca"
+    "previous": "beaace7b97854e865a909e85e6817ee07ef895fcfef35cb2ef5a14d07ab6563a",
+    "current": "beaace7b97854e865a909e85e6817ee07ef895fcfef35cb2ef5a14d07ab6563a"
   },
   "fonts": [
     "assets/font-logos.ttf",
@@ -142,6 +142,10 @@
     "void": {
       "codepoint": 61728,
       "source": "vectors/void.svg"
+    },
+    "zorin": {
+      "codepoint": 61729,
+      "source": "vectors/zorin.svg"
     }
   },
   "options": {

diff --git a/README.md b/README.md
@@ -47,6 +47,7 @@ Available logos are:
 | Tux           | `fl-tux`                   | `<span class="fl-tux"></span>`          |
 | Ubuntu        | `fl-ubuntu[-inverse]`      | `<span class="fl-ubuntu"></span>`       |
 | Void          | `fl-void`                  | `<span class="fl-void"></span>`         |
+| Zorin OS      | `fl-zorin`                 | `<span class="fl-zorin"></span>`        |
 
 ## Dependencies ##
 * This project uses [fontcustom](https://github.com/FontCustom/fontcustom) to compile vectors into fonts.

diff --git a/assets/font-logos-preview.html b/assets/font-logos-preview.html
@@ -193,7 +193,8 @@
 .fl-tux:before,
 .fl-ubuntu:before,
 .fl-ubuntu-inverse:before,
-.fl-void:before {
+.fl-void:before,
+.fl-zorin:before {
         display: inline-block;
   font-family: "font-logos";
   font-style: normal;
@@ -241,6 +242,7 @@
 .fl-ubuntu:before { content: "\f11b"; }
 .fl-ubuntu-inverse:before { content: "\f11c"; }
 .fl-void:before { content: "\f120"; }
+.fl-zorin:before { content: "\f121"; }
     </style>
 
     <!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@ -256,7 +258,7 @@
   <body class="characters-off">
     <div id="page" class="container">
       <header>
-        <h1>font-logos contains 33 glyphs:</h1>
+        <h1>font-logos contains 34 glyphs:</h1>
         <a onclick="toggleCharacters(); return false;" href="#">Toggle Preview Characters</a>
       </header>
 
@@ -690,6 +692,19 @@ <h1>font-logos contains 33 glyphs:</h1>
         </div>
       </div>
 
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="fl-zorin" class="fl-zorin"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="fl-zorin" class="fl-zorin"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="fl-zorin" class="fl-zorin"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="fl-zorin" class="fl-zorin"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="fl-zorin" class="fl-zorin"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="fl-zorin" class="fl-zorin"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="fl-zorin" class="fl-zorin"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="fl-zorin" class="fl-zorin"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="fl-zorin" class="fl-zorin"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="fl-zorin" class="fl-zorin"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fl-zorin" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf121;" />
+        </div>
+      </div>
+
 
       <footer>
         Made with love using <a href="http://fontcustom.com">Font Custom</a>.

diff --git a/assets/font-logos.css b/assets/font-logos.css
@@ -82,7 +82,8 @@
 .fl-tux:before,
 .fl-ubuntu:before,
 .fl-ubuntu-inverse:before,
-.fl-void:before {
+.fl-void:before,
+.fl-zorin:before {
   display: inline-block;
   font-family: "font-logos";
   font-style: normal;
@@ -130,3 +131,4 @@
 .fl-ubuntu:before { content: "\f11b"; }
 .fl-ubuntu-inverse:before { content: "\f11c"; }
 .fl-void:before { content: "\f120"; }
+.fl-zorin:before { content: "\f121"; }
diff --git a/assets/font-logos.eot b/assets/font-logos.eot
diff --git a/assets/font-logos.svg b/assets/font-logos.svg
diff --git a/assets/font-logos.ttf b/assets/font-logos.ttf
diff --git a/assets/font-logos.woff b/assets/font-logos.woff
diff --git a/assets/font-logos.woff2 b/assets/font-logos.woff2
diff --git a/assets/preview.png b/assets/preview.png
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "font-logos",
   "description": "An icon font providing popular linux distros' logos",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "style": "assets/font-logos.css",
   "authors": [
     "Lukas W (https://github.com/Lukas-W)"

diff --git a/vectors/zorin.svg b/vectors/zorin.svg