Merge pull request #7 from mamarley/materialicons

Use the material-design-icons directly from Google's git repository

Merge pull request #7 from mamarley/materialicons
2075d6ce · Janne Mareike Koschinski · GitHub · 749084e8 · 4c3e2bad · 2075d6ce
Commit 2075d6ce authored 8 years ago by Janne Mareike Koschinski Committed by GitHub 8 years ago
--- a/res/material-icons.ttf
+++ b/res/material-icons.ttf
--- a/res/MaterialIcons-Regular.woff
+++ b/res/MaterialIcons-Regular.woff
--- a/res/MaterialIcons-Regular.woff2
+++ b/res/MaterialIcons-Regular.woff2
--- a/res/fonts.css
+++ b/res/fonts.css
@@ -2,19 +2,34 @@
  font-family: 'Material Icons';
  font-style: normal;
  font-weight: 400;
-  src: local('Material Icons'), local('MaterialIcons-Regular'), url(material-icons.ttf) format('truetype');
+  src: local('Material Icons'),
+       local('MaterialIcons-Regular'),
+       url(MaterialIcons-Regular.woff2) format('woff2'),
+       url(MaterialIcons-Regular.woff) format('woff'),
+       url(MaterialIcons-Regular.ttf) format('truetype');
 }

 .material-icons {
  font-family: 'Material Icons';
  font-weight: normal;
  font-style: normal;
-  font-size: 24px;
+  font-size: 24px;  /* Preferred icon size */
+  display: inline-block;
  line-height: 1;
-  letter-spacing: normal;
  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
+  letter-spacing: normal;
  word-wrap: normal;
+  white-space: nowrap;
  direction: ltr;
+
+  /* Support for all WebKit browsers. */
+  -webkit-font-smoothing: antialiased;
+  /* Support for Safari and Chrome. */
+  text-rendering: optimizeLegibility;
+
+  /* Support for Firefox. */
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Support for IE. */
+  font-feature-settings: 'liga';
 }
--- a/templates/login.phtml
+++ b/templates/login.phtml
@@ -5,7 +5,7 @@
    <title>Quassel Search</title>

    <link rel="stylesheet" href="res/login.css">
-    <link rel="stylesheet" href="res/fonts.css">
+    <link rel="stylesheet" href="res/material-icons.css">
 </head>
 <body>


--- a/templates/search.phtml
+++ b/templates/search.phtml
@@ -5,7 +5,7 @@
    <title>Quassel Search</title>

    <link rel="stylesheet" href="res/search.css">
-    <link rel="stylesheet" href="res/fonts.css">
+    <link rel="stylesheet" href="res/material-icons.css">
 </head>
 <body>
 <nav>