Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ISSUE #9448] use local font files #9995

Merged
merged 1 commit into from
Feb 23, 2023
Merged

[ISSUE #9448] use local font files #9995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion console-ui/build/webpack.prod.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ cssLoader.use.push({
options: {
modifyVars: {
'$icon-font-path': '"../console-ui/public/icons/icon-font"',
'$font-custom-path': '"../console-ui/public/fonts/"'
'$font-custom-path': '"../console-ui/public/fonts/"',
'$adv-icon-font-path': '"../console-ui/public/fonts/font_1533967_slipq25tezj"',
}
}
})
Expand Down
2 changes: 0 additions & 2 deletions console-ui/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ import reducers from './reducers';
import { changeLanguage } from './reducers/locale';

import './index.scss';
import '@alifd/theme-design-pro/variables.css';
import '@alifd/theme-design-pro/dist/next.var.css';
import PropTypes from 'prop-types';

module.hot && module.hot.accept();
Expand Down
12 changes: 12 additions & 0 deletions console-ui/src/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,3 +1258,15 @@ form.vertical-margin-lg .form-group {
.row-bg-red {
background-color: #ffece4;
}


// 引用主题变量
@import "~@alifd/theme-design-pro/variables.scss";

$adv-icon-font-path: "http://at.alicdn.com/t/font_1533967_slipq25tezj.woff2" !default;
$icon-font-path: $adv-icon-font-path;

// 引用基础主题
@import "~@alifd/next/index.scss";

@import "~@alifd/theme-design-pro/icons.scss";
Binary file added console/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.ttf
View file
Open in desktop
Binary file not shown.
Binary file added console/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff
View file
Open in desktop
Binary file not shown.
Binary file added console/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff2
View file
Open in desktop
Binary file not shown.
22 changes: 8 additions & 14 deletions console/src/main/resources/static/css/main.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions console/src/main/resources/static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
<!-- 第三方css结束 -->
<link href="./css/main.css?a8bd622b4e7c17b2a122" rel="stylesheet"></head>
<link href="./css/main.css?e6cfdf2bcbe588ff572f" rel="stylesheet"></head>

<body>
<div id="root" style="overflow:hidden"></div>
Expand All @@ -56,6 +56,6 @@
<script src="console-ui/public/js/merge.js"></script>
<script src="console-ui/public/js/loader.js"></script>
<!-- 第三方js结束 -->
<script type="text/javascript" src="./js/main.js?a8bd622b4e7c17b2a122"></script></body>
<script type="text/javascript" src="./js/main.js?e6cfdf2bcbe588ff572f"></script></body>

</html>
22 changes: 11 additions & 11 deletions console/src/main/resources/static/js/main.js
View file
Open in desktop

Large diffs are not rendered by default.