From c1947c3cbf4f143ab0c6828d8d6b1a11c9726a0c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Apr 2023 00:42:56 +0530 Subject: [PATCH 01/22] implementing new theme fix --- defaults.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/defaults.php b/defaults.php index 64cb8905..eccc4331 100644 --- a/defaults.php +++ b/defaults.php @@ -17,8 +17,11 @@ * You should have received a copy of the GNU Affero General Public License, version 3, * along with this program. If not, see */ +namespace OCA\Theming\Themes; -class OC_Theme { +use OCA\Theming\ITheme; + +class OC_Theme extends DefaultTheme implements ITheme { /** * Returns the base URL -- GitLab From 25d61074c7aea6333c6d734102e19a6d0ff0c506 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Apr 2023 12:03:17 +0530 Subject: [PATCH 02/22] add theme --- defaults.php | 1 + 1 file changed, 1 insertion(+) diff --git a/defaults.php b/defaults.php index eccc4331..982fff93 100644 --- a/defaults.php +++ b/defaults.php @@ -20,6 +20,7 @@ namespace OCA\Theming\Themes; use OCA\Theming\ITheme; +use OCA\Theming\Themes\DefaultTheme; class OC_Theme extends DefaultTheme implements ITheme { -- GitLab From 313e608e86defc683010108aa3d2b06c5e1b321c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Apr 2023 12:54:43 +0530 Subject: [PATCH 03/22] add theme --- defaults.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.php b/defaults.php index 982fff93..e62eed58 100644 --- a/defaults.php +++ b/defaults.php @@ -22,7 +22,7 @@ namespace OCA\Theming\Themes; use OCA\Theming\ITheme; use OCA\Theming\Themes\DefaultTheme; -class OC_Theme extends DefaultTheme implements ITheme { +class OC_Theme extends DefaultTheme { /** * Returns the base URL -- GitLab From a13a55b8d08f3a634b1095acd258c1e6f5d65f38 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Apr 2023 13:01:43 +0530 Subject: [PATCH 04/22] add theme --- defaults.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/defaults.php b/defaults.php index e62eed58..18d24deb 100644 --- a/defaults.php +++ b/defaults.php @@ -17,12 +17,9 @@ * You should have received a copy of the GNU Affero General Public License, version 3, * along with this program. If not, see */ -namespace OCA\Theming\Themes; +namespace OCP\Theme; -use OCA\Theming\ITheme; -use OCA\Theming\Themes\DefaultTheme; - -class OC_Theme extends DefaultTheme { +class OC_Theme extends \OCP\Theming\DefaultTheme { /** * Returns the base URL -- GitLab From 2f999682357fd3b6e1fb11bae49fb83e875617b3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Apr 2023 13:11:20 +0530 Subject: [PATCH 05/22] add theme --- defaults.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults.php b/defaults.php index 18d24deb..e77ddbfd 100644 --- a/defaults.php +++ b/defaults.php @@ -17,9 +17,9 @@ * You should have received a copy of the GNU Affero General Public License, version 3, * along with this program. If not, see */ -namespace OCP\Theme; -class OC_Theme extends \OCP\Theming\DefaultTheme { + +class OC_Theme extends \OCA\Theming\ThemingDefaults { /** * Returns the base URL -- GitLab From eeb9cee5e7870e1c4665932b0cbe1aa2745fef8e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Apr 2023 13:24:49 +0530 Subject: [PATCH 06/22] add theme --- defaults.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults.php b/defaults.php index e77ddbfd..bd36ed91 100644 --- a/defaults.php +++ b/defaults.php @@ -17,9 +17,9 @@ * You should have received a copy of the GNU Affero General Public License, version 3, * along with this program. If not, see */ +use OCA\Theming\ThemingDefaults; - -class OC_Theme extends \OCA\Theming\ThemingDefaults { +class OC_Theme extends ThemingDefaults { /** * Returns the base URL -- GitLab From b5f78001913562239678f672c56359cadf7d23bb Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 10 Apr 2023 16:27:32 +0530 Subject: [PATCH 07/22] ci-yml fix --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a48db098..40a818f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,8 +14,8 @@ include: # 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} + 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 582185a0175ff20caef8b85286a5c13252538b45 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Apr 2023 00:23:15 +0530 Subject: [PATCH 08/22] files setting fix and button color fixes --- core/css/server.css | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index fd37cc16..3678c0a4 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Affero General Public License, version 3, * along with this program. If not, see */ -@font-face { + @font-face { font-family: 'Roboto'; src: url('../webfonts/Roboto-Regular.woff2') format('woff2'), url('../webfonts/Roboto-Regular.woff') format('woff'); /* font-weight: 600; */ @@ -27,14 +27,14 @@ font-family: 'Roboto'; } :root { - --color-primary: #007fff; - --color-primary-element: #007fff; - --color-secondary-element: white; - --border-color-secondary-element: #007fff; - --color-primary-element-light: #007fff; - --color-error: #fb3845; - --color-delete: #e9322d; - --color-success: #3ad975; + --color-primary: #007fff !important; + --color-primary-element: #007fff !important; + --color-secondary-element: white !important; + --border-color-secondary-element: #007fff !important; + --color-primary-element-light: #007fff !important; + --color-error: #fb3845 !important; + --color-delete: #e9322d !important; + --color-success: #3ad975 !important; --color-main-background: #ffffff; --color-main-background-header: #ffffff; --color-main-background-translucent: #f2f2f2; @@ -1123,7 +1123,6 @@ li.active .icon-share { } #app-navigation-vue #app-settings #app-settings-header .settings-button, -#app-navigation #app-settings #app-settings-header .settings-button, .icon-category-tools { background-image: var(--icon-settings-808080); } -- GitLab From 870d901acef04c0e3ce20fdc362838e9d34efe29 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Apr 2023 00:40:13 +0530 Subject: [PATCH 09/22] resolve conflict --- defaults.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/defaults.php b/defaults.php index bd36ed91..64cb8905 100644 --- a/defaults.php +++ b/defaults.php @@ -17,9 +17,8 @@ * You should have received a copy of the GNU Affero General Public License, version 3, * along with this program. If not, see */ -use OCA\Theming\ThemingDefaults; -class OC_Theme extends ThemingDefaults { +class OC_Theme { /** * Returns the base URL -- GitLab From def240d6f0a6dbf15da7724fbaca7419903b3f49 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Apr 2023 12:03:28 +0530 Subject: [PATCH 10/22] border added important removed --- core/css/server.css | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/server.css b/core/css/server.css index 3678c0a4..3e49cde9 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -53,6 +53,7 @@ --color-sharing-icon-background: #767676; --logo: url("../img/logo@2x.svg"); --notification-icon-invert: invert(0%); + --border-radius-pill:3px; } /* Force a few variables to right values for dark theme */ -- GitLab From 8779e9a1286cd081ad41e5e7ead1e743211b7ceb Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Apr 2023 12:18:46 +0530 Subject: [PATCH 11/22] border added important removed --- core/css/server.css | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 3e49cde9..1655b403 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -27,14 +27,14 @@ font-family: 'Roboto'; } :root { - --color-primary: #007fff !important; - --color-primary-element: #007fff !important; - --color-secondary-element: white !important; - --border-color-secondary-element: #007fff !important; - --color-primary-element-light: #007fff !important; - --color-error: #fb3845 !important; - --color-delete: #e9322d !important; - --color-success: #3ad975 !important; + --color-primary: #007fff; + --color-primary-element: #007fff; + --color-secondary-element: white; + --border-color-secondary-element: #007fff; + --color-primary-element-light: #007fff; + --color-error: #fb3845; + --color-delete: #e9322d; + --color-success: #3ad975; --color-main-background: #ffffff; --color-main-background-header: #ffffff; --color-main-background-translucent: #f2f2f2; @@ -53,7 +53,9 @@ --color-sharing-icon-background: #767676; --logo: url("../img/logo@2x.svg"); --notification-icon-invert: invert(0%); - --border-radius-pill:3px; + --border-radius: 3px; + --border-radius-large: 10px; + --border-radius-pill: 100px; } /* Force a few variables to right values for dark theme */ -- GitLab From 5d51bd4874d4f6e17ed64f5656b08bc1184050b6 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Apr 2023 12:29:40 +0530 Subject: [PATCH 12/22] bg for storage --- core/css/server.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 1655b403..ee58fdab 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -56,6 +56,11 @@ --border-radius: 3px; --border-radius-large: 10px; --border-radius-pill: 100px; + --color-background-hover: whitesmoke; + --color-background-dark: #ededed; + --color-background-darker: #dbdbdb; + --color-placeholder-light: #e6e6e6; + --color-placeholder-dark: #ccc; } /* Force a few variables to right values for dark theme */ -- GitLab From 68c845748cd8e0e60cecce9fe5d552b8fb3f973e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Apr 2023 12:37:34 +0530 Subject: [PATCH 13/22] button fix --- core/css/server.css | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/server.css b/core/css/server.css index ee58fdab..fd35e600 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -169,6 +169,7 @@ input[type="checkbox"].checkbox + label::before, input[type="radio"].checkbox + label::before { border-color: var(--icon-inactive-color); background-color: white; + border: 1px solid #878787; } textarea:not(:disabled), -- GitLab From b7b349f778f1cb5dbe8f897876492329f89a29ad Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 11 Apr 2023 12:44:37 +0530 Subject: [PATCH 14/22] bg removed --- core/css/server.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index fd35e600..a533c0ca 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -35,9 +35,6 @@ --color-error: #fb3845; --color-delete: #e9322d; --color-success: #3ad975; - --color-main-background: #ffffff; - --color-main-background-header: #ffffff; - --color-main-background-translucent: #f2f2f2; --color-main-text: black; --color-background-hover: white; --color-text-maxcontrast: black; -- GitLab From afb6443fc58ff787c32a94b6e807b877ed307d74 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 12 Apr 2023 13:48:11 +0530 Subject: [PATCH 15/22] header in dark fix --- core/css/server.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index a533c0ca..48eddbe0 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -61,7 +61,7 @@ } /* Force a few variables to right values for dark theme */ -body.theme--dark { +body[data-themes="dark"] { --color-main-background-header: #272727; --input-background-color: #181818; --icon-notifications-notifications-000000: url("/svg/notifications/notifications?color=000"); -- GitLab From e5d1790e5401b912fd821e682bf6e7a8faa12bdf Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 12 Apr 2023 14:07:04 +0530 Subject: [PATCH 16/22] dashboard color fix --- core/css/server.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 48eddbe0..5b7638c2 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -74,6 +74,14 @@ body[data-themes="dark"] { body.theme--highcontrast { --icon-inactive-color: black; } +body { + background-color: var(--color-main-background); + font-weight: normal; + font-size: var(--default-font-size); + line-height: var(--default-line-height); + font-family: var(--font-face); + color: var(--color-main-text); +} #body-user #header, #body-settings #header, -- GitLab From 7fc8d74faa1173d46acc459a678b31dffc87bae4 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 12 Apr 2023 16:14:28 +0530 Subject: [PATCH 17/22] contact app fix --- core/css/server.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 5b7638c2..e2bcdcec 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1768,3 +1768,23 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { #content.app-files #filestable { padding-top: 20px; } + +div.select2-drop .select2-search input, +select, +button:not(.button-vue), +.button, +input:not([type='range']), +textarea, +div[contenteditable=true], +.pager li a { + margin: 3px 3px 3px 0; + padding: 7px 6px; + font-size: 13px; + background-color: var(--color-main-background); + color: var(--color-main-text); + border: 1px solid var(--color-border-dark); + outline: none; + border-radius: var(--border-radius); + cursor: text; +} + -- GitLab From 68f12baf7ce41b50ad4d518dd369de36eb6e0c2e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 12 Apr 2023 16:18:38 +0530 Subject: [PATCH 18/22] contact app fix --- core/css/server.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index e2bcdcec..ada55b6e 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1788,3 +1788,12 @@ div[contenteditable=true], cursor: text; } +button:not(.button-vue), +.button, +input[type='button'], +input[type='submit'], +input[type='reset'] { + font-weight: bold; + border-radius: var(--border-radius-pill); +} + -- GitLab From 06d9e0727c3a5ecf0991fe9fbe09e93593613dbf Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 12 Apr 2023 16:23:03 +0530 Subject: [PATCH 19/22] contact app fix --- core/css/server.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index ada55b6e..88d8717d 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1796,4 +1796,18 @@ input[type='reset'] { font-weight: bold; border-radius: var(--border-radius-pill); } +div.select2-drop .select2-search input.primary, +select.primary, +button:not(.button-vue).primary, +.button.primary, +input:not([type='range']).primary, +textarea.primary, +div[contenteditable=true].primary, +.pager li a.primary { + background-color: var(--color-primary-element); + border-color: var(--color-primary-element); + color: var(--color-primary-text); + cursor: pointer; +} + -- GitLab From c0d42d81ed0013b0a789d46277e470ca22bd0b7b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 13 Apr 2023 11:27:54 +0530 Subject: [PATCH 20/22] border added --- core/css/server.css | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 88d8717d..99f1bb96 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -167,6 +167,7 @@ button.primary + button:not(.primary):active, .status-buttons .status-buttons__select { background-color: var(--color-secondary-element); color: var(--color-primary); + border: 1px solid; border-color: var(--border-color-secondary-element); } @@ -1796,18 +1797,4 @@ input[type='reset'] { font-weight: bold; border-radius: var(--border-radius-pill); } -div.select2-drop .select2-search input.primary, -select.primary, -button:not(.button-vue).primary, -.button.primary, -input:not([type='range']).primary, -textarea.primary, -div[contenteditable=true].primary, -.pager li a.primary { - background-color: var(--color-primary-element); - border-color: var(--color-primary-element); - color: var(--color-primary-text); - cursor: pointer; -} - -- GitLab From 247e55aa2388f5072d2c19904c78316546b35e7b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 13 Apr 2023 13:41:26 +0530 Subject: [PATCH 21/22] button color correction --- core/css/server.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 99f1bb96..b0df3d7b 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -160,8 +160,6 @@ a.primary:not(:disabled):focus { button.primary + button:not(.primary), button.primary + button:not(.primary):active, .entity-picker__navigation button:not(.primary), -.event-popover__buttons button:not(.primary), -.event-popover__buttons button:not(.primary):active, .oc-dialog-buttonrow.twobuttons button:not(.primary), .oc-dialog-buttonrow.twobuttons button:not(.primary):active, .status-buttons .status-buttons__select { -- GitLab From 8ce2c1dc7b482d3203be23e3f4eb1295a5afef21 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 13 Apr 2023 17:02:28 +0530 Subject: [PATCH 22/22] padding added --- core/css/server.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index b0df3d7b..c5ccde91 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1795,4 +1795,13 @@ input[type='reset'] { font-weight: bold; border-radius: var(--border-radius-pill); } +.content.app-contacts .multiselect .multiselect__tags { + border: 1px solid var(--color-border-dark) !important; + border-radius: var(--border-radius) !important; +} +.content.app-contacts .property__row .property__label:not(.multiselect) { + padding-right:10px; +} + + -- GitLab