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/apps/accessibility/img/app-color.svg b/apps/accessibility/img/app-color.svg index a09770ba09b71ce6af0d1c4f61ee9b2ac084d06a..3f06eb07a98f6812e9f39016dfb1e085bf492213 100755 --- a/apps/accessibility/img/app-color.svg +++ b/apps/accessibility/img/app-color.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/accessibility/img/app-dark.svg b/apps/accessibility/img/app-dark.svg index a09770ba09b71ce6af0d1c4f61ee9b2ac084d06a..3f06eb07a98f6812e9f39016dfb1e085bf492213 100755 --- a/apps/accessibility/img/app-dark.svg +++ b/apps/accessibility/img/app-dark.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/accessibility/img/app.svg b/apps/accessibility/img/app.svg index a09770ba09b71ce6af0d1c4f61ee9b2ac084d06a..3f06eb07a98f6812e9f39016dfb1e085bf492213 100755 --- a/apps/accessibility/img/app.svg +++ b/apps/accessibility/img/app.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/accessibility/img/favicon-mask.svg b/apps/accessibility/img/favicon-mask.svg index a09770ba09b71ce6af0d1c4f61ee9b2ac084d06a..3f06eb07a98f6812e9f39016dfb1e085bf492213 100755 --- a/apps/accessibility/img/favicon-mask.svg +++ b/apps/accessibility/img/favicon-mask.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/activity/img/activity-dark.svg b/apps/activity/img/activity-dark.svg index 83a8aeb4ebdb580027e61c22c9cd55e464b7bdee..b031248fddd575c5c091c8eaac643393a01229b5 100755 --- a/apps/activity/img/activity-dark.svg +++ b/apps/activity/img/activity-dark.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/activity/img/activity.svg b/apps/activity/img/activity.svg index bd7923b2fe107eccb3804d0feffd586c21a05efe..e05930b600dd98f4ce195e3ac5b8b2785b0e64b2 100755 --- a/apps/activity/img/activity.svg +++ b/apps/activity/img/activity.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/activity/img/app.svg b/apps/activity/img/app.svg index bd7923b2fe107eccb3804d0feffd586c21a05efe..e05930b600dd98f4ce195e3ac5b8b2785b0e64b2 100755 --- a/apps/activity/img/app.svg +++ b/apps/activity/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/bookmarks/img/app.svg b/apps/bookmarks/img/app.svg index 859718c06745f718dd24424ea6f0ed96d28b5a75..62b390502c500ce236f3c3b130328841776a108d 100644 --- a/apps/bookmarks/img/app.svg +++ b/apps/bookmarks/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/bookmarks/img/bookmarks.svg b/apps/bookmarks/img/bookmarks.svg index 859718c06745f718dd24424ea6f0ed96d28b5a75..62b390502c500ce236f3c3b130328841776a108d 100644 --- a/apps/bookmarks/img/bookmarks.svg +++ b/apps/bookmarks/img/bookmarks.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/calendar/img/app.svg b/apps/calendar/img/app.svg index e7ff7e4a9ed3e38fafb9eaa214b6168fd06e447f..5678d1cb766f4ea22064c7144fb02ffc2713b0c3 100755 --- a/apps/calendar/img/app.svg +++ b/apps/calendar/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/calendar/img/calendar.svg b/apps/calendar/img/calendar.svg index e7ff7e4a9ed3e38fafb9eaa214b6168fd06e447f..5678d1cb766f4ea22064c7144fb02ffc2713b0c3 100755 --- a/apps/calendar/img/calendar.svg +++ b/apps/calendar/img/calendar.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/contacts/img/address-book.svg b/apps/contacts/img/address-book.svg index 07c81de412fbf8f3ffeca5a426305d22323759d0..abfe6f4625d5f785312a4fbc93a3815b34804cc9 100644 --- a/apps/contacts/img/address-book.svg +++ b/apps/contacts/img/address-book.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/contacts/img/app.svg b/apps/contacts/img/app.svg index b98795553d9286655afbde081fa6ee6a9a26e42e..f62661b504dc715e559b8c63780b1551eea151bd 100755 --- a/apps/contacts/img/app.svg +++ b/apps/contacts/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/e-user-support-center/img/app.svg b/apps/e-user-support-center/img/app.svg index 8f0ff23d3d3f9b68377a452161e7f945d0ab37f1..63fb2c63d8a194a9f254dbb2f61206ceae1caf86 100755 --- a/apps/e-user-support-center/img/app.svg +++ b/apps/e-user-support-center/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/app.svg b/apps/files/img/app.svg index e594a802d4d44ebaf7d036eab8a327132a7c37ce..ae6f4dd28498809d1ce9913239945b5f93691318 100755 --- a/apps/files/img/app.svg +++ b/apps/files/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/delete.svg b/apps/files/img/delete.svg index 1872e155f1c76b78868e3422c53909d876c27ce2..d7499ddea330b6bd6bacd2178efa73be07fde325 100755 --- a/apps/files/img/delete.svg +++ b/apps/files/img/delete.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/folder.svg b/apps/files/img/folder.svg index 74e97df2ac360530b13634847f90d28f22951f2f..e925bca3e4856a5ec051900c9ee2d9618b1af7f0 100755 --- a/apps/files/img/folder.svg +++ b/apps/files/img/folder.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/recent.svg b/apps/files/img/recent.svg index 282b5e6d62b147b48109bca1cf60455b930a1a8f..52a890cace0e735579be86d78e9e99a52639f1cc 100755 --- a/apps/files/img/recent.svg +++ b/apps/files/img/recent.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/share.svg b/apps/files/img/share.svg index c600798dd815310d0f8ee63ce33c7d112f6c5d54..650cd663c47d6404e6429a113fd98c7279db818f 100755 --- a/apps/files/img/share.svg +++ b/apps/files/img/share.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg index 42f72d9e740d0a7143e064b0bb4d626bd68cb08a..da4d89f851423646f0cf9dca4ea0b72bdcef9a72 100755 --- a/apps/files/img/star.svg +++ b/apps/files/img/star.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/unshare.svg b/apps/files/img/unshare.svg index 73555297ba706a8c198c9411ca6ca7680ab7cc27..7c5f16cf364b2001b92cfa37ead360878c7c4ff4 100644 --- a/apps/files/img/unshare.svg +++ b/apps/files/img/unshare.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/logreader/img/app-dark.svg b/apps/logreader/img/app-dark.svg index 8df1543498e8edcc782d471faee542b6c9bdaf11..52983dfea77cae1cfbb130703b1af0c85076ebed 100755 --- a/apps/logreader/img/app-dark.svg +++ b/apps/logreader/img/app-dark.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/logreader/img/app.svg b/apps/logreader/img/app.svg index 8df1543498e8edcc782d471faee542b6c9bdaf11..52983dfea77cae1cfbb130703b1af0c85076ebed 100755 --- a/apps/logreader/img/app.svg +++ b/apps/logreader/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/notes/img/app.svg b/apps/notes/img/app.svg index 56e3640b28438e09728d2022d91044511817e0d0..9da05051b1d294082b491672b766c5ffb1a908f1 100755 --- a/apps/notes/img/app.svg +++ b/apps/notes/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/notes/img/notes.svg b/apps/notes/img/notes.svg index 56e3640b28438e09728d2022d91044511817e0d0..9da05051b1d294082b491672b766c5ffb1a908f1 100755 --- a/apps/notes/img/notes.svg +++ b/apps/notes/img/notes.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/notifications/img/app.svg b/apps/notifications/img/app.svg index 52f3a1f33ce5a1069693faad63390d37ad95ea16..59d2fd8684ed9a6a49faa7d9cd00fc7c695d2179 100755 --- a/apps/notifications/img/app.svg +++ b/apps/notifications/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/onlyoffice/img/app-dark.svg b/apps/onlyoffice/img/app-dark.svg index 8df1543498e8edcc782d471faee542b6c9bdaf11..52983dfea77cae1cfbb130703b1af0c85076ebed 100755 --- a/apps/onlyoffice/img/app-dark.svg +++ b/apps/onlyoffice/img/app-dark.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/onlyoffice/img/app.svg b/apps/onlyoffice/img/app.svg index 8df1543498e8edcc782d471faee542b6c9bdaf11..52983dfea77cae1cfbb130703b1af0c85076ebed 100644 --- a/apps/onlyoffice/img/app.svg +++ b/apps/onlyoffice/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/photos/img/app.svg b/apps/photos/img/app.svg index f6e91033c9c2017a5dbd1854d33428de09847e38..873181c0ff7cffc5688145e636ffcc9eaa9d2ad9 100755 --- a/apps/photos/img/app.svg +++ b/apps/photos/img/app.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/privacy/img/app-dark.svg b/apps/privacy/img/app-dark.svg index 867fe5170d228a8a3237c2d9fe2cdc8644b0448c..f6a80ad7b60a7123092ce47c852be2c28adb287d 100755 --- a/apps/privacy/img/app-dark.svg +++ b/apps/privacy/img/app-dark.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/privacy/img/app.svg b/apps/privacy/img/app.svg index 867fe5170d228a8a3237c2d9fe2cdc8644b0448c..f6a80ad7b60a7123092ce47c852be2c28adb287d 100755 --- a/apps/privacy/img/app.svg +++ b/apps/privacy/img/app.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/rainloop/img/app.svg b/apps/rainloop/img/app.svg index cf19b828d56ce45784f9f95a3781bb717346678d..6370d179bf9ddb6bffedaae45d2557f7a12d075b 100755 --- a/apps/rainloop/img/app.svg +++ b/apps/rainloop/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/rainloop/img/rainloop.svg b/apps/rainloop/img/rainloop.svg index cf19b828d56ce45784f9f95a3781bb717346678d..6370d179bf9ddb6bffedaae45d2557f7a12d075b 100755 --- a/apps/rainloop/img/rainloop.svg +++ b/apps/rainloop/img/rainloop.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/admin.svg b/apps/settings/img/admin.svg index e9ba6c4b7c11f7413ca0327b285ee751975ed373..4f5b30765c6910b9a832ff758c641ebe1426cb77 100755 --- a/apps/settings/img/admin.svg +++ b/apps/settings/img/admin.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/app-color.svg b/apps/settings/img/app-color.svg index 8e61b2b47651b70fca6658ed5390d3e5d5c31ee0..58807e89a2a332157b2a97e39f9c0880178e4003 100755 --- a/apps/settings/img/app-color.svg +++ b/apps/settings/img/app-color.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/app.svg b/apps/settings/img/app.svg index 8e61b2b47651b70fca6658ed5390d3e5d5c31ee0..58807e89a2a332157b2a97e39f9c0880178e4003 100755 --- a/apps/settings/img/app.svg +++ b/apps/settings/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/apps.svg b/apps/settings/img/apps.svg index 8e61b2b47651b70fca6658ed5390d3e5d5c31ee0..58807e89a2a332157b2a97e39f9c0880178e4003 100755 --- a/apps/settings/img/apps.svg +++ b/apps/settings/img/apps.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/password.svg b/apps/settings/img/password.svg index abe21e8e2326d5738c1c63599925bda7f51a31b9..a85bcd7e00f5951678f121ad4dd3de04f9349f17 100755 --- a/apps/settings/img/password.svg +++ b/apps/settings/img/password.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/personal.svg b/apps/settings/img/personal.svg index e7f40dec35dbf104080176201a90c903f524cb44..f75590d128cd2e33be3e317dcd5b6b12b947c6a8 100755 --- a/apps/settings/img/personal.svg +++ b/apps/settings/img/personal.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/users.svg b/apps/settings/img/users.svg index 5da48f66dd79f079d668012eca22633a3ed1ec7d..7c5e228ef8b7ea76da682591bb2a869a6ef4cfbd 100755 --- a/apps/settings/img/users.svg +++ b/apps/settings/img/users.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/snappymail/img/app.svg b/apps/snappymail/img/app.svg index cf19b828d56ce45784f9f95a3781bb717346678d..6370d179bf9ddb6bffedaae45d2557f7a12d075b 100755 --- a/apps/snappymail/img/app.svg +++ b/apps/snappymail/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/snappymail/img/snappymail.svg b/apps/snappymail/img/snappymail.svg index cf19b828d56ce45784f9f95a3781bb717346678d..6370d179bf9ddb6bffedaae45d2557f7a12d075b 100755 --- a/apps/snappymail/img/snappymail.svg +++ b/apps/snappymail/img/snappymail.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/tasks/img/app.svg b/apps/tasks/img/app.svg index ca522306dad03a6147ba4d435fc2f637f0649290..69f39507140c36f3e9fc6d11153be58f0222a43c 100644 --- a/apps/tasks/img/app.svg +++ b/apps/tasks/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/tasks/img/tasks.svg b/apps/tasks/img/tasks.svg index ca522306dad03a6147ba4d435fc2f637f0649290..69f39507140c36f3e9fc6d11153be58f0222a43c 100644 --- a/apps/tasks/img/tasks.svg +++ b/apps/tasks/img/tasks.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/css/guest.css b/core/css/guest.css index de2d778ea4532276720aada58ec338f569bd18a5..1ef87c2313de1b7949307839ae17dea406dca1be 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -984,7 +984,7 @@ p.info { background-image: url('../img/actions/checkmark-white.svg?v=1'); } -#body-login .warning-messsage .icon-checkmark-white { +#body-login .warning-message .icon-checkmark-white { background-image: url('../img/actions/checkmark-success.svg?v=1'); } @@ -1116,6 +1116,14 @@ a.legal { color: #808080; font-family: "Montserrat"; } + +#body-login .warning-message { + width: 50%; + margin: 0 auto; + margin-top: 0; + padding: 0; +} + #body-login .v-align { display: flex; flex-direction: column; @@ -1134,12 +1142,28 @@ a.legal { max-height: 100%; transition: all 0.3s linear; } + #body-login .warning-messsage { width: 50%; margin: 0 auto; margin-top: 0; padding: 0; } + +#body-login .v-align .guest-box { + justify-content: center !important; + width: 92%; + margin-left: 0; + margin-right: 0; + border: 1px solid; + box-shadow: none; + color: #029f3c; +} +#body-login .icon.icon-checkmark, +#body-login .icon-checkmark-white{ + display:none; +} + #body-login #user, #body-login #password, #body-login .totp-form > input[type="tel"] { @@ -1149,7 +1173,6 @@ a.legal { border: 1px solid #E6E8E9; box-sizing: border-box; border-radius: 8px; - margin: 12px 0px; font-size: 16px; background-color: #ffffff; } @@ -1400,7 +1423,7 @@ a.legal { .v-align header{ width: 100%; } -.warning-messsage header{ +.warning-message header{ margin-top: 0; } .sign-in-label { @@ -1415,11 +1438,11 @@ a.legal { width: 100%; margin: 0 auto; } -.warning-messsage main{ +.warning-message main{ margin-bottom: 0; max-width: 90%; } -.warning-messsage main{ +.warning-message main{ margin-bottom: 0; max-width: 60%; } @@ -1430,6 +1453,8 @@ a.legal { font-weight: 400 !important; font-size: 16px !important; line-height: 150%; + display: block; + margin: 0 auto; } .v-align main .grouptop, .v-align main .groupbottom{ position: relative; @@ -1533,7 +1558,7 @@ a.legal { .banner-content-why-murena{ margin: 5% 0 5% 0; } - .warning-messsage main{ + .warning-message main{ max-width: 90%; overflow-x: auto; } @@ -1548,6 +1573,7 @@ a.legal { overflow: hidden; position: unset !important; height: unset; + padding: 0 5vh; } .banner-content-get-free-murena{ font-size: 18px; @@ -1561,10 +1587,10 @@ a.legal { .lines{ display: none; } - #body-login .warning-messsage { + #body-login .warning-message { width: 80%; } - .warning-messsage main{ + .warning-message main{ max-width: 90%; } #body-login .update, #body-login .success { @@ -1588,7 +1614,7 @@ a.legal { margin: 0 auto; height: 100%; } - #body-login .warning-messsage { + #body-login .warning-message { width: 90%; } } @@ -1617,3 +1643,36 @@ a.legal { .v-align > footer p.info { height: 40%; } +#body-login .guest-box.login-box { + border-radius: none; + box-shadow: none; + border: none; + color: var(--color-main-text); +} +#body-login .login-form__headline { + display:none +} +#body-login .input-field__clear-button.button-vue{ + vertical-align: middle; + height: 36px; + line-height: 36px; +} +#body-login .button-vue--vue-primary{ + margin: 46px 0px; +} +.slow-show { + opacity: 0; + animation-name: fadeIn; + animation-duration: 1s; + animation-fill-mode: forwards; + animation-delay: 1s; +} +@keyframes fadeIn { + from { + opacity: 0; + } + to { + opacity: 1; + } +} + diff --git a/core/css/server.css b/core/css/server.css index fd37cc16fe208fadd31d7223493bc254497119fe..9aae37a145a0740dcd2cf1540025ee0e304f9766 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -26,7 +26,7 @@ * { font-family: 'Roboto'; } -:root { +:root, [data-theme-light] { --color-primary: #007fff; --color-primary-element: #007fff; --color-secondary-element: white; @@ -53,10 +53,12 @@ --color-sharing-icon-background: #767676; --logo: url("../img/logo@2x.svg"); --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%); } /* 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"); @@ -70,6 +72,15 @@ 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, #body-public #header { @@ -92,7 +103,6 @@ input[type="reset"]:hover, #new-contact-button:hover, #new-user-button:hover, #deleteaccount:hover, -#quotaincreasebutton:hover, #content-vue.app-tasks .action.icon-checkmark:hover, .button.today:hover, button.import-contact__button-main:hover, @@ -119,7 +129,6 @@ button.primary:active, #new-contact-button, #new-user-button, #deleteaccount, -#quotaincreasebutton, .mx-datepicker .mx-datepicker-footer .mx-btn, #content-vue.app-tasks .action.icon-checkmark, button.import-contact__button-main, @@ -147,8 +156,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 { @@ -209,9 +216,6 @@ body.theme--dark #settings #expanddiv { .multiselect .multiselect__input, .multiselect .multiselect__content-wrapper .multiselect__content li.multiselect__element, .multiselect .multiselect__content-wrapper .multiselect__content li.multiselect__element .multiselect__option, -#content-vue.app-contacts .property.property--without-actions.property--last.property-masonry:not(.property--addressbooks):not(.property--groups) .multiselect .multiselect__tags .multiselect__input, -#content-vue.app-contacts .multiselect .multiselect__tags input.multiselect__input, -#content-vue.app-contacts .multiselect > .multiselect__tags > span.multiselect__single, #content.app-files #commentsTabView .newCommentForm .message:hover, #app-dashboard .footer a:hover, #app-content-systemtagsfilter .select2-container ul { @@ -300,20 +304,40 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover, .nc-theming-contrast { color: #fff; } -#appmenu:not(.inverted) svg { +#header .app-menu:not(.inverted) svg { filter: none; } -#appmenu.inverted svg { +#header .app-menu.inverted svg { filter: invert(1); } -.icon-folder, -.icon-filetype-folder { - background-image: var(--icon-folder-007FFF); + +#header .app-menu .app-menu-entry img { + filter: var(--inactive-icon-filter); +} + +#header .app-menu .app-menu-entry.app-menu-entry__active img { + filter: var(--active-icon-filter); } -.icon-filetype-text { + +#header .app-menu .app-menu-entry[data-app-id^='external_index'] img, +#header .app-menu .app-menu-entry.app-menu-entry__active[data-app-id^='external_index'] img, +#header .app-menu .app-menu-entry[data-app-id='news'] img, +#header .app-menu .app-menu-entry.app-menu-entry__active[data-app-id='news'] img, +#header .app-menu .app-menu-entry[data-app-id='passwords'] img, +#header .app-menu .app-menu-entry.app-menu-entry.app-menu-entry__active[data-app-id='passwords'] img, +#header .app-menu .app-menu-entry[data-app-id='carnet'] img, +#header .app-menu .app-menu-entry.app-menu-entry__active[data-app-id='carnet'] img { + filter: none; +} + +body .icon-folder, +body .icon-filetype-folder { + background-image: var(--icon-folder-007fff); +} +body .icon-filetype-text { background-image: var(--icon-text-007fff); } -.icon-filetype-folder-drag-accept { +body .icon-filetype-folder-drag-accept { background-image: var(--icon-folder-drag-accept-007fff) !important; } #header .logo { @@ -337,7 +361,7 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover, opacity: 1; } -#appmenu li span { +#header .app-menu li .app-menu-entry--label { color: var(--color-main-text); } @@ -355,6 +379,33 @@ footer { height: 92px; } +#header #notifications .notifications-button__icon { + display: none; +} + +#header #notifications .header-menu__trigger, +#header #unified-search .magnify-icon { + opacity: 0.6; +} + +#header #notifications .header-menu__trigger:hover, +#header #unified-search .magnify-icon:hover { + opacity: 1; +} + + +#header #notifications[data-has-notifications="true"] .header-menu__trigger { + background: var(--icon-notifications-notifications-new-000000) no-repeat center; + background-size: 17px; + +} + +#header #notifications .header-menu__trigger { + background: var(--icon-notifications-notifications-000000) no-repeat center; + background-size: 17px; +} + + .notifications-button.hasNotifications { opacity: 0.6 !important; } @@ -365,13 +416,12 @@ footer { #header .notification-wrapper .dismiss-all .icon.icon-close { margin-top: 4px; } -#content #app-navigation, -#content.app-news #app-navigation button { +#content #app-navigation { color: var(--color-main-text); border-right: 1px solid var(--color-border); } -.icon-home, +body .icon-home, #oc-dialog-filepicker-content .dirtree div:first-child a { background-image: var(--icon-home-808080); } @@ -381,18 +431,19 @@ footer { background-size: 20px; } -.icon-mail { +body .icon-mail { background-image: var(--icon-mail-808080); } -.icon-error { +body .icon-error { background-image: var(--icon-error-808080); } -.icon-details { +body .icon-details { background-image: var(--icon-details-808080); } -.icon-add, +body .icon-add, +.app-sidebar button .icon-add, .action-item.icon-add, button.action-item__menutoggle.icon-add, #content.app-news .add-new button.icon-add, @@ -406,19 +457,19 @@ button.action-item__menutoggle.icon-add, background-size: 40px; } -.icon-rename, +body .icon-rename, .who-has-access .action-item--single.action-item.icon-rename, .where-is-my-data .action-item--single.action-item.icon-rename { background-image: var(--icon-rename-808080); } -.icon-download { +body .icon-download { background-image: var(--icon-download-808080); } -.icon-template-add { +body .icon-template-add { background-image: var(--icon-template-add-808080); } -.icon-tasks, +body .icon-tasks, .panel--header .icon-tasks, .modal__content .icon-tasks { background-image: var(--icon-tasks-tasks-808080); @@ -426,68 +477,70 @@ button.action-item__menutoggle.icon-add, #tasks_panel .empty-content .icon-tasks { background-image: var(--icon-tasks-tasks-808080) !important; } -.icon-checkmark { +body .icon-checkmark { background-image: var(--icon-checkmark-808080); } -.icon-group { +body .icon-group { background-image: var(--icon-group-808080); } -.icon-timezone { +body .icon-timezone { background-image: var(--icon-timezone-808080); } -.icon-edit { +body .icon-edit { background-image: var(--icon-edit-808080); } -.icon-reminder { +body .icon-reminder { background-image: var(--icon-notifications-notifications-808080); } -.icon-gravatar { +body .icon-gravatar { background-image: var(--icon-contacts-gravatar-808080); } #content-vue.app-calendar .app-sidebar-tabs__tab-icon.icon-reminder { background-size: 13px; } -.icon-clippy { +body .icon-clippy { background-image: var(--icon-clippy-808080); } -.icon-confirm { +body .icon-confirm { background-image: var(--icon-confirm-808080); } -.icon-user-admin { +body .icon-user-admin { background-image: var(--icon-user-admin-808080); } -.icon-disabled-users { +body .icon-disabled-users { background-image: var(--icon-disabled-users-808080); } -.icon-notes, -.icon-notes-trans { +body .icon-notes, +body .icon-notes-trans { background-image: var(--icon-notes-notes-808080); } -.icon-projects { +body .icon-projects { background-image: var(--icon-projects-808080); } -.icon-comment { +body .icon-comment { background-image: var(--icon-comment-808080); } -.icon-activity { +body .icon-activity { background-image: var(--icon-activity-activity-808080); } -.icon-link { +body .icon-link { background-image: var(--icon-public-808080); } button .icon-link { background-image: var(--icon-public-ffffff); } -.icon-recent { +body .icon-recent { background-image: var(--icon-files-recent-808080); } - -.icon-more, -.icon-more-white { +.sharing-entry .avatar-shared.icon-more-white { + background-image: var(--icon-more-fff); +} +body .icon-more, +body .icon-more-white { background-image: var(--icon-more-808080); } @@ -505,7 +558,7 @@ button .icon-link { background-color: var(--color-sharing-icon-background); } -.icon-files, +body .icon-files, .icon-category-files, .icon-emptyfolder { background-image: var(--icon-files-app-808080); @@ -516,34 +569,34 @@ button .icon-link { background-size: 17px; } -.icon-notifications-new { +body .icon-notifications-new { background-image: var(--icon-notifications-notifications-new-000000); } -.icon-notifications { +body .icon-notifications { background-image: var(--icon-notifications-notifications-000000); } -.icon-external, -.icon-goto { +body .icon-external, +body .icon-goto { background-image: var(--icon-external-808080); } .action.icon-checkmark { background-image: var(--icon-checkmark-ffffff); } -.icon-phone { +body .icon-phone { background-image: var(--icon-phone-808080); } -.icon-password, -.icon-category-security { +body .icon-password, +body .icon-category-security { background-image: var(--icon-password-808080); } -.icon-link { +body .icon-link { background-image: var(--icon-link-808080); } -.icon-toggle-filelist { +body .icon-toggle-filelist { background-image: var(--icon-toggle-filelist-808080); } @@ -551,7 +604,7 @@ button.icon-toggle-filelist { background-color: var(--color-main-background); } -.icon-toggle-pictures { +body .icon-toggle-pictures { background-image: var(--icon-toggle-pictures-808080); } @@ -576,14 +629,14 @@ button > span[class*=" icon-"], opacity: 1; } -.icon-share, -.icon-shared { +body .icon-share, +body .icon-shared { background-image: var(--icon-share-808080); } -.icon-contacts-dark, -.icon-contacts, -.icon-category-social { +body .icon-contacts-dark, +body .icon-contacts, +body .icon-category-social { background-image: var(--icon-contacts-app-808080); } @@ -591,31 +644,31 @@ button > span[class*=" icon-"], background-image: var(--icon-contacts-000); } -.icon-user, -.icon-category-installed { +body .icon-user, +body .icon-category-installed { background-image: var(--icon-user-808080); } -.icon-category-enabled { +body .icon-category-enabled { background-image: var(--icon-checkmark-808080); } -.icon-star, -.icon-star-dark, -.icon-starred:hover { +body .icon-star, +body .icon-star-dark, +body .icon-starred:hover { background-image: var(--icon-star-808080); } -.icon-starred, -.icon-star:hover, -.icon-star-dark:hover, +body .icon-starred, +body .icon-star:hover, +body .icon-star-dark:hover, #filestable .filename .favorite-mark .icon-starred { background-image: var(--icon-star-FFCC00); } -.icon-close, +body .icon-close, #header-menu-unified-search .icon-close, -.icon-category-disabled { +body .icon-category-disabled { background-image: var(--icon-close-808080); } @@ -634,18 +687,18 @@ table td { border-bottom: 1px solid var(--color-border); } -.icon-files-dark { +body .icon-files-dark { background-image: var(--icon-files-app-808080); } -.icon-fullscreen { +body .icon-fullscreen { background-image: var(--icon-fullscreen-808080); } -.icon-calendar-dark { +body .icon-calendar-dark { background-image: var(--icon-calendar-calendar-808080); } -.icon-talk { +body .icon-talk { background-image: var(--icon-spreed-app-808080); } @@ -722,10 +775,10 @@ body[data-dashboard-background="default"] #app-dashboard h2 { } .breadcrumb .canDrop > a, -#filestable tbody tr.canDrop, -#filestable.view-grid:not(.hidden) #fileList tr:not(.hidden).selected .thumbnail-wrapper, -#filestable.view-grid:not(.hidden) #fileList tr:not(.hidden).selected .fileactions, -#filestable.view-grid:not(.hidden) #fileList tr:not(.hidden).selected .nametext { +.files-filestable tbody tr.canDrop, +.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).selected .thumbnail-wrapper, +.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).selected .fileactions, +.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).selected .nametext { background-color: var(--color-primary-light); } @@ -880,7 +933,7 @@ body[data-dashboard-background="default"] #app-dashboard h2 { background-image: var(--icon-tag-007fff); } -.icon-quota { +body .icon-quota { background-image: var(--icon-quota-808080); } .app-sidebar-header__star.icon-star, @@ -916,6 +969,8 @@ body.theme--highcontrast #header .header-right .magnify-icon { #header .header-right .magnify-icon { background: var(--icon-search-000) no-repeat center; background-size: 15px; + width: inherit; + height: inherit; } #content.app-files #filestable span, @@ -978,7 +1033,7 @@ li.app-navigation-entry.active .icon-recent-actors { #content-vue.app-contacts .app-content > .empty-content { margin: 20vh; } -.icon-address-book { +body .icon-address-book { background-image: var(--icon-contacts-address-book-808080); } @@ -1004,7 +1059,6 @@ button.primary .icon-upload, #content-vue.app-calendar .settings-fieldset-interior-item .icon-upload, #content-vue.app-bookmarks #app-settings-content button .icon-upload, button.import-contact__button-main .icon-upload, -.import-export button.icon-upload, .attachments-drag-zone button.icon-upload { background-image: var(--icon-upload-000); } @@ -1041,7 +1095,7 @@ button.menuitem .icon-delete, .menu-icon svg path { fill: var(--menu-icon-color); } -.icon-recent-actors { +body .icon-recent-actors { background-image: var(--icon-contacts-recent-actors-808080); } @@ -1071,7 +1125,7 @@ button.menuitem .icon-delete, } #content-vue.app-photos .icon-folder { - background-image: var(--icon-folder-007FFF); + background-image: var(--icon-folder-007fff); } #content-vue.app-photos .folder-name__icon { opacity: 0.8; @@ -1080,7 +1134,7 @@ button.menuitem .icon-delete, li.active .icon-yourphotos { background-image: var(--icon-photos-app-007fff); } -.icon-yourphotos { +body .icon-yourphotos { background-image: var(--icon-photos-app-808080); } @@ -1088,22 +1142,22 @@ li.active .icon-video { background-image: var(--icon-video-007fff); } -.icon-video { +body .icon-video { background-image: var(--icon-video-808080); } li.active .icon-favorite { background-image: var(--icon-star-outline-007fff); } -.icon-favorite { +body .icon-favorite { background-image: var(--icon-star-outline-808080); } li.active .icon-tag { background-image: var(--icon-tag-007fff); } -.icon-tag, -.icon-systemtags { +body .icon-tag, +body .icon-systemtags { background-image: var(--icon-tag-808080); } @@ -1114,7 +1168,7 @@ li.active .icon-address { background-image: var(--icon-address-007fff); } -.icon-address { +body .icon-address { background-image: var(--icon-address-808080); } @@ -1123,8 +1177,8 @@ 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 { +#app-navigation #app-settings #app-settings-header .settings-button::before, +body .icon-category-tools { background-image: var(--icon-settings-808080); } @@ -1136,7 +1190,7 @@ li.active .icon-share { background-color: var(--color-main-background); } -.icon-delete, +body .icon-delete, button.action-button .icon-delete { background-image: var(--icon-files-delete-808080); } @@ -1150,31 +1204,38 @@ button.menuitem:hover .icon-delete, background-image: var(--icon-delete-e9322d); } -#appmenu li a span { +#header .app-menu li a .app-menu-entry--label { color: transparent; } -#appmenu li:hover a span { +#header .app-menu li:hover a .app-menu-entry--label { color: var(--icon-inactive-color); } -body.theme--highcontrast #appmenu li:hover a span { +body.theme--highcontrast #header .app-menu li:hover a .app-menu-entry--label { color: var(--color-main-text); } -#appmenu li:hover a svg { +#header .app-menu li:hover a img { color: var(--color-main-text); transform: translateY(-7px); } -#appmenu:hover li svg, -#appmenu:hover li .icon-more, -#appmenu:hover li .icon-more-white, -#appmenu:hover li .icon-loading-small, -#appmenu:hover li .icon-loading-small-dark { +#header .app-menu:hover li img, +#header .app-menu:hover li .icon-more, +#header .app-menu:hover li .icon-more-white, +#header .app-menu:hover li .icon-loading-small, +#header .app-menu:hover li .icon-loading-small-dark { transform: none; } +#header .app-menu-main:hover img, +#header .app-menu-main:focus-within img, +#header .app-menu-main .app-menu-entry:hover img, +#header .app-menu-main .app-menu-entry:focus img { + margin-top: 0px; +} + /* Settings app */ #pass2 + input[name="newpassword-clone"] { @@ -1236,18 +1297,18 @@ button.social-diaspora { border: 0; } -.icon-eye { +body .icon-eye { background-image: var(--icon-calendar-eye-808080); } -.icon-briefcase { +body .icon-briefcase { background-image: var(--icon-calendar-briefcase-808080); } -.icon-color-picker { +body .icon-color-picker { background-image: var(--icon-calendar-color-picker-808080); } -.icon-menu { +body .icon-menu { background-image: var(--icon-menu-808080); } .mx-datepicker .mx-input-wrapper { @@ -1284,15 +1345,15 @@ button.social-diaspora { border-radius: 8px; } -.icon-new-calendar { +body .icon-new-calendar { background-image: var(--icon-calendar-calendar-808080); } -.icon-new-calendar-with-task-list { +body .icon-new-calendar-with-task-list { background-image: var(--icon-calendar-new-calendar-with-task-list-808080); } -.icon-public { +body .icon-public { background-image: var(--icon-public-808080); } @@ -1309,19 +1370,19 @@ button.social-diaspora { font-size: 1em; } -.icon-view-week { +body .icon-view-week { background-image: var(--icon-calendar-view-week-808080); } -.icon-view-day { +body .icon-view-day { background-image: var(--icon-calendar-view-day-808080); } -.icon-view-module { +body .icon-view-module { background-image: var(--icon-calendar-view-module-808080); } -.icon-view-list { +body .icon-view-list { background-image: var(--icon-calendar-view-list-808080); } @@ -1428,38 +1489,38 @@ input[type="email"]:not(:active):not(:hover):not(:focus) + .icon-confirm:focus { } /* Settings Apps categories icons */ -.icon-category-app-bundles { +body .icon-category-app-bundles { background-image: var(--icon-bundles-808080); } -.icon-category-dashboard { +body .icon-category-dashboard { background-image: var(--icon-dashboard-dashboard-808080); } -.icon-category-customization { +body .icon-category-customization { background-image: var(--icon-customization-808080); } -.icon-category-games { +body .icon-category-games { background-image: var(--icon-games-808080); } -.icon-category-integration { +body .icon-category-integration { background-image: var(--icon-integration-808080); } -.icon-category-monitoring { +body .icon-category-monitoring { background-image: var(--icon-monitoring-808080); } -.icon-category-multimedia { +body .icon-category-multimedia { background-image: var(--icon-multimedia-808080); } -.icon-category-office { +body .icon-category-office { background-image: var(--icon-office-808080); } -.icon-category-organization { +body .icon-category-organization { background-image: var(--icon-organization-808080); } -.icon-category-search { +body .icon-category-search { background-image: var(--icon-search-808080); } -.icon-category-workflow { +body .icon-category-workflow { background-image: var(--icon-workflow-808080); } @@ -1657,8 +1718,8 @@ button.edit-output-dir span.icon-rename, background-image: url("../img/app-icons/Cookbook.svg"); } -#appmenu li:hover a, -#appmenu li a:focus { +#header .app-menu li:hover a, +#header .app-menu li a:focus { font-size: 12px; font-family: 'Roboto'; letter-spacing: 1px; @@ -1679,8 +1740,8 @@ progress { border-radius: 10px 10px !important; height: 12px !important; } -#appmenu li a:focus .icon-more, -#appmenu li a:focus .icon-more-white { +#header .app-menu li a:focus .icon-more, +#header .app-menu li a:focus .icon-more-white { transform: none !important; } #more-apps:hover span, @@ -1689,9 +1750,7 @@ progress { display: none !important; } -button#quotaincreasebutton { - margin-top: 15px !important; -} + @media only screen and(max-width: 640px) { .new-icons .color-icons { height: 50px; @@ -1724,22 +1783,34 @@ body.theme--highcontrast svg.material-design-icon__svg { font-size: 12px; color: var(--color-text-lighter); } -body.theme--dark #header #appmenu li a { +body.theme--dark #header .app-menu li a, +#header .app-menu-main .app-menu-entry { opacity: 1; } -body.theme--light.theme--highcontrast #header #appmenu li a { + +body.theme--light.theme--highcontrast #header .app-menu li a { opacity: 1; filter: invert(0); } -body.theme--highcontrast #header #appmenu li a { +body.theme--highcontrast #header .app-menu li a { opacity: 1; filter: invert(1); } -body.theme--highcontrast #header #appmenu li a.active { + +#header .app-menu li a { + opacity: 0.6; +} + +#header .app-menu li:hover a, +#header .app-menu li.app-menu-entry__active a { + opacity: 1; +} + +body.theme--highcontrast #header .app-menu li.app-menu-entry__active a { filter: invert(0); } -body.theme--highcontrast #header #appmenu li .icon-more-white { +body.theme--highcontrast #header .app-menu li .icon-more-white { background-image: var(--icon-more-000); } body.theme--dark.theme--highcontrast #header .header-menu.unified-search a.header-menu__trigger, @@ -1747,11 +1818,35 @@ body.theme--highcontrast #header .notifications-button.hasNotifications, body.theme--highcontrast #unified-search .header-menu__trigger { opacity: 1 !important; } -body.theme--dark.theme--highcontrast #header #appmenu li:hover a, -body.theme--dark.theme--highcontrast #header #appmenu li:focus a { +body.theme--dark.theme--highcontrast #header .app-menu li:hover a, +body.theme--dark.theme--highcontrast #header .app-menu li:focus a { color: #000; } /* Files App */ #content.app-files #filestable { padding-top: 20px; } + +.comments .comment__editor .rich-contenteditable__input { + min-height: 70px; +} + +#header-menu-user-menu .user-menu__nav .menu-entry img { + filter: var(--inactive-icon-filter); + opacity: 1; +} +input:not([type=range], +.input-field__input, +[type=submit], +[type=button], +[type=reset], +.multiselect__input, +.select2-input, +.action-input__input, +[class^=vs__]), +select, +div[contenteditable=true], +textarea { + border: 1px solid var(--color-border-dark); + border-radius: var(--border-radius); +} diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg index 33c5ada6988c007ea3f06c77ad7978f70fbc9618..4f0bd8139737c8ee0a3cf423ec530acde9a2a7cf 100755 --- a/core/img/actions/add.svg +++ b/core/img/actions/add.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/actions/checkmark.svg b/core/img/actions/checkmark.svg index ca522306dad03a6147ba4d435fc2f637f0649290..69f39507140c36f3e9fc6d11153be58f0222a43c 100755 --- a/core/img/actions/checkmark.svg +++ b/core/img/actions/checkmark.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/close.svg b/core/img/actions/close.svg index c3a842db0f62b08f0a11d7363a40526fd99cfe23..8214955afd700834cc5469590def9f8b9c3ee211 100755 --- a/core/img/actions/close.svg +++ b/core/img/actions/close.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/comment.svg b/core/img/actions/comment.svg index e30fa6e3ff8a8b7dca240a3a9234294817d82be7..5997c55b5922e3d08f979b5b77fc2394c5eb4a56 100644 --- a/core/img/actions/comment.svg +++ b/core/img/actions/comment.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg index 864c7e59c1f22a341b92db97f471d70d42c53fa6..6caf4d3e94ac21b9957c1b05a2a484a47e46e3de 100755 --- a/core/img/actions/delete.svg +++ b/core/img/actions/delete.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/group.svg b/core/img/actions/group.svg index 09d82a4e29433a340ee7dab613b6ae0ba61ab275..aa9514108d0b1fa12f1614a8f651f349b5259bd8 100755 --- a/core/img/actions/group.svg +++ b/core/img/actions/group.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/logout.svg b/core/img/actions/logout.svg index 785b9b3bd982af785d02f383391a8365930f1590..79baca0ed9505c95737447254308e007b422bd80 100644 --- a/core/img/actions/logout.svg +++ b/core/img/actions/logout.svg @@ -1,5 +1,5 @@ - + diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg index cf19b828d56ce45784f9f95a3781bb717346678d..6370d179bf9ddb6bffedaae45d2557f7a12d075b 100755 --- a/core/img/actions/mail.svg +++ b/core/img/actions/mail.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg index abe21e8e2326d5738c1c63599925bda7f51a31b9..a85bcd7e00f5951678f121ad4dd3de04f9349f17 100755 --- a/core/img/actions/password.svg +++ b/core/img/actions/password.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/quota.svg b/core/img/actions/quota.svg index d4ddf5f68fa003baf2ee92f0d5231864991a6169..9c309b60270789302ad80c631bf1d89204601a91 100644 --- a/core/img/actions/quota.svg +++ b/core/img/actions/quota.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/rename.svg b/core/img/actions/rename.svg index 56e3640b28438e09728d2022d91044511817e0d0..9da05051b1d294082b491672b766c5ffb1a908f1 100755 --- a/core/img/actions/rename.svg +++ b/core/img/actions/rename.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/search.svg b/core/img/actions/search.svg index d78e4f4e818b826e9889fb51b05ee19ab3403049..d62e7241efd48a1b65d83ee8f4544ae915d0d071 100755 --- a/core/img/actions/search.svg +++ b/core/img/actions/search.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/settings-dark.svg b/core/img/actions/settings-dark.svg index 5535f81eda20c93b892bc2973bfb1d9b38b806c2..ee0474a9b6e56998519a2e337bd2c8cff08545c1 100755 --- a/core/img/actions/settings-dark.svg +++ b/core/img/actions/settings-dark.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/settings.svg b/core/img/actions/settings.svg index 8ebc715e9d47c2e499fbbb779f470baab3ff1149..3dc871ce1ee763fa1eb51007f2c9d8bb2959c492 100755 --- a/core/img/actions/settings.svg +++ b/core/img/actions/settings.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/share.svg b/core/img/actions/share.svg index 7de7f23b03e90e0c0efda11fbee25f1e2a619d7b..fbdd0e811dc5bbb3f448f7f119c467ac8ccce0c5 100755 --- a/core/img/actions/share.svg +++ b/core/img/actions/share.svg @@ -1,4 +1,4 @@ - + diff --git a/core/img/actions/star-outline.svg b/core/img/actions/star-outline.svg index 859718c06745f718dd24424ea6f0ed96d28b5a75..62b390502c500ce236f3c3b130328841776a108d 100755 --- a/core/img/actions/star-outline.svg +++ b/core/img/actions/star-outline.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/tag.svg b/core/img/actions/tag.svg index 816375a483c2aa0651af610084bb1a48455adf55..57077c70f75f97110769004213e9806e12d2a7df 100755 --- a/core/img/actions/tag.svg +++ b/core/img/actions/tag.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/actions/toggle-filelist.svg b/core/img/actions/toggle-filelist.svg index 5ec7e4e6f2aba409e19228600d2f0cad0b89e94c..ead00601e7df4907fd6259bdbf1393d39b1187a6 100755 --- a/core/img/actions/toggle-filelist.svg +++ b/core/img/actions/toggle-filelist.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg index e7f40dec35dbf104080176201a90c903f524cb44..f75590d128cd2e33be3e317dcd5b6b12b947c6a8 100755 --- a/core/img/actions/user.svg +++ b/core/img/actions/user.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/categories/files.svg b/core/img/categories/files.svg index 217654cacd1ddd3f11752deff838d695d0eb141c..4cb6af5a170d5e390f26f248496f16480324bf1d 100644 --- a/core/img/categories/files.svg +++ b/core/img/categories/files.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/clients/phone.svg b/core/img/clients/phone.svg index fd821008f39d607e9efe423b37c4b8ec0d59ff64..0edcba8318466d23f87f9f103cd2d9ab9adc30cd 100644 --- a/core/img/clients/phone.svg +++ b/core/img/clients/phone.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/icon-add.svg b/core/img/icon-add.svg index 33c5ada6988c007ea3f06c77ad7978f70fbc9618..4f0bd8139737c8ee0a3cf423ec530acde9a2a7cf 100755 --- a/core/img/icon-add.svg +++ b/core/img/icon-add.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/icon-close.svg b/core/img/icon-close.svg index d7b8e4968a5010d8fce500c4adaf4485e3af46dd..8ec9a0a401b90c9951a16fe5982a9404db5e74c5 100755 --- a/core/img/icon-close.svg +++ b/core/img/icon-close.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/icon-home.svg b/core/img/icon-home.svg index bcb5ddf866e3617c411d51317b5bcee774c1d5de..e27fc6f620a19d2c67d74c3dfe16a3d32cd36bba 100755 --- a/core/img/icon-home.svg +++ b/core/img/icon-home.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/icon-search.svg b/core/img/icon-search.svg index d49d5adf1055560569100b27839bc7aba73c982c..278302ac7bbc413298ebe814ec1a49d8c497eeaf 100755 --- a/core/img/icon-search.svg +++ b/core/img/icon-search.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/places/calendar.svg b/core/img/places/calendar.svg index 1c3b19d8ce45b6f68c75b4fbd0960f1d02b8ad52..93663fd0fc839cd7532a2d7fb61a444b587a9909 100755 --- a/core/img/places/calendar.svg +++ b/core/img/places/calendar.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/places/contacts.svg b/core/img/places/contacts.svg index a8a53a77e18425d61f9682a93d5dd933d2367f07..77d0cf91ea2e83be411810f9b66ac206d260258a 100755 --- a/core/img/places/contacts.svg +++ b/core/img/places/contacts.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/places/files.svg b/core/img/places/files.svg index 217654cacd1ddd3f11752deff838d695d0eb141c..4cb6af5a170d5e390f26f248496f16480324bf1d 100644 --- a/core/img/places/files.svg +++ b/core/img/places/files.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/places/home.svg b/core/img/places/home.svg index 598d76802681ab9e5316df2bd8f16543de45b80e..e5f26e033794e95b569e553832787417edb2c9df 100755 --- a/core/img/places/home.svg +++ b/core/img/places/home.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/text.svg b/core/img/text.svg index ace96cd9f4b9fada3e5e392422a2affded90baae..378ac11bee4d8f0ba037a7ce261163848ee14d8f 100755 --- a/core/img/text.svg +++ b/core/img/text.svg @@ -1,3 +1,3 @@ - + diff --git a/core/js/custom-login.js b/core/js/custom-login.js index 03929d77a8961d79f13f3969fe20b91325ce5d14..a3f4fa9e5bf936b4088c480f6e490cb792779457 100644 --- a/core/js/custom-login.js +++ b/core/js/custom-login.js @@ -1,20 +1,21 @@ -$(document).on('click','#lost-password', function(){ - if(window.innerWidth > 1050){ - $('.banner-content').hide('slow'); - $('.have-an-account').hide('slow'); - $('.banner-right-align').addClass('width0'); - $('.lines').hide(); - $('.v-align').addClass('warning-messsage'); - $('footer').addClass('forgotpass-footer'); - } -}); -$(document).on('click','.lost-password-container a', function(){ - if(window.innerWidth > 1050){ - $('.banner-right-align').removeClass('width0'); - $('.v-align').removeClass('warning-messsage'); - $('footer').removeClass('forgotpass-footer'); - $('.lines').show('slow'); - $('.banner-content').show('slow'); - $('.have-an-account').show('slow'); - } -}); +document.addEventListener('DOMContentLoaded', function() { + document.addEventListener('click', function(event) { + if (event.target.id === 'lost-password' && window.innerWidth > 1050) { + document.querySelector('.banner-content').style.display = 'none' + document.querySelector('.have-an-account').style.display = 'none' + document.querySelector('.banner-right-align').classList.add('width0') + document.querySelector('.lines').style.display = 'none' + document.querySelector('.v-align').classList.add('warning-message') + document.querySelector('footer').classList.add('forgotpass-footer') + document.querySelector('.banner-content').classList.remove('slow-show') + } else if (event.target.matches('.lost-password-container a') && window.innerWidth > 1050) { + document.querySelector('.banner-right-align').classList.remove('width0') + document.querySelector('.v-align').classList.remove('warning-message') + document.querySelector('footer').classList.remove('forgotpass-footer') + document.querySelector('.lines').style.display = 'block' + document.querySelector('.banner-content').style.display = 'block' + document.querySelector('.have-an-account').style.display = 'block' + document.querySelector('.banner-content').classList.add('slow-show') + } + }) +})