diff --git a/YLErpWeb/rebuild-bundles.ps1 b/YLErpWeb/rebuild-bundles.ps1 index f2228134..ee7187ea 100644 --- a/YLErpWeb/rebuild-bundles.ps1 +++ b/YLErpWeb/rebuild-bundles.ps1 @@ -61,6 +61,8 @@ foreach ($bundle in $bundles) { } # Read text (UTF8, BOM auto-stripped by ReadAllText) $text = [System.IO.File]::ReadAllText($inputPath, [System.Text.Encoding]::UTF8) + # Normalize CRLF to LF (bundle artifacts use LF in git repo) + $text = $text -replace "`r`n", "`n" $parts.Add($text) } @@ -76,8 +78,8 @@ foreach ($bundle in $bundles) { $mismatches += "$outputRel : input BOM ($($bomInputs -join ', '))" } - # Pure concatenation with CRLF separator between files (matches BuildBundlerMinifier output) - $content = [string]::Join("`r`n", $parts) + # Pure concatenation with LF separator between files (matches committed bundle artifacts) + $content = [string]::Join("`n", $parts) # For minified artifacts, only report, do not write if ($isMinified) { diff --git a/YLErpWeb/wwwroot/Statics/bundles/bundle.css b/YLErpWeb/wwwroot/Statics/bundles/bundle.css index 2beac200..3e439a57 100644 --- a/YLErpWeb/wwwroot/Statics/bundles/bundle.css +++ b/YLErpWeb/wwwroot/Statics/bundles/bundle.css @@ -1230,7 +1230,7 @@ a.g-menu-item, a.soptclass, a.clearsearchclass { cursor: pointer; } .ui-jqgrid .ui-icon-asc { margin-left: 3px; margin-top: 5px; width: 12px; background-size: contain; background-position: unset; background-repeat: no-repeat; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAAXNSR0IArs4c6QAAAFdJREFUKFNjZCARMJKonoE6GtTU1BpANt+6dQtMIwMMG6CK66GKGtE1oWhAUwwzGEUTXAMOxRiawBoIKEbRxKiurq7+9+9fSWKCl5mZ+Tl1ghWfbSTbAAAepBypKfj+tQAAAABJRU5ErkJggg==); } .ui-jqgrid .ui-icon-desc { margin-left: 3px; margin-top: 12px; width: 12px; background-size: contain; background-position: unset; background-repeat: no-repeat; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAAXNSR0IArs4c6QAAAGBJREFUKFOVkMsNwCAMQ42YogskYzas6QU6RaSKHhC0VJCc/eJPQvBSUI84oKrq7seOU875ehxExACcC6iQtBZpARnJUh8OHX6gJv4Ak3iDeAp0EGrmd6/4rDtz9pqwww2z5Bypoz9s1gAAAABJRU5ErkJggg==); } .ui-jqgrid .ui-jqgrid-resize { height: 100% !important; margin-top: 0; } -/*��ҳ*/ +/*·ÖÒ³*/ .ui-pg-button .fa { font-size: 140%; width: 24px; height: 24px; line-height: 22px; } .ui-pg-button.ui-state-hover { background: none; } .ui-pg-button.ui-state-hover .fa:hover { color: #000; font-size: 160%; } @@ -2521,11 +2521,11 @@ input[type="button"]:disabled,  input[type="submit"]:disabled, input[type="rese .table-form > tbody > tr > th { color: #495057; vertical-align: middle; font-weight: bold; text-align: right; } /********************************* - ��ҳ�沼����ʽ�ļ� + Ö÷Ò³Ãæ²¼¾ÖÑùʽÎļþ **********************************/ /********************************* - �˵�ͼ����ʽ + ²Ëµ¥Í¼±êÑùʽ **********************************/ .gtja-img { height: 25px; margin: 11px; } .gtja-title { margin: 0px; color: #4b545c; font-weight: 600; font-size: 18px; line-height: 44px; } @@ -2543,7 +2543,7 @@ input[type="button"]:disabled,  input[type="submit"]:disabled, input[type="rese .iconteleven { background-position: 0px 358px; } /************************************** - page���� + page²¼¾Ö **************************************/ .layout-main { height: 100%; } .page-header { background: #fff; border-bottom-style: solid; border-bottom-width: 1px; border-color: lightgray; box-shadow: 0 0 0 0.1rem rgba(200, 200, 200, 0.5); margin: 0 0 1rem 0; /*padding: 1rem 1rem 1rem 1rem;*/ } @@ -2638,7 +2638,7 @@ input[type="button"]:disabled,  input[type="submit"]:disabled, input[type="rese } /************************************** - page ������ + page µ¼º½Ìõ **************************************/ .page-sidebar-toggle .toggle-collapse { display: block; height: 20px; background: url(/Images/nail2.png) no-repeat; background-size: 20px; background-position-x: 50%; } .page-sidebar-toggle .toggle-collapse.using { background-image: url(/Images/nail.png); }