Skip to content

Commit 4430bde

Browse files
Merge pull request #4302 from IgorA100/patch-89
Feat: Material icons styles in a separate file from skin.css to material-icons.css
2 parents fa24799 + 388710a commit 4430bde

File tree

3 files changed

+49
-49
lines changed

3 files changed

+49
-49
lines changed
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
@font-face {
2+
font-family: "Material Icons";
3+
font-style: normal;
4+
font-weight: 400;
5+
font-display: block;
6+
src: url("../../../../fonts/material-icons.woff2") format("woff2"), url("../../../../fonts/material-icons.woff") format("woff");
7+
}
8+
.material-icons {
9+
font-family: "Material Icons";
10+
font-weight: normal;
11+
font-style: normal;
12+
font-size: 24px;
13+
line-height: 1;
14+
letter-spacing: normal;
15+
text-transform: none;
16+
display: inline-block;
17+
white-space: nowrap;
18+
word-wrap: normal;
19+
direction: ltr;
20+
-webkit-font-smoothing: antialiased;
21+
-moz-osx-font-smoothing: grayscale;
22+
text-rendering: optimizeLegibility;
23+
font-feature-settings: "liga";
24+
vertical-align: middle;
25+
display: none;
26+
}
27+
28+
.material-icons.md-8 { font-size: 8px; }
29+
.material-icons.md-10 { font-size: 10px; }
30+
.material-icons.md-12 { font-size: 12px; }
31+
.material-icons.md-14 { font-size: 14px; }
32+
.material-icons.md-16 { font-size: 16px; }
33+
.material-icons.md-18 { font-size: 18px; }
34+
.material-icons.md-20 { font-size: 20px; }
35+
.material-icons.md-22 { font-size: 22px; }
36+
.material-icons.md-24 { font-size: 24px; }
37+
.material-icons.md-26 { font-size: 26px; }
38+
.material-icons.md-28 { font-size: 28px; }
39+
.material-icons.md-30 { font-size: 30px; }
40+
.material-icons.md-32 { font-size: 32px; }
41+
.material-icons.md-34 { font-size: 34px; }
42+
.material-icons.md-36 { font-size: 36px; }
43+
.material-icons.md-38 { font-size: 38px; }
44+
.material-icons.md-40 { font-size: 40px; }
45+
46+
button .material-icons {
47+
font-size: 18px;
48+
}

web/skins/classic/css/base/skin.css

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -28,51 +28,6 @@
2828
--alarmText: inherit;
2929
}
3030

31-
@font-face {
32-
font-family: "Material Icons";
33-
font-style: normal;
34-
font-weight: 400;
35-
font-display: block;
36-
src: url("../fonts/material-icons.woff2") format("woff2"), url("../fonts/material-icons.woff") format("woff");
37-
}
38-
.material-icons {
39-
font-family: "Material Icons";
40-
font-weight: normal;
41-
font-style: normal;
42-
font-size: 24px;
43-
line-height: 1;
44-
letter-spacing: normal;
45-
text-transform: none;
46-
display: inline-block;
47-
white-space: nowrap;
48-
word-wrap: normal;
49-
direction: ltr;
50-
-webkit-font-smoothing: antialiased;
51-
-moz-osx-font-smoothing: grayscale;
52-
text-rendering: optimizeLegibility;
53-
font-feature-settings: "liga";
54-
vertical-align: middle;
55-
display: none;
56-
}
57-
58-
.material-icons.md-8 { font-size: 8px; }
59-
.material-icons.md-10 { font-size: 10px; }
60-
.material-icons.md-12 { font-size: 12px; }
61-
.material-icons.md-14 { font-size: 14px; }
62-
.material-icons.md-16 { font-size: 16px; }
63-
.material-icons.md-18 { font-size: 18px; }
64-
.material-icons.md-20 { font-size: 20px; }
65-
.material-icons.md-22 { font-size: 22px; }
66-
.material-icons.md-24 { font-size: 24px; }
67-
.material-icons.md-26 { font-size: 26px; }
68-
.material-icons.md-28 { font-size: 28px; }
69-
.material-icons.md-30 { font-size: 30px; }
70-
.material-icons.md-32 { font-size: 32px; }
71-
.material-icons.md-34 { font-size: 34px; }
72-
.material-icons.md-36 { font-size: 36px; }
73-
.material-icons.md-38 { font-size: 38px; }
74-
.material-icons.md-40 { font-size: 40px; }
75-
7631
html,
7732
body {
7833
height: 100%;
@@ -1014,10 +969,6 @@ a.flip {
1014969
font-size: 100%;
1015970
}
1016971

1017-
button .material-icons {
1018-
font-size: 18px;
1019-
}
1020-
1021972
/* input[type="search"]::-webkit-search-cancel-button {
1022973
display: none;
1023974
} */

web/skins/classic/includes/functions.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ function xhtmlHeadersStart($file, $title) {
6464
<link rel="shortcut icon" href="graphics/favicon.ico"/>
6565
';
6666
}
67+
echo output_link_if_exists(array('css/base/material-icons.css'));
6768
echo output_cache_busted_stylesheet_links(array(
6869
'css/reset.css',
6970
'css/font-awesome.min.css',

0 commit comments

Comments
 (0)