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

Remove loading fontawesome 4 #5557

Merged
merged 1 commit into from
Aug 24, 2022
Merged

Remove loading fontawesome 4 #5557

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
78 changes: 47 additions & 31 deletions html/template/admin/assets/css/app.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion html/template/admin/assets/css/app.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/admin/assets/css/app.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/admin/assets/css/app.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

61 changes: 36 additions & 25 deletions html/template/admin/assets/scss/component/_directory.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,33 @@ Styleguide 7.0
//1層目
label {
&::before {
content: "\f147";
content: "\f146";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
}
}
label[data-toggle="collapse"] {
&::before {
content: "\f147";
content: "\f146";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
}
}

label.collapsed {
&::before {
content: "\f196";
content: "\f0fe";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
}
}
//2層目以降
Expand Down Expand Up @@ -70,33 +73,36 @@ Styleguide 7.0
}
label {
&::after {
content: "\f147";
content: "\f146";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
position: absolute;
left: 20px;
}
}
label[data-toggle="collapse"] {
&::after {
content: "\f147";
content: "\f146";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
position: absolute;
left: 20px;
}
}
label.collapsed {
&::after {
content: "\f196";
content: "\f0fe";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
position: absolute;
left: 20px;
}
Expand Down Expand Up @@ -191,30 +197,32 @@ Styleguide 7.2
//1層目
label {
&::before {
content: "\f114";
content: "\f07b";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
}
}
label[data-toggle="collapse"] {
&::before {
content: "\f115";
content: "\f07c";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;

font-weight: 400;
}
}
label.collapsed {
&::before {
content: "\f114";
content: "\f07b";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
}
}
//2層目以降
Expand Down Expand Up @@ -245,33 +253,36 @@ Styleguide 7.2
}
label {
&::after {
content: "\f114";
content: "\f07b";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
position: absolute;
left: 20px;
}
}
label[data-toggle="collapse"] {
&::after {
content: "\f115";
content: "\f07c";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
position: absolute;
left: 20px;
}
}
label.collapsed {
&::after {
content: "\f114";
content: "\f07b";
display: inline-block;
margin-right: .5em;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 16px;
font-weight: 400;
position: absolute;
left: 20px;
}
Expand Down
6 changes: 4 additions & 2 deletions html/template/admin/assets/scss/component/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ p 項目の内容はドラッグ＆ドロップで変更可能です。

.delete-image {
display: none;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 18px;
font-weight: 400;
line-height: 1;
color: #54687A;
padding: 5px;
Expand All @@ -73,8 +74,9 @@ p 項目の内容はドラッグ＆ドロップで変更可能です。

.delete-image {
display: inline-block;
font-family: FontAwesome;
font-family: 'Font Awesome 5 Free';
font-size: 18px;
font-weight: 400;
line-height: 1;
color: #54687A;
padding: 5px;
Expand Down
Loading