From c5aed8eb512e59119accf44509b35171ca147ee8 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 31 Mar 2023 11:39:04 +0530 Subject: [PATCH 01/13] notification news style changes --- core/css/server.css | 26 ++++++++++++++++++++++++++ core/img/redeem.svg | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 core/img/redeem.svg diff --git a/core/css/server.css b/core/css/server.css index fd37cc16..a49870b3 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1755,3 +1755,29 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { #content.app-files #filestable { padding-top: 20px; } + +/* notification */ +.notification[object_type="announcement-news"] { + background-color: var(--color-primary); + color: var(--color-secondary-element); +} +.notification[object_type="announcement-news"] img.notification-icon { + display: none; +} +.notification[object_type="announcement-news"] .image:after { + content: " "; + background-image: url('../img/redeem.svg'); + padding: 5px 15px; + background-size: contain; +} +.notification[object_type="announcement-news"] .notification-subject { + font-size: 18px; +} +.notification[object_type="announcement-news"] .notification-message, +.notification[object_type="announcement-news"] a.external, +.notification[object_type="announcement-news"] .notification-heading .notification-time { + color: var(--color-secondary-element); +} +.notification[object_type="announcement-news"] a.external:after { + content: ''; +} \ No newline at end of file diff --git a/core/img/redeem.svg b/core/img/redeem.svg new file mode 100644 index 00000000..cf04e988 --- /dev/null +++ b/core/img/redeem.svg @@ -0,0 +1,3 @@ + + + -- GitLab From 1646fa56b6cd22ae7fcf54072ecd42e909f65be0 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 31 Mar 2023 14:07:30 +0530 Subject: [PATCH 02/13] close button white --- core/css/server.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index a49870b3..3b876770 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1778,6 +1778,9 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { .notification[object_type="announcement-news"] .notification-heading .notification-time { color: var(--color-secondary-element); } +.notification[object_type="announcement-news"] .icon-close { + background-image: var(--icon-close-fff); +} .notification[object_type="announcement-news"] a.external:after { content: ''; } \ No newline at end of file -- GitLab From 3b6206765f8b42ae36734267f178f63fd92e63d8 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 31 Mar 2023 14:11:57 +0530 Subject: [PATCH 03/13] close button white --- core/css/server.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 3b876770..a0bf5c90 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1775,6 +1775,7 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { } .notification[object_type="announcement-news"] .notification-message, .notification[object_type="announcement-news"] a.external, +.notification[object_type="announcement-news"] .notification-heading button, .notification[object_type="announcement-news"] .notification-heading .notification-time { color: var(--color-secondary-element); } @@ -1783,4 +1784,7 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { } .notification[object_type="announcement-news"] a.external:after { content: ''; +} +.notification[object_type="announcement-news"] .notification-heading button:hover:not(:disabled) { + background-color: unset; } \ No newline at end of file -- GitLab From 1cdb90d7292115d6c2b8810507b8169f23ec5df6 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 31 Mar 2023 14:15:50 +0530 Subject: [PATCH 04/13] added changes --- 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 a0bf5c90..4cc02a7d 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1787,4 +1787,4 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { } .notification[object_type="announcement-news"] .notification-heading button:hover:not(:disabled) { background-color: unset; -} \ No newline at end of file +} -- GitLab From b97f26a56d5e44a02994445ce96bf04549dc52ac Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 31 Mar 2023 14:24:42 +0530 Subject: [PATCH 05/13] hover --- 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 4cc02a7d..958df7e7 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1785,6 +1785,6 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { .notification[object_type="announcement-news"] a.external:after { content: ''; } -.notification[object_type="announcement-news"] .notification-heading button:hover:not(:disabled) { +.notification[object_type="announcement-news"] .notification-heading button:hover { background-color: unset; } -- GitLab From bac6446e4fd936826ac7e00e2eaa9ab87e7e164a Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 31 Mar 2023 15:00:25 +0530 Subject: [PATCH 06/13] test change --- core/css/server.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 958df7e7..96c80d7a 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1785,6 +1785,4 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { .notification[object_type="announcement-news"] a.external:after { content: ''; } -.notification[object_type="announcement-news"] .notification-heading button:hover { - background-color: unset; -} + -- GitLab From 594e6f9d8637926ba7058f7f601d391c40f05ce9 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 31 Mar 2023 15:02:16 +0530 Subject: [PATCH 07/13] test change removed --- core/css/server.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index 96c80d7a..958df7e7 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1785,4 +1785,6 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { .notification[object_type="announcement-news"] a.external:after { content: ''; } - +.notification[object_type="announcement-news"] .notification-heading button:hover { + background-color: unset; +} -- GitLab From 2dacfc66a10c57b83141840b949e806f58de10b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= Date: Fri, 31 Mar 2023 10:15:26 +0000 Subject: [PATCH 08/13] rsync the contents --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a48db098..7f6762a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ include: - | 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} + 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 849885f7b4fadbb77f4be407a6d4087c66d037dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= Date: Fri, 31 Mar 2023 10:17:02 +0000 Subject: [PATCH 09/13] dummy change --- core/css/server.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 958df7e7..e748a836 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1788,3 +1788,7 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { .notification[object_type="announcement-news"] .notification-heading button:hover { background-color: unset; } + +.foobar { + color: red; +} -- GitLab From 08547819444f616536f655e0066f2feafe235827 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 31 Mar 2023 16:34:59 +0530 Subject: [PATCH 10/13] removed dummy --- core/css/server.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index e748a836..958df7e7 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1788,7 +1788,3 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { .notification[object_type="announcement-news"] .notification-heading button:hover { background-color: unset; } - -.foobar { - color: red; -} -- GitLab From b9d013d045a929a916992dd8d25614e5a19f1eda Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 31 Mar 2023 18:20:38 +0530 Subject: [PATCH 11/13] changed appid --- core/css/server.css | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 958df7e7..74d351df 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1757,34 +1757,34 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { } /* notification */ -.notification[object_type="announcement-news"] { +.notification[object_type="murena-notifications-news"] { background-color: var(--color-primary); color: var(--color-secondary-element); } -.notification[object_type="announcement-news"] img.notification-icon { +.notification[object_type="murena-notifications-news"] img.notification-icon { display: none; } -.notification[object_type="announcement-news"] .image:after { +.notification[object_type="murena-notifications-news"] .image:after { content: " "; background-image: url('../img/redeem.svg'); padding: 5px 15px; background-size: contain; } -.notification[object_type="announcement-news"] .notification-subject { +.notification[object_type="murena-notifications-news"] .notification-subject { font-size: 18px; } -.notification[object_type="announcement-news"] .notification-message, -.notification[object_type="announcement-news"] a.external, -.notification[object_type="announcement-news"] .notification-heading button, -.notification[object_type="announcement-news"] .notification-heading .notification-time { +.notification[object_type="murena-notifications-news"] .notification-message, +.notification[object_type="murena-notifications-news"] a.external, +.notification[object_type="murena-notifications-news"] .notification-heading button, +.notification[object_type="murena-notifications-news"] .notification-heading .notification-time { color: var(--color-secondary-element); } -.notification[object_type="announcement-news"] .icon-close { +.notification[object_type="murena-notifications-news"] .icon-close { background-image: var(--icon-close-fff); } -.notification[object_type="announcement-news"] a.external:after { +.notification[object_type="murena-notifications-news"] a.external:after { content: ''; } -.notification[object_type="announcement-news"] .notification-heading button:hover { +.notification[object_type="murena-notifications-news"] .notification-heading button:hover { background-color: unset; } -- GitLab From a7d0c7cc12e85023e0e42e35bfd84127c8dff7d1 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 31 Mar 2023 18:48:28 +0530 Subject: [PATCH 12/13] added rounded corner --- core/css/server.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 74d351df..d4a827c1 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1760,6 +1760,10 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { .notification[object_type="murena-notifications-news"] { background-color: var(--color-primary); color: var(--color-secondary-element); + border-top-left-radius: 10px; + border-top-right-radius: 10px; + border-bottom-left-radius: 10px; + border-bottom-right-radius: 10px; } .notification[object_type="murena-notifications-news"] img.notification-icon { display: none; @@ -1788,3 +1792,8 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { .notification[object_type="murena-notifications-news"] .notification-heading button:hover { background-color: unset; } +#settings #expanddiv, #header .header-right > div > .notification-container.menu, +#settings #expanddiv, #header .header-right > div > .notification-container.menu > ul { + border-top-left-radius: 10px; + border-top-right-radius: 10px; +} -- GitLab From a2b46a2d0d0e98b40f9224cc77b0d0dd4ddd3eaf Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 3 Apr 2023 12:38:33 +0530 Subject: [PATCH 13/13] border top for first child only --- core/css/server.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index d4a827c1..3e6baa7d 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1757,13 +1757,13 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { } /* notification */ +.notification[object_type="murena-notifications-news"]:first-child { + border-top-left-radius: 10px; + border-top-right-radius: 10px; +} .notification[object_type="murena-notifications-news"] { background-color: var(--color-primary); color: var(--color-secondary-element); - border-top-left-radius: 10px; - border-top-right-radius: 10px; - border-bottom-left-radius: 10px; - border-bottom-right-radius: 10px; } .notification[object_type="murena-notifications-news"] img.notification-icon { display: none; -- GitLab