[Rt-commit] rt branch, 4.6-theme-trunk, updated. rt-4.4.4-259-g118631f5a
? sunnavy
sunnavy at bestpractical.com
Thu May 23 17:33:09 EDT 2019
The branch, 4.6-theme-trunk has been updated
via 118631f5a72f7cf26712316e6756b80693718a3c (commit)
from 044848fa52a02045e59fdc98a5f1649d29febede (commit)
Summary of changes:
share/static/css/elevator-light/inter.css | 179 ++++++++++++++++++++++++++++++
share/static/css/elevator-light/main.css | 2 +-
share/static/css/fonts/inter/inter.css | 179 ------------------------------
3 files changed, 180 insertions(+), 180 deletions(-)
create mode 100644 share/static/css/elevator-light/inter.css
delete mode 100644 share/static/css/fonts/inter/inter.css
- Log -----------------------------------------------------------------
commit 118631f5a72f7cf26712316e6756b80693718a3c
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri May 24 05:04:21 2019 +0800
Fix inter font URL on production mode
Previously inter.css is under /share/static/css/fonts/inter/, the depth is 5;
Squished css is under /NoAuth/css/elevator-light/, the depth is 4.
As we need a consistent relative URL to support both modes, inter.css is
moved to a depth 4 directory(the theme that uses it)
diff --git a/share/static/css/elevator-light/inter.css b/share/static/css/elevator-light/inter.css
new file mode 100644
index 000000000..be46efc5b
--- /dev/null
+++ b/share/static/css/elevator-light/inter.css
@@ -0,0 +1,179 @@
+ at font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 100;
+ src: url("../../../static/css/fonts/inter/Inter-Thin-BETA.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-Thin-BETA.woff") format("woff");
+}
+ at font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 100;
+ src: url("../../../static/css/fonts/inter/Inter-ThinItalic-BETA.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-ThinItalic-BETA.woff") format("woff");
+}
+
+ at font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 200;
+ src: url("../../../static/css/fonts/inter/Inter-ExtraLight-BETA.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-ExtraLight-BETA.woff") format("woff");
+}
+ at font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 200;
+ src: url("../../../static/css/fonts/inter/Inter-ExtraLightItalic-BETA.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-ExtraLightItalic-BETA.woff") format("woff");
+}
+
+ at font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 300;
+ src: url("../../../static/css/fonts/inter/Inter-Light-BETA.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-Light-BETA.woff") format("woff");
+}
+ at font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 300;
+ src: url("../../../static/css/fonts/inter/Inter-LightItalic-BETA.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-LightItalic-BETA.woff") format("woff");
+}
+
+ at font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 400;
+ src: url("../../../static/css/fonts/inter/Inter-Regular.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-Regular.woff") format("woff");
+}
+ at font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 400;
+ src: url("../../../static/css/fonts/inter/Inter-Italic.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-Italic.woff") format("woff");
+}
+
+ at font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 500;
+ src: url("../../../static/css/fonts/inter/Inter-Medium.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-Medium.woff") format("woff");
+}
+ at font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 500;
+ src: url("../../../static/css/fonts/inter/Inter-MediumItalic.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-MediumItalic.woff") format("woff");
+}
+
+ at font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 600;
+ src: url("../../../static/css/fonts/inter/Inter-SemiBold.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-SemiBold.woff") format("woff");
+}
+ at font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 600;
+ src: url("../../../static/css/fonts/inter/Inter-SemiBoldItalic.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-SemiBoldItalic.woff") format("woff");
+}
+
+ at font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 700;
+ src: url("../../../static/css/fonts/inter/Inter-Bold.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-Bold.woff") format("woff");
+}
+ at font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 700;
+ src: url("../../../static/css/fonts/inter/Inter-BoldItalic.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-BoldItalic.woff") format("woff");
+}
+
+ at font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 800;
+ src: url("../../../static/css/fonts/inter/Inter-ExtraBold.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-ExtraBold.woff") format("woff");
+}
+ at font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 800;
+ src: url("../../../static/css/fonts/inter/Inter-ExtraBoldItalic.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-ExtraBoldItalic.woff") format("woff");
+}
+
+ at font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 900;
+ src: url("../../../static/css/fonts/inter/Inter-Black.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-Black.woff") format("woff");
+}
+ at font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 900;
+ src: url("../../../static/css/fonts/inter/Inter-BlackItalic.woff2") format("woff2"),
+ url("../../../static/css/fonts/inter/Inter-BlackItalic.woff") format("woff");
+}
+
+/* -------------------------------------------------------
+Variable font.
+Usage:
+
+ html { font-family: 'Inter', sans-serif; }
+ @supports (font-variation-settings: normal) {
+ html { font-family: 'Inter var', sans-serif; }
+ }
+*/
+ at font-face {
+ font-family: 'Inter var';
+ font-weight: 100 900;
+ font-style: normal;
+ font-named-instance: 'Regular';
+ src: url("../../../static/css/fonts/inter/Inter-upright.var.woff2") format("woff2");
+}
+ at font-face {
+ font-family: 'Inter var';
+ font-weight: 100 900;
+ font-style: italic;
+ font-named-instance: 'Italic';
+ src: url("../../../static/css/fonts/inter/Inter-italic.var.woff2") format("woff2");
+}
+
+
+/* --------------------------------------------------------------------------
+[EXPERIMENTAL] Multi-axis, single variable font.
+
+Slant axis is not yet widely supported (as of February 2019) and thus this
+multi-axis single variable font is opt-in rather than the default.
+
+When using this, you will probably need to set font-variation-settings
+explicitly, e.g.
+
+ * { font-variation-settings: "slnt" 0deg }
+ .italic { font-variation-settings: "slnt" 10deg }
+
+*/
+ at font-face {
+ font-family: 'Inter var experimental';
+ font-weight: 100 900;
+ font-style: oblique 0deg 10deg;
+ src: url("../../../static/css/fonts/inter/Inter.var.woff2") format("woff2");
+}
diff --git a/share/static/css/elevator-light/main.css b/share/static/css/elevator-light/main.css
index 9a078c50e..e0f3f17a5 100644
--- a/share/static/css/elevator-light/main.css
+++ b/share/static/css/elevator-light/main.css
@@ -1,5 +1,5 @@
@import "../base-responsive/main.css";
- at import "../fonts/inter/inter.css";
+ at import "inter.css";
@import "bootstrap.css";
@import "bootstrap-select.css";
diff --git a/share/static/css/fonts/inter/inter.css b/share/static/css/fonts/inter/inter.css
deleted file mode 100644
index dc7645793..000000000
--- a/share/static/css/fonts/inter/inter.css
+++ /dev/null
@@ -1,179 +0,0 @@
- at font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 100;
- src: url("Inter-Thin-BETA.woff2") format("woff2"),
- url("Inter-Thin-BETA.woff") format("woff");
-}
- at font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 100;
- src: url("Inter-ThinItalic-BETA.woff2") format("woff2"),
- url("Inter-ThinItalic-BETA.woff") format("woff");
-}
-
- at font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 200;
- src: url("Inter-ExtraLight-BETA.woff2") format("woff2"),
- url("Inter-ExtraLight-BETA.woff") format("woff");
-}
- at font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 200;
- src: url("Inter-ExtraLightItalic-BETA.woff2") format("woff2"),
- url("Inter-ExtraLightItalic-BETA.woff") format("woff");
-}
-
- at font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 300;
- src: url("Inter-Light-BETA.woff2") format("woff2"),
- url("Inter-Light-BETA.woff") format("woff");
-}
- at font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 300;
- src: url("Inter-LightItalic-BETA.woff2") format("woff2"),
- url("Inter-LightItalic-BETA.woff") format("woff");
-}
-
- at font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 400;
- src: url("Inter-Regular.woff2") format("woff2"),
- url("Inter-Regular.woff") format("woff");
-}
- at font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 400;
- src: url("Inter-Italic.woff2") format("woff2"),
- url("Inter-Italic.woff") format("woff");
-}
-
- at font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 500;
- src: url("Inter-Medium.woff2") format("woff2"),
- url("Inter-Medium.woff") format("woff");
-}
- at font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 500;
- src: url("Inter-MediumItalic.woff2") format("woff2"),
- url("Inter-MediumItalic.woff") format("woff");
-}
-
- at font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 600;
- src: url("Inter-SemiBold.woff2") format("woff2"),
- url("Inter-SemiBold.woff") format("woff");
-}
- at font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 600;
- src: url("Inter-SemiBoldItalic.woff2") format("woff2"),
- url("Inter-SemiBoldItalic.woff") format("woff");
-}
-
- at font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 700;
- src: url("Inter-Bold.woff2") format("woff2"),
- url("Inter-Bold.woff") format("woff");
-}
- at font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 700;
- src: url("Inter-BoldItalic.woff2") format("woff2"),
- url("Inter-BoldItalic.woff") format("woff");
-}
-
- at font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 800;
- src: url("Inter-ExtraBold.woff2") format("woff2"),
- url("Inter-ExtraBold.woff") format("woff");
-}
- at font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 800;
- src: url("Inter-ExtraBoldItalic.woff2") format("woff2"),
- url("Inter-ExtraBoldItalic.woff") format("woff");
-}
-
- at font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 900;
- src: url("Inter-Black.woff2") format("woff2"),
- url("Inter-Black.woff") format("woff");
-}
- at font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 900;
- src: url("Inter-BlackItalic.woff2") format("woff2"),
- url("Inter-BlackItalic.woff") format("woff");
-}
-
-/* -------------------------------------------------------
-Variable font.
-Usage:
-
- html { font-family: 'Inter', sans-serif; }
- @supports (font-variation-settings: normal) {
- html { font-family: 'Inter var', sans-serif; }
- }
-*/
- at font-face {
- font-family: 'Inter var';
- font-weight: 100 900;
- font-style: normal;
- font-named-instance: 'Regular';
- src: url("Inter-upright.var.woff2") format("woff2");
-}
- at font-face {
- font-family: 'Inter var';
- font-weight: 100 900;
- font-style: italic;
- font-named-instance: 'Italic';
- src: url("Inter-italic.var.woff2") format("woff2");
-}
-
-
-/* --------------------------------------------------------------------------
-[EXPERIMENTAL] Multi-axis, single variable font.
-
-Slant axis is not yet widely supported (as of February 2019) and thus this
-multi-axis single variable font is opt-in rather than the default.
-
-When using this, you will probably need to set font-variation-settings
-explicitly, e.g.
-
- * { font-variation-settings: "slnt" 0deg }
- .italic { font-variation-settings: "slnt" 10deg }
-
-*/
- at font-face {
- font-family: 'Inter var experimental';
- font-weight: 100 900;
- font-style: oblique 0deg 10deg;
- src: url("Inter.var.woff2") format("woff2");
-}
-----------------------------------------------------------------------
More information about the rt-commit
mailing list