From 822356a1ff736bc14db556cab19e5ff47cd0b04e Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 4 May 2023 22:28:53 +0530 Subject: [PATCH 1/6] NC 25 UI background and remove border edge --- core/css/server.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 9aae37a1..1a3e2336 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -55,6 +55,9 @@ --notification-icon-invert: invert(0%); --active-icon-filter: brightness(0) saturate(100%) invert(38%) sepia(88%) saturate(4068%) hue-rotate(197deg) brightness(102%) contrast(106%); --inactive-icon-filter: brightness(0) saturate(100%) invert(50%) sepia(12%) saturate(0%) hue-rotate(187deg) brightness(98%) contrast(94%); + --body-container-margin: 0px; + --body-container-radius: 0px; + --body-height: 100%; } /* Force a few variables to right values for dark theme */ @@ -79,6 +82,7 @@ body { line-height: var(--default-line-height); font-family: var(--font-face); color: var(--color-main-text); + background-image: unset; } #body-user #header, -- GitLab From 0791281ef989fb7451a999c09c283c97d668c8b8 Mon Sep 17 00:00:00 2001 From: Ronak Date: Tue, 9 May 2023 14:45:37 -0700 Subject: [PATCH 2/6] temp change --- .gitlab-ci.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f6762a1..3a1c3207 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,2 @@ variables: APP_NAME: eCloud - -# Deploy stage -include: - - project: 'e/infra/ecloud/nextcloud-apps/ci-templates' - ref: main - file: 'nc-apps-checkout-deploy.yml' - -.deploy:nextcloud-app-by-checkout: - script: - # print var to confirm - - echo "Deploying $APP_NAME to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)" - # clone repo to /tmp - - | - ssh $SSH_USER@$DEPLOYMENT_HOST /bin/bash -s << EOT - git clone --depth 1 $CI_REPOSITORY_URL --branch $CI_COMMIT_REF_NAME --single-branch /tmp/${CI_JOB_ID}/${APP_NAME} - sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME}/ ${DEPLOYMENT_PATH}/html/themes/${APP_NAME}/ - docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ maintenance:theme:update - EOT - - echo "SUCCESS" > .job_status -- GitLab From 6954b76e806b3c29302554a9a632e8a9b96f7aec Mon Sep 17 00:00:00 2001 From: Ronak Date: Tue, 9 May 2023 14:46:14 -0700 Subject: [PATCH 3/6] temp change --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a1c3207..879b33b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,2 +1,8 @@ variables: APP_NAME: eCloud + +# Deploy stage +include: + - project: 'e/infra/ecloud/nextcloud-apps/ci-templates' + ref: main + file: 'nc-apps-checkout-deploy.yml' -- GitLab From d5a890e96e4d550bee748e2d78bb6e1d1f955f0d Mon Sep 17 00:00:00 2001 From: Ronak Date: Tue, 9 May 2023 14:47:13 -0700 Subject: [PATCH 4/6] revert temp change --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 879b33b0..7f6762a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,3 +6,16 @@ include: - project: 'e/infra/ecloud/nextcloud-apps/ci-templates' ref: main file: 'nc-apps-checkout-deploy.yml' + +.deploy:nextcloud-app-by-checkout: + script: + # print var to confirm + - echo "Deploying $APP_NAME to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)" + # clone repo to /tmp + - | + ssh $SSH_USER@$DEPLOYMENT_HOST /bin/bash -s << EOT + git clone --depth 1 $CI_REPOSITORY_URL --branch $CI_COMMIT_REF_NAME --single-branch /tmp/${CI_JOB_ID}/${APP_NAME} + sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME}/ ${DEPLOYMENT_PATH}/html/themes/${APP_NAME}/ + docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ maintenance:theme:update + EOT + - echo "SUCCESS" > .job_status -- GitLab From 8fda159bd137dd5ef6f3a1c036345fb2978596cd Mon Sep 17 00:00:00 2001 From: Ronak Date: Tue, 9 May 2023 14:48:39 -0700 Subject: [PATCH 5/6] temp change --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f6762a1..16c95c4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: include: - project: 'e/infra/ecloud/nextcloud-apps/ci-templates' ref: main - file: 'nc-apps-checkout-deploy.yml' + file: 'nc-apps-deploy.yml' .deploy:nextcloud-app-by-checkout: script: -- GitLab From 30d757ce8b1bed1e4595e1c21177b4368ec7dee8 Mon Sep 17 00:00:00 2001 From: Ronak Date: Tue, 9 May 2023 14:56:37 -0700 Subject: [PATCH 6/6] revert temp change --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16c95c4f..7f6762a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: include: - project: 'e/infra/ecloud/nextcloud-apps/ci-templates' ref: main - file: 'nc-apps-deploy.yml' + file: 'nc-apps-checkout-deploy.yml' .deploy:nextcloud-app-by-checkout: script: -- GitLab