Skip to content

Commit c651019

Browse files
authored
[6.x] Pull assets from 5.9 (#18087)
* Pull assets from 5.9 * Delete legacy-bundles folder * Ignore build files * Run prettier * Fix prettier * Ignore everything in yii2-adapter for prettier * Conform to the right prettier
1 parent e49a1d5 commit c651019

File tree

556 files changed

+2921
-2855
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

556 files changed

+2921
-2855
lines changed

.prettierignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ composer.lock
44
**/dist/*
55
vendor/*
66
.ddev/*
7-
yii2-adapter/cpresources/*
8-
yii2-adapter/lib/*
9-
yii2-adapter/legacy/web/assets/**/dist/*
10-
yii2-adapter/legacy-tests/_craft/*
7+
resources/build/*
8+
yii2-adapter/*
119
tests-playwright/.authentication.json

packages/craftcms-sass/_mixins.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ $menuBorderRadius: $mediumBorderRadius;
191191
}
192192

193193
@mixin fixed-width-font($size: 0.9em) {
194-
font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier,
195-
monospace;
194+
font-family:
195+
'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
196196
font-size: $size !important;
197197
}
198198

@@ -862,7 +862,8 @@ $menuBorderRadius: $mediumBorderRadius;
862862
@mixin checkered-bg($size) {
863863
// h/t https://gist.github.com/dfrankland/f6fed3e3ccc42e3de482b324126f9542
864864
$halfSize: $size * 0.5;
865-
background-image: linear-gradient(
865+
background-image:
866+
linear-gradient(
866867
45deg,
867868
#{color.adjust($grey300, $alpha: -0.75)} 25%,
868869
transparent 25%

resources/legacy-bundles/admintable/dist/css/app.css

Lines changed: 0 additions & 2 deletions
This file was deleted.

resources/legacy-bundles/admintable/dist/css/app.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

resources/legacy-bundles/admintable/dist/js/app.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

resources/legacy-bundles/admintable/dist/js/app.js.LICENSE.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

resources/legacy-bundles/admintable/dist/js/app.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

resources/legacy-bundles/admintable/dist/manifest.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

resources/legacy-bundles/animationblocker/dist/AnimationBlocker.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)