From 50050363a05cdccc7bac0e741e83380255522f33 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Sun, 28 Jun 2020 16:37:46 +0200 Subject: [PATCH] Frontend: Use new logo colors Signed-off-by: Michael Mayer --- assets/static/img/logo-color.svg | 19 ++++++++++ frontend/src/css/app.css | 12 ------- frontend/src/css/rainbow.css | 50 ++------------------------- frontend/src/share/p-photo-mosaic.vue | 6 ++-- 4 files changed, 24 insertions(+), 63 deletions(-) create mode 100644 assets/static/img/logo-color.svg diff --git a/assets/static/img/logo-color.svg b/assets/static/img/logo-color.svg new file mode 100644 index 000000000..bc8985a2a --- /dev/null +++ b/assets/static/img/logo-color.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff --git a/frontend/src/css/app.css b/frontend/src/css/app.css index 5aa98360a..492db2fea 100644 --- a/frontend/src/css/app.css +++ b/frontend/src/css/app.css @@ -93,18 +93,6 @@ main { bottom: 0; } -#photoprism div.loading p { - color: #616161; -} - -#photoprism div.loading div.bar { - margin: 0; - width: 100%; - height: 8px; - animation: colorchange 3s infinite; - -webkit-animation: colorchange 3s infinite; -} - #photoprism main .p-results a { color: #333333; } diff --git a/frontend/src/css/rainbow.css b/frontend/src/css/rainbow.css index f71aa3376..a1fdcd7db 100644 --- a/frontend/src/css/rainbow.css +++ b/frontend/src/css/rainbow.css @@ -15,7 +15,7 @@ } .rainbow { - background: repeating-linear-gradient(45deg, #FF9AA2, #FFB7B2, #FFDAC1, #E2F0CB, #B5EAD7, #C7CEEA); + background: repeating-linear-gradient(45deg, #ff9aa2, #dabcd2, #c7ceea, #bbe0de, #b5ead7); background-size: 200% 200%; -webkit-animation: rainbow-animation 6s ease infinite; @@ -25,51 +25,5 @@ .rainbow-static { background-size: 200% 200%; - background: repeating-linear-gradient(45deg, #FF9AA2, #FFB7B2, #FFDAC1, #E2F0CB, #B5EAD7, #C7CEEA) 100% 50%; -} - -@keyframes colorchange -{ - 0% {background: #EF5350;} - 25% {background: #FFD600;} - 50% {background: #00ACC1;} - 75% {background: #00BFA5;} - 100% {background: #E57373;} -} - -@-webkit-keyframes colorchange -{ - 0% {background: #EF5350;} - 25% {background: #FFD600;} - 50% {background: #00ACC1;} - 75% {background: #00BFA5;} - 100% {background: #E57373;} -} - -.colorchange { - animation: colorchange 3s infinite; - -webkit-animation: colorchange 3s infinite; -} - -@keyframes colorchange--text -{ - 0% {color: #EF5350;} - 25% {color: #FFD600;} - 50% {color: #00ACC1;} - 75% {color: #00BFA5;} - 100% {color: #E57373;} -} - -@-webkit-keyframes colorchange--text -{ - 0% {color: #EF5350;} - 25% {color: #FFD600;} - 50% {color: #00ACC1;} - 75% {color: #00BFA5;} - 100% {color: #E57373;} -} - -.colorchange--text { - animation: colorchange--text 5s infinite; - -webkit-animation: colorchange--text 5s infinite; + background: repeating-linear-gradient(45deg, #ff9aa2, #dabcd2, #c7ceea, #bbe0de, #b5ead7) 100% 50%; } diff --git a/frontend/src/share/p-photo-mosaic.vue b/frontend/src/share/p-photo-mosaic.vue index 535f75000..fe9fd367e 100644 --- a/frontend/src/share/p-photo-mosaic.vue +++ b/frontend/src/share/p-photo-mosaic.vue @@ -7,10 +7,10 @@ No photos matched your search
- {{$gettext("Try using other terms and search options such as category, country and camera.")}} + Try using other terms and search options such as category, country and camera. - {{$gettext("Non-photographic and low-quality images require a review before they appear in search results.")}} - + Non-photographic and low-quality images require a review before they appear in search results. +