Skip to content

The Unified and Autonomous Development Platform

Fix issue #628 - Issue with non-latin characters in default OneDev font

Robin Shenbb46b1709f72
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/BootstrapCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/BootstrapCssResourceReference.java
index 354c340c93..16d3810e37 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/BootstrapCssResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/BootstrapCssResourceReference.java
@@ -6,8 +6,6 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import io.onedev.server.web.asset.poppins.PoppinsCssResourceReference;
-
public class BootstrapCssResourceReference extends CssResourceReference {
private static final long serialVersionUID = 1L;
@@ -21,7 +19,6 @@ public class BootstrapCssResourceReference extends CssResourceReference {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
BootstrapCssResourceReference.class, "css/bootstrap.min.css")));
- dependencies.add(CssHeaderItem.forReference(new PoppinsCssResourceReference()));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
index 327e887054..d5367720b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
@@ -34,9 +34,8 @@
}
html, body {
- font-size: 13px;
+ font-size: 14px;
font-weight: 400;
- font-family: Poppins, Helvetica, "sans-serif";
-ms-text-size-adjust: 100%;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
@@ -2583,7 +2582,6 @@ h6, .h6 {
}
.popover {
- font-family: Poppins, Helvetica, "sans-serif";
font-size: 0.9rem;
background-color: white;
border: 1px solid white;
@@ -2654,7 +2652,6 @@ h6, .h6 {
color: var(--dark-mode-light-gray);
}
.tooltip {
- font-family: Poppins, Helvetica, "sans-serif";
font-size: 0.9rem;
}
.tooltip-inner {
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/PoppinsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/poppins/PoppinsCssResourceReference.java
deleted file mode 100644
index 1e8110e6c8..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/poppins/PoppinsCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.asset.poppins;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class PoppinsCssResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public PoppinsCssResourceReference() {
- super(PoppinsCssResourceReference.class, "poppins.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/poppins.css b/server-core/src/main/java/io/onedev/server/web/asset/poppins/poppins.css
deleted file mode 100644
index f7cca01140..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/poppins/poppins.css
+++ /dev/null
@@ -1,120 +0,0 @@
-/* devanagari */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 300;
- src: local('Poppins Light'), local('Poppins-Light'), url(v12/pxiByp8kv8JHgFVrLDz8Z11lFd2JQEl8qw.woff2) format('woff2');
- unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 300;
- src: local('Poppins Light'), local('Poppins-Light'), url(v12/pxiByp8kv8JHgFVrLDz8Z1JlFd2JQEl8qw.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 300;
- src: local('Poppins Light'), local('Poppins-Light'), url(v12/pxiByp8kv8JHgFVrLDz8Z1xlFd2JQEk.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* devanagari */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 400;
- src: local('Poppins Regular'), local('Poppins-Regular'), url(v12/pxiEyp8kv8JHgFVrJJbecnFHGPezSQ.woff2) format('woff2');
- unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 400;
- src: local('Poppins Regular'), local('Poppins-Regular'), url(v12/pxiEyp8kv8JHgFVrJJnecnFHGPezSQ.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 400;
- src: local('Poppins Regular'), local('Poppins-Regular'), url(v12/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* devanagari */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 500;
- src: local('Poppins Medium'), local('Poppins-Medium'), url(v12/pxiByp8kv8JHgFVrLGT9Z11lFd2JQEl8qw.woff2) format('woff2');
- unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 500;
- src: local('Poppins Medium'), local('Poppins-Medium'), url(v12/pxiByp8kv8JHgFVrLGT9Z1JlFd2JQEl8qw.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 500;
- src: local('Poppins Medium'), local('Poppins-Medium'), url(v12/pxiByp8kv8JHgFVrLGT9Z1xlFd2JQEk.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* devanagari */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 600;
- src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(v12/pxiByp8kv8JHgFVrLEj6Z11lFd2JQEl8qw.woff2) format('woff2');
- unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 600;
- src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(v12/pxiByp8kv8JHgFVrLEj6Z1JlFd2JQEl8qw.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 600;
- src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(v12/pxiByp8kv8JHgFVrLEj6Z1xlFd2JQEk.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* devanagari */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 700;
- src: local('Poppins Bold'), local('Poppins-Bold'), url(v12/pxiByp8kv8JHgFVrLCz7Z11lFd2JQEl8qw.woff2) format('woff2');
- unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 700;
- src: local('Poppins Bold'), local('Poppins-Bold'), url(v12/pxiByp8kv8JHgFVrLCz7Z1JlFd2JQEl8qw.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Poppins';
- font-style: normal;
- font-weight: 700;
- src: local('Poppins Bold'), local('Poppins-Bold'), url(v12/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z11lFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z11lFd2JQEl8qw.woff2
deleted file mode 100644
index b97a3314fc..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z11lFd2JQEl8qw.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1JlFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1JlFd2JQEl8qw.woff2
deleted file mode 100644
index d65ff93389..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1JlFd2JQEl8qw.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2
deleted file mode 100644
index 52cbd3adca..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z11lFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z11lFd2JQEl8qw.woff2
deleted file mode 100644
index 5fbd3aa001..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z11lFd2JQEl8qw.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1JlFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1JlFd2JQEl8qw.woff2
deleted file mode 100644
index 1d33e14316..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1JlFd2JQEl8qw.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1xlFd2JQEk.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1xlFd2JQEk.woff2
deleted file mode 100644
index 025dca3744..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1xlFd2JQEk.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z11lFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z11lFd2JQEl8qw.woff2
deleted file mode 100644
index 92eb63a85a..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z11lFd2JQEl8qw.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1JlFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1JlFd2JQEl8qw.woff2
deleted file mode 100644
index b35b9f7347..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1JlFd2JQEl8qw.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1xlFd2JQEk.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1xlFd2JQEk.woff2
deleted file mode 100644
index 53e8d4dd94..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1xlFd2JQEk.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z11lFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z11lFd2JQEl8qw.woff2
deleted file mode 100644
index f8ab8734a1..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z11lFd2JQEl8qw.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1JlFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1JlFd2JQEl8qw.woff2
deleted file mode 100644
index 4130d6dcd1..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1JlFd2JQEl8qw.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1xlFd2JQEk.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1xlFd2JQEk.woff2
deleted file mode 100644
index bb0923bff9..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1xlFd2JQEk.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJbecnFHGPezSQ.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJbecnFHGPezSQ.woff2
deleted file mode 100644
index bb8c300ca5..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJbecnFHGPezSQ.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2
deleted file mode 100644
index 36195bdd04..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2 and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJnecnFHGPezSQ.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJnecnFHGPezSQ.woff2
deleted file mode 100644
index 25e6e4e364..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJnecnFHGPezSQ.woff2 and /dev/null differ