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

npm run build 時のDeplicate error を修正 #6248

Merged
merged 2 commits into from
Sep 11, 2024
Merged

npm run build 時のDeplicate error を修正 #6248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
934b29e
npm run build 時のDeplicate error を修正
ci-wataru-kashii Jul 9, 2024
24671cf
Use flex-start/flex-end
ci-wataru-kashii Jul 9, 2024
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
6 changes: 3 additions & 3 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.

2 changes: 1 addition & 1 deletion 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 @@ -5,7 +5,7 @@
li {
display: flex;
flex-wrap: wrap;
align-items: start;
align-items: flex-start;
margin-top: 5px;
margin-bottom: 0;
> a, span {
Expand Down
2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.css.map
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions html/template/default/assets/scss/component/_5.1.grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:math";
@import "../mixins/clearfix";
@import "../mixins/media";

Expand All @@ -14,7 +15,7 @@
min-height: 1px;

@media (min-width: $desktop) {
width: percentage(($columns/ 12));
width: percentage(math.div($columns, 12));
}
@include media_desktop{
}
Expand Down Expand Up @@ -169,7 +170,7 @@ Styleguide 5.1.5
margin: 0;
@include media_desktop {
@include makeSmColumn(10);
margin-left: percentage((1 / 12));
margin-left: percentage(math.div(1, 12));
}
}
}
Expand All @@ -193,7 +194,7 @@ Styleguide 5.1.6
margin: 0;
@include media_desktop {
@include makeSmColumn(8);
margin-left: percentage((2 / 12));
margin-left: percentage(math.div(2, 12));
}
}
}
Expand All @@ -215,7 +216,7 @@ Styleguide 5.1.7
margin: 0;
@include media_desktop {
@include makeSmColumn(6);
margin-left: percentage((3 / 12));
margin-left: percentage(math.div(3, 12));
}
}
}
Expand All @@ -238,7 +239,7 @@ Styleguide 5.1.8
margin: 0;
@include media_desktop {
@include makeSmColumn(4);
margin-left: percentage((4 / 12));
margin-left: percentage(math.div(4, 12));
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion html/template/default/assets/scss/component/_5.2.layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:math";
@import "../mixins/projects";
@import "../mixins/clearfix";
@import "../mixins/media";
Expand All @@ -16,7 +17,7 @@

@media (min-width: $desktop) {
float: left;
width: percentage(($columns/ 12));
width: percentage(math.div($columns, 12));
}
}

Expand Down
Loading