mstdn.y-zu.org/mastodon
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #301 from Rintan/features/material-theme

Browse Source 
エラー修正(のつもり)
This commit is contained in:
YorimiMochida 2020-11-07 00:34:29 +09:00 committed by GitHub
commit b4a4322cb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
View File

@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
@font-face {
font-family: "Material Icons";
src: local("Material Icons"),
url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
}
}
@if $icon-font-style == outlined {
@font-face {
font-family: "Material Icons Outlined";
src: local("Material Icons Outlined"),
url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
}
}
@if $icon-font-style == round {
@font-face {
font-family: "Material Icons Round";
src: local("Material Icons"),
url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
}
}
@if $icon-font-style == sharp {
@font-face {
font-family: "Material Icons Sharp";
src: local("Material Icons Sharp"),
url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
}
}
@if $icon-font-style == two-tone {
@font-face {
font-family: "Material Icons Two Tone";
src: local("Material Icons Two Tone"),
url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
}
}
}

10
app/javascript/styles/mastodon-material-light/theme/_mixins.scss
View File

@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
@font-face {
font-family: "Material Icons";
src: local("Material Icons"),
url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
}
}
@if $icon-font-style == outlined {
@font-face {
font-family: "Material Icons Outlined";
src: local("Material Icons Outlined"),
url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
}
}
@if $icon-font-style == round {
@font-face {
font-family: "Material Icons Round";
src: local("Material Icons"),
url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
}
}
@if $icon-font-style == sharp {
@font-face {
font-family: "Material Icons Sharp";
src: local("Material Icons Sharp"),
url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
}
}
@if $icon-font-style == two-tone {
@font-face {
font-family: "Material Icons Two Tone";
src: local("Material Icons Two Tone"),
url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
}
}
}

10
app/javascript/styles/material-black/theme/_mixins.scss
View File

@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
@font-face {
font-family: "Material Icons";
src: local("Material Icons"),
url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
}
}
@if $icon-font-style == outlined {
@font-face {
font-family: "Material Icons Outlined";
src: local("Material Icons Outlined"),
url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
}
}
@if $icon-font-style == round {
@font-face {
font-family: "Material Icons Round";
src: local("Material Icons"),
url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
}
}
@if $icon-font-style == sharp {
@font-face {
font-family: "Material Icons Sharp";
src: local("Material Icons Sharp"),
url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
}
}
@if $icon-font-style == two-tone {
@font-face {
font-family: "Material Icons Two Tone";
src: local("Material Icons Two Tone"),
url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
}
}
}

10
app/javascript/styles/material-dark/theme/_mixins.scss
View File

@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
@font-face {
font-family: "Material Icons";
src: local("Material Icons"),
url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
}
}
@if $icon-font-style == outlined {
@font-face {
font-family: "Material Icons Outlined";
src: local("Material Icons Outlined"),
url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
}
}
@if $icon-font-style == round {
@font-face {
font-family: "Material Icons Round";
src: local("Material Icons"),
url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
}
}
@if $icon-font-style == sharp {
@font-face {
font-family: "Material Icons Sharp";
src: local("Material Icons Sharp"),
url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
}
}
@if $icon-font-style == two-tone {
@font-face {
font-family: "Material Icons Two Tone";
src: local("Material Icons Two Tone"),
url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
}
}
}

10
app/javascript/styles/material-light/theme/_mixins.scss
View File

@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
@font-face {
font-family: "Material Icons";
src: local("Material Icons"),
url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
}
}
@if $icon-font-style == outlined {
@font-face {
font-family: "Material Icons Outlined";
src: local("Material Icons Outlined"),
url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
}
}
@if $icon-font-style == round {
@font-face {
font-family: "Material Icons Round";
src: local("Material Icons"),
url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
}
}
@if $icon-font-style == sharp {
@font-face {
font-family: "Material Icons Sharp";
src: local("Material Icons Sharp"),
url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
}
}
@if $icon-font-style == two-tone {
@font-face {
font-family: "Material Icons Two Tone";
src: local("Material Icons Two Tone"),
url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
}
}
}

10
app/javascript/styles/plus/theme/_mixins.scss
View File

@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
@font-face {
font-family: "Material Icons";
src: local("Material Icons"),
url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
}
}
@if $icon-font-style == outlined {
@font-face {
font-family: "Material Icons Outlined";
src: local("Material Icons Outlined"),
url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
}
}
@if $icon-font-style == round {
@font-face {
font-family: "Material Icons Round";
src: local("Material Icons"),
url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
}
}
@if $icon-font-style == sharp {
@font-face {
font-family: "Material Icons Sharp";
src: local("Material Icons Sharp"),
url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
}
}
@if $icon-font-style == two-tone {
@font-face {
font-family: "Material Icons Two Tone";
src: local("Material Icons Two Tone"),
url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
}
}
}