diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a48db09809a3fced6772cd8ba0edfdedec37a400..7f6762a1fb88f0394ce1b245c6f03a6d2edde755 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 diff --git a/core/css/server.css b/core/css/server.css index fd37cc16fe208fadd31d7223493bc254497119fe..3e6baa7de08ac78eb6851624df611d0124e93e81 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1755,3 +1755,45 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { #content.app-files #filestable { padding-top: 20px; } + +/* 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); +} +.notification[object_type="murena-notifications-news"] img.notification-icon { + display: none; +} +.notification[object_type="murena-notifications-news"] .image:after { + content: " "; + background-image: url('../img/redeem.svg'); + padding: 5px 15px; + background-size: contain; +} +.notification[object_type="murena-notifications-news"] .notification-subject { + font-size: 18px; +} +.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="murena-notifications-news"] .icon-close { + background-image: var(--icon-close-fff); +} +.notification[object_type="murena-notifications-news"] a.external:after { + content: ''; +} +.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; +} diff --git a/core/img/redeem.svg b/core/img/redeem.svg new file mode 100644 index 0000000000000000000000000000000000000000..cf04e9880bc137dd3d75a67be68ee10a73fe4ae0 --- /dev/null +++ b/core/img/redeem.svg @@ -0,0 +1,3 @@ + + +