Skip to content

Commit 6593290

Browse files
gesseekurgesseekur
committedJun 9, 2020
Revert font fix
1 parent 2a98b2f commit 6593290

9 files changed

+66
-2485
lines changed
 

‎jsconfig.json

-9
This file was deleted.

‎src/assets/fonts/Material-Icons/MaterialIcons-Regular.eot

-140 KB
Binary file not shown.

‎src/assets/fonts/Material-Icons/MaterialIcons-Regular.svg

-2,373
This file was deleted.

‎src/assets/fonts/Material-Icons/MaterialIcons-Regular.ttf

-125 KB
Binary file not shown.

‎src/assets/fonts/Material-Icons/MaterialIcons-Regular.woff

-56.3 KB
Binary file not shown.

‎src/assets/fonts/Material-Icons/MaterialIcons-Regular.woff2

-43.3 KB
Binary file not shown.

‎src/assets/styles/setup/_fonts.scss

+41-53
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
font-style: normal;
55
font-weight: 100;
66
src: local('Roboto Thin'), local('Roboto-Thin'),
7-
url('../fonts/Roboto/roboto-v20-latin-100.eot?#iefi') format('embedded-opentype'),
7+
url('/assets/fonts/Roboto/roboto-v20-latin-100.eot?#iefi') format('embedded-opentype'),
88
/* IE6-IE8 */
9-
url('../fonts/Roboto/roboto-v20-latin-100.woff2') format('woff2'),
9+
url('/assetsRoboto/roboto-v20-latin-100.woff2') format('woff2'),
1010
/* Super Modern Browsers */
11-
url('../fonts/Roboto/roboto-v20-latin-100.woff') format('woff'),
11+
url('/assets/fonts/Roboto/roboto-v20-latin-100.woff') format('woff'),
1212
/* Modern Browsers */
13-
url('../fonts/Roboto/roboto-v20-latin-100.ttf') format('truetype'),
13+
url('/assets/fonts/Roboto/roboto-v20-latin-100.ttf') format('truetype'),
1414
/* Safari, Android, iOS */
15-
url('../fonts/Roboto/roboto-v20-latin-100.svg#Roboto') format('svg');
15+
url('/assets/fonts/Roboto/roboto-v20-latin-100.svg#Roboto') format('svg');
1616
/* Legacy iOS */
1717
}
1818

@@ -21,18 +21,18 @@
2121
font-family: 'Roboto';
2222
font-style: normal;
2323
font-weight: 300;
24-
src: url('../fonts/Roboto/roboto-v20-latin-300.eot');
24+
src: url('/assets/fonts/Roboto/roboto-v20-latin-300.eot');
2525
/* IE9 Compat Modes */
2626
src: local('Roboto Light'), local('Roboto-Light'),
27-
url('../fonts/Roboto/roboto-v20-latin-300.eot?#iefix') format('embedded-opentype'),
27+
url('/assets/fonts/Roboto/roboto-v20-latin-300.eot?#iefix') format('embedded-opentype'),
2828
/* IE6-IE8 */
29-
url('../fonts/Roboto/roboto-v20-latin-300.woff2') format('woff2'),
29+
url('/assets/fonts/Roboto/roboto-v20-latin-300.woff2') format('woff2'),
3030
/* Super Modern Browsers */
31-
url('../fonts/Roboto/roboto-v20-latin-300.woff') format('woff'),
31+
url('/assets/fonts/Roboto/roboto-v20-latin-300.woff') format('woff'),
3232
/* Modern Browsers */
33-
url('../fonts/Roboto/roboto-v20-latin-300.ttf') format('truetype'),
33+
url('/assets/fonts/Roboto/roboto-v20-latin-300.ttf') format('truetype'),
3434
/* Safari, Android, iOS */
35-
url('../fonts/Roboto/roboto-v20-latin-300.svg#Roboto') format('svg');
35+
url('/assets/fonts/Roboto/roboto-v20-latin-300.svg#Roboto') format('svg');
3636
/* Legacy iOS */
3737
}
3838

@@ -41,18 +41,18 @@
4141
font-family: 'Roboto';
4242
font-style: normal;
4343
font-weight: 400;
44-
src: url('../fonts/Roboto/roboto-v20-latin-regular.eot');
44+
src: url('/assets/fonts/Roboto/roboto-v20-latin-regular.eot');
4545
/* IE9 Compat Modes */
4646
src: local('Roboto'), local('Roboto-Regular'),
47-
url('../fonts/Roboto/roboto-v20-latin-regular.eot?#iefix') format('embedded-opentype'),
47+
url('/assets/fonts/Roboto/roboto-v20-latin-regular.eot?#iefix') format('embedded-opentype'),
4848
/* IE6-IE8 */
49-
url('../fonts/Roboto/roboto-v20-latin-regular.woff2') format('woff2'),
49+
url('/assets/fonts/Roboto/roboto-v20-latin-regular.woff2') format('woff2'),
5050
/* Super Modern Browsers */
51-
url('../fonts/Roboto/roboto-v20-latin-regular.woff') format('woff'),
51+
url('/assets/fonts/Roboto/roboto-v20-latin-regular.woff') format('woff'),
5252
/* Modern Browsers */
53-
url('../fonts/Roboto/roboto-v20-latin-regular.ttf') format('truetype'),
53+
url('/assets/fonts/Roboto/roboto-v20-latin-regular.ttf') format('truetype'),
5454
/* Safari, Android, iOS */
55-
url('../fonts/Roboto/roboto-v20-latin-regular.svg#Roboto') format('svg');
55+
url('/assets/fonts/Roboto/roboto-v20-latin-regular.svg#Roboto') format('svg');
5656
/* Legacy iOS */
5757
}
5858

@@ -61,18 +61,18 @@
6161
font-family: 'Roboto';
6262
font-style: normal;
6363
font-weight: 500;
64-
src: url('../fonts/Roboto/roboto-v20-latin-500.eot');
64+
src: url('/assets/fonts/Roboto/roboto-v20-latin-500.eot');
6565
/* IE9 Compat Modes */
6666
src: local('Roboto Medium'), local('Roboto-Medium'),
67-
url('../fonts/Roboto/roboto-v20-latin-500.eot?#iefix') format('embedded-opentype'),
67+
url('/assets/fonts/Roboto/roboto-v20-latin-500.eot?#iefix') format('embedded-opentype'),
6868
/* IE6-IE8 */
69-
url('../fonts/Roboto/roboto-v20-latin-500.woff2') format('woff2'),
69+
url('/assets/fonts/Roboto/roboto-v20-latin-500.woff2') format('woff2'),
7070
/* Super Modern Browsers */
71-
url('../fonts/Roboto/roboto-v20-latin-500.woff') format('woff'),
71+
url('/assets/fonts/Roboto/roboto-v20-latin-500.woff') format('woff'),
7272
/* Modern Browsers */
73-
url('../fonts/Roboto/roboto-v20-latin-500.ttf') format('truetype'),
73+
url('/assets/fonts/Roboto/roboto-v20-latin-500.ttf') format('truetype'),
7474
/* Safari, Android, iOS */
75-
url('../fonts/Roboto/roboto-v20-latin-500.svg#Roboto') format('svg');
75+
url('/assets/fonts/Roboto/roboto-v20-latin-500.svg#Roboto') format('svg');
7676
/* Legacy iOS */
7777
}
7878

@@ -81,18 +81,18 @@
8181
font-family: 'Roboto';
8282
font-style: normal;
8383
font-weight: 700;
84-
src: url('../fonts/Roboto/roboto-v20-latin-700.eot');
84+
src: url('/assets/fonts/Roboto/roboto-v20-latin-700.eot');
8585
/* IE9 Compat Modes */
8686
src: local('Roboto Bold'), local('Roboto-Bold'),
87-
url('../fonts/Roboto/roboto-v20-latin-700.eot?#iefix') format('embedded-opentype'),
87+
url('/assets/fonts/Roboto/roboto-v20-latin-700.eot?#iefix') format('embedded-opentype'),
8888
/* IE6-IE8 */
89-
url('../fonts/Roboto/roboto-v20-latin-700.woff2') format('woff2'),
89+
url('/assets/fonts/Roboto/roboto-v20-latin-700.woff2') format('woff2'),
9090
/* Super Modern Browsers */
91-
url('../fonts/Roboto/roboto-v20-latin-700.woff') format('woff'),
91+
url('/assets/fonts/Roboto/roboto-v20-latin-700.woff') format('woff'),
9292
/* Modern Browsers */
93-
url('../fonts/Roboto/roboto-v20-latin-700.ttf') format('truetype'),
93+
url('/assets/fonts/Roboto/roboto-v20-latin-700.ttf') format('truetype'),
9494
/* Safari, Android, iOS */
95-
url('../fonts/Roboto/roboto-v20-latin-700.svg#Roboto') format('svg');
95+
url('/assets/fonts/Roboto/roboto-v20-latin-700.svg#Roboto') format('svg');
9696
/* Legacy iOS */
9797
}
9898

@@ -101,18 +101,18 @@
101101
font-family: 'Roboto';
102102
font-style: normal;
103103
font-weight: 900;
104-
src: url('../fonts/Roboto/roboto-v20-latin-900.eot');
104+
src: url('/assets/fonts/Roboto/roboto-v20-latin-900.eot');
105105
/* IE9 Compat Modes */
106106
src: local('Roboto Black'), local('Roboto-Black'),
107-
url('../fonts/Roboto/roboto-v20-latin-900.eot?#iefix') format('embedded-opentype'),
107+
url('/assets/fonts/Roboto/roboto-v20-latin-900.eot?#iefix') format('embedded-opentype'),
108108
/* IE6-IE8 */
109-
url('../fonts/Roboto/roboto-v20-latin-900.woff2') format('woff2'),
109+
url('/assets/fonts/Roboto/roboto-v20-latin-900.woff2') format('woff2'),
110110
/* Super Modern Browsers */
111-
url('../fonts/Roboto/roboto-v20-latin-900.woff') format('woff'),
111+
url('/assets/fonts/Roboto/roboto-v20-latin-900.woff') format('woff'),
112112
/* Modern Browsers */
113-
url('../fonts/Roboto/roboto-v20-latin-900.ttf') format('truetype'),
113+
url('/assets/fonts/Roboto/roboto-v20-latin-900.ttf') format('truetype'),
114114
/* Safari, Android, iOS */
115-
url('../fonts/Roboto/roboto-v20-latin-900.svg#Roboto') format('svg');
115+
url('/assets/fonts/Roboto/roboto-v20-latin-900.svg#Roboto') format('svg');
116116
/* Legacy iOS */
117117
}
118118

@@ -121,24 +121,12 @@
121121
font-family: 'PT Mono';
122122
font-style: normal;
123123
font-weight: 400;
124-
src: url('../fonts/PT-Mono/pt-mono-v7-latin-regular.eot'); /* IE9 Compat Modes */
124+
src: url('/assets/PT-Mono/pt-mono-v7-latin-regular.eot'); /* IE9 Compat Modes */
125125
src: local('PT Mono'), local('PTMono-Regular'),
126-
url('../fonts/PT-Mono/pt-mono-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
127-
url('../fonts/PT-Mono/pt-mono-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
128-
url('../fonts/PT-Mono/pt-mono-v7-latin-regular.woff') format('woff'), /* Modern Browsers */
129-
url('../fonts/PT-Mono/pt-mono-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
130-
url('../fonts/PT-Mono/pt-mono-v7-latin-regular.svg#PTMono') format('svg'); /* Legacy iOS */
126+
url('/assets/PT-Mono/pt-mono-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
127+
url('/assets/PT-Mono/pt-mono-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
128+
url('/assets/PT-Mono/pt-mono-v7-latin-regular.woff') format('woff'), /* Modern Browsers */
129+
url('/assets/PT-Mono/pt-mono-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
130+
url('/assets/PT-Mono/pt-mono-v7-latin-regular.svg#PTMono') format('svg'); /* Legacy iOS */
131131
}
132132

133-
134-
@font-face {
135-
font-family: 'Material Icons';
136-
font-style: normal;
137-
font-weight: 400;
138-
src: url('../fonts/Material-Icons/MaterialIcons-Regular.eot'); /* For IE6-8 */
139-
src: local('Material Icons'),
140-
local('MaterialIcons-Regular'),
141-
url('../fonts/Material-Icons/MaterialIcons-Regular.woff2') format('woff2'),
142-
url('../fonts/Material-Icons/MaterialIcons-Regular.woff') format('woff'),
143-
url('../fonts/Material-Icons/MaterialIcons-Regular.ttf') format('truetype');
144-
}

‎src/assets/styles/setup/_typography.scss

-25
Original file line numberDiff line numberDiff line change
@@ -53,29 +53,4 @@
5353
font-weight: bold;
5454
margin-bottom: 15px;
5555
padding-left: 10px;
56-
}
57-
58-
.material-icons {
59-
font-family: 'Material Icons';
60-
font-weight: normal;
61-
font-style: normal;
62-
font-size: 24px; /* Preferred icon size */
63-
display: inline-block;
64-
line-height: 1;
65-
text-transform: none;
66-
letter-spacing: normal;
67-
word-wrap: normal;
68-
white-space: nowrap;
69-
direction: ltr;
70-
71-
/* Support for all WebKit browsers. */
72-
-webkit-font-smoothing: antialiased;
73-
/* Support for Safari and Chrome. */
74-
text-rendering: optimizeLegibility;
75-
76-
/* Support for Firefox. */
77-
-moz-osx-font-smoothing: grayscale;
78-
79-
/* Support for IE. */
80-
font-feature-settings: 'liga';
8156
}

‎vue.config.js

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
module.exports = {
2-
assetsDir: '/mew-components/',
3-
publicPath: './', // Base directory for dev
4-
css: {
5-
sourceMap: true,
6-
loaderOptions: {
7-
sass: {
8-
data: '@import "@/assets/styles/global.scss";'
9-
}
10-
}
11-
},
12-
chainWebpack: config => {
13-
config.module
14-
.rule('fonts')
15-
.test(/\.(ttf|otf|eot|woff|woff2)$/)
16-
.use('file-loader')
17-
.loader('file-loader')
18-
.tap(options => {
19-
options = {
20-
// limit: 10000,
21-
name: '/assets/fonts/[name].[ext]',
22-
}
23-
return options
24-
})
25-
.end()
26-
},
2+
// assetsDir: '/mew-components/',
3+
// publicPath: './', // Base directory for dev
4+
// css: {
5+
// sourceMap: true,
6+
// loaderOptions: {
7+
// sass: {
8+
// data: '@import "@/assets/styles/global.scss";'
9+
// }
10+
// }
11+
// },
12+
// chainWebpack: config => {
13+
// config.module
14+
// .rule('fonts')
15+
// .test(/\.(ttf|otf|eot|woff|woff2)$/)
16+
// .use('file-loader')
17+
// .loader('file-loader')
18+
// .tap(options => {
19+
// options = {
20+
// // limit: 10000,
21+
// name: '/assets/fonts/[name].[ext]',
22+
// }
23+
// return options
24+
// })
25+
// .end()
26+
// },
2727
pluginOptions: {
2828
'style-resources-loader': {
2929
preProcessor: 'scss',

0 commit comments

Comments
 (0)
Please sign in to comment.