You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by cg...@apache.org on 2021/12/08 16:19:39 UTC

[drill] branch master updated: DRILL-8067: Localize the font for better User-experience of China mainland (#2395)

This is an automated email from the ASF dual-hosted git repository.

cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/master by this push:
     new bd95fb9  DRILL-8067: Localize the font for better User-experience of China mainland (#2395)
bd95fb9 is described below

commit bd95fb9786bbd2f7bc47d0633517958a4db29c4c
Author: kingswanwho <ch...@gmail.com>
AuthorDate: Thu Dec 9 00:19:25 2021 +0800

    DRILL-8067: Localize the font for better User-experience of China mainland (#2395)
    
    Co-authored-by: kingswanwho <ji...@u.northwestern.edu>
---
 exec/java-exec/src/main/resources/rest/generic.ftl |   1 -
 .../main/resources/rest/static/css/drillStyle.css  |  24 +++++++++++++++++++++
 .../rest/static/css/materialicons_v118.woff2       | Bin 0 -> 119332 bytes
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/exec/java-exec/src/main/resources/rest/generic.ftl b/exec/java-exec/src/main/resources/rest/generic.ftl
index 75c334d..d91a7ed 100644
--- a/exec/java-exec/src/main/resources/rest/generic.ftl
+++ b/exec/java-exec/src/main/resources/rest/generic.ftl
@@ -35,7 +35,6 @@
 
       <link href="/static/css/bootstrap.min.css" rel="stylesheet">
       <link href="/static/css/drillStyle.css" rel="stylesheet">
-      <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
       <script type="text/javascript" language="javascript" src="/static/js/jquery-3.6.0.min.js"></script>
       <script src="/static/js/popper.min.js"></script>
diff --git a/exec/java-exec/src/main/resources/rest/static/css/drillStyle.css b/exec/java-exec/src/main/resources/rest/static/css/drillStyle.css
index c4e47bc..4864fb3 100644
--- a/exec/java-exec/src/main/resources/rest/static/css/drillStyle.css
+++ b/exec/java-exec/src/main/resources/rest/static/css/drillStyle.css
@@ -7,3 +7,27 @@ body {
 .close {
     outline: none;
 }
+
+/* Material + Icons */
+@font-face {
+  font-family: 'Material Icons';
+  font-style: normal;
+  font-weight: 400;
+  src: url('materialicons_v118.woff2') format('woff2');
+}
+
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: 'liga';
+  -webkit-font-smoothing: antialiased;
+}
diff --git a/exec/java-exec/src/main/resources/rest/static/css/materialicons_v118.woff2 b/exec/java-exec/src/main/resources/rest/static/css/materialicons_v118.woff2
new file mode 100644
index 0000000..9627cab
Binary files /dev/null and b/exec/java-exec/src/main/resources/rest/static/css/materialicons_v118.woff2 differ