From d707f2d391b428368f051bfea9c0343de444212d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 28 Feb 2023 09:07:34 -0800 Subject: [PATCH 1/4] Add GitHub Action to push translation sources to Crowdin --- .github/workflows/crowdin-upload.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/crowdin-upload.yml diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml new file mode 100644 index 0000000000..c986accf37 --- /dev/null +++ b/.github/workflows/crowdin-upload.yml @@ -0,0 +1,21 @@ +name: Crowdin Action + +on: + push: + branches: [ develop ] + +jobs: + upload-sources-to-crowdin: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Crowdin push + uses: crowdin/github-action@v1 + with: + upload_sources: true + upload_translations: false + download_translations: false + project_id: ${{ secrets.CROWDIN_PROJECT_ID }} + token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} From e8fbb0608fb548e90a7b5675776ec0059a319074 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 28 Feb 2023 09:30:02 -0800 Subject: [PATCH 2/4] adjusts the sidebar margin top --- resources/assets/less/overrides.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index ae427f3392..eb90f1b850 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -671,18 +671,18 @@ th.css-accessory > .th-inner::before } @media screen and (max-width: 511px){ .sidebar-menu{ - margin-top:64px; + margin-top:160px; } } @media screen and (max-width: 771px) and (min-width: 512px){ .sidebar-menu { - margin-top:14px + margin-top:160px } } @media screen and (max-width: 1098px) and (min-width: 772px){ .sidebar-menu { - margin-top:51px + margin-top:98px } } From 2189a74d6a761bcd4582730a7ce1fb42e080e520 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 28 Feb 2023 20:32:00 -0800 Subject: [PATCH 3/4] Bumped hash Signed-off-by: snipe --- config/version.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/version.php b/config/version.php index 1eeb07c2c5..f3fef87667 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v6.0.14', - 'full_app_version' => 'v6.0.14 - build 9599-g1415c8c6e', - 'build_version' => '9599', + 'full_app_version' => 'v6.0.14 - build 9646-g417a1e624', + 'build_version' => '9646', 'prerelease_version' => '', - 'hash_version' => 'g1415c8c6e', - 'full_hash' => 'v6.0.14-555-g1415c8c6e', + 'hash_version' => 'g417a1e624', + 'full_hash' => 'v6.0.14-602-g417a1e624', 'branch' => 'develop', ); \ No newline at end of file From f9b5a67dc2f779bb5bb0641eb068b2bdb65feaf9 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 28 Feb 2023 20:32:08 -0800 Subject: [PATCH 4/4] Compiled dev assets Signed-off-by: snipe --- public/css/build/app.css | Bin 19279 -> 19281 bytes public/css/build/overrides.css | Bin 12429 -> 12431 bytes public/css/dist/all.css | Bin 544095 -> 544099 bytes public/mix-manifest.json | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index 13b44a11ea8d9a63bbf66dd0718c1bfb086300bc..b67a5f6a1cdf538bfcd2e7818fd63faf5a1ba8db 100644 GIT binary patch delta 35 ocmX>R delta 33 ncmcaOjq&_6#tougOlBsNCA_j3L8QjywO-ClriPP0dBp<&#HkBk diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index ec9e3fb85eb3098da997432aa1ad9af7077de3c0..7d0450d5203706613cb17d7e8b4e8aafad6472aa 100644 GIT binary patch delta 33 lcmeB8>`&Yftj}y{W-$4nzQ*KQeP<>xGn>iMVzQn=JOIWm3h@8{ delta 31 kcmeBA>`mMdtj}a-GC52?n-N56On$BJ%w%df*}xzk0IWj_9{>OV diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 59e1dd4d0ec74adeb991ce9dbe5071c9243a6773..e8ce16fc3c211973c6cb1086e5037d02d6ce52b0 100644 GIT binary patch delta 87 zcmcaVOY!k6#fBEf7N!>F7M2#)7Pc+yC$2Lani)(#b)7w%2|{a3kGsL{%w%aX&6gv7 MJJU^eF7M2#)7Pc+yC$2M@nM^-@ojscoOleF{xWVqsWNNs5=?(U# LVjPmwfs*k60LLFx diff --git a/public/mix-manifest.json b/public/mix-manifest.json index b200128c7d..efe45d69ce 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=f05cc05b9000ba73e1949bcf137d4301", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", - "/css/build/overrides.css": "/css/build/overrides.css?id=0465141b9ecb0662ba6790c1460f391f", - "/css/build/app.css": "/css/build/app.css?id=c3a896cab26e2093f8be24336b7db1b9", + "/css/build/overrides.css": "/css/build/overrides.css?id=d9175e3d9b9074397343dddebfe23888", + "/css/build/app.css": "/css/build/app.css?id=dcb8aa9f4501a370214a67442e88daf0", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=f343f659ca1d45534d2c2c3cc30fb619", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=ef030b613d45620b907cf0184a14e868", + "/css/dist/all.css": "/css/dist/all.css?id=e8173a8a67b5bf6eaebf76854c77e710", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",