From 958ae7141539bd8db8b223236658a11412cbc966 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 20 May 2020 18:10:25 -0300 Subject: [PATCH 1/3] Renamed old staturs colors --- .../client/imports/components/header.css | 10 +++--- .../imports/components/main-content.css | 8 ++--- .../client/imports/components/memberlist.css | 8 ++--- .../client/imports/components/popover.css | 8 ++--- .../components/sidebar/sidebar-header.css | 18 +++++------ .../components/sidebar/sidebar-item.css | 14 ++++---- .../client/imports/general/theme_old.css | 32 +++++++++---------- .../client/imports/general/variables.css | 14 ++++---- app/ui/client/views/app/editStatus.css | 16 +++++----- 9 files changed, 65 insertions(+), 63 deletions(-) diff --git a/app/theme/client/imports/components/header.css b/app/theme/client/imports/components/header.css index d5b0a05cf493..3dfa4f441492 100644 --- a/app/theme/client/imports/components/header.css +++ b/app/theme/client/imports/components/header.css @@ -225,23 +225,23 @@ border-radius: var(--header-title-status-bullet-radius); &--online { - background-color: var(--status-online); + background-color: var(--rc-status-online); } &--away { - background-color: var(--status-away); + background-color: var(--rc-status-away); } &--busy { - background-color: var(--status-busy); + background-color: var(--rc-status-busy); } &--invisible { - background-color: var(--status-invisible); + background-color: var(--rc-status-invisible); } &--offline { - background-color: var(--status-invisible); + background-color: var(--rc-status-invisible); } } } diff --git a/app/theme/client/imports/components/main-content.css b/app/theme/client/imports/components/main-content.css index bda5cf955e32..04f7cb05d970 100644 --- a/app/theme/client/imports/components/main-content.css +++ b/app/theme/client/imports/components/main-content.css @@ -15,18 +15,18 @@ .messages-container .room-icon { &.online { - color: var(--status-online); + color: var(--rc-status-online); } &.away { - color: var(--status-away); + color: var(--rc-status-away); } &.busy { - color: var(--status-busy); + color: var(--rc-status-busy); } &.offline { - color: var(--status-invisible); + color: var(--rc-status-invisible); } } diff --git a/app/theme/client/imports/components/memberlist.css b/app/theme/client/imports/components/memberlist.css index 6d78136b841f..0da2ebec46e8 100644 --- a/app/theme/client/imports/components/memberlist.css +++ b/app/theme/client/imports/components/memberlist.css @@ -61,19 +61,19 @@ border-radius: var(--sidebar-item-user-status-radius); &--online { - background-color: var(--status-online); + background-color: var(--rc-status-online); } &--away { - background-color: var(--status-away); + background-color: var(--rc-status-away); } &--busy { - background-color: var(--status-busy); + background-color: var(--rc-status-busy); } &--offline { - background-color: var(--status-invisible-sidebar); + background-color: var(--rc-status-invisible-sidebar); } } diff --git a/app/theme/client/imports/components/popover.css b/app/theme/client/imports/components/popover.css index 551c02e9dd40..807bdd7c88d2 100644 --- a/app/theme/client/imports/components/popover.css +++ b/app/theme/client/imports/components/popover.css @@ -127,25 +127,25 @@ &--online { & .rc-popover__icon { - color: var(--status-online); + color: var(--rc-status-online); } } &--away { & .rc-popover__icon { - color: var(--status-away); + color: var(--rc-status-away); } } &--busy { & .rc-popover__icon { - color: var(--status-busy); + color: var(--rc-status-busy); } } &--offline { & .rc-popover__icon { - color: var(--status-invisible); + color: var(--rc-status-invisible); } } } diff --git a/app/theme/client/imports/components/sidebar/sidebar-header.css b/app/theme/client/imports/components/sidebar/sidebar-header.css index de54cba02ae4..fc963c5eda02 100644 --- a/app/theme/client/imports/components/sidebar/sidebar-header.css +++ b/app/theme/client/imports/components/sidebar/sidebar-header.css @@ -40,23 +40,23 @@ border-radius: var(--sidebar-account-status-bullet-radius); &--online { - background-color: var(--status-online); + background-color: var(--rc-status-online); } &--away { - background-color: var(--status-away); + background-color: var(--rc-status-away); } &--busy { - background-color: var(--status-busy); + background-color: var(--rc-status-busy); } &--invisible { - background-color: var(--status-invisible); + background-color: var(--rc-status-invisible); } &--offline { - background-color: var(--status-invisible); + background-color: var(--rc-status-invisible); } } } @@ -109,25 +109,25 @@ & .rc-popover__item { &--online { & .rc-icon { - color: var(--status-online); + color: var(--rc-status-online); } } &--away { & .rc-icon { - color: var(--status-away); + color: var(--rc-status-away); } } &--busy { & .rc-icon { - color: var(--status-busy); + color: var(--rc-status-busy); } } &--offline { & .rc-icon { - color: var(--status-invisible); + color: var(--rc-status-invisible); } } } diff --git a/app/theme/client/imports/components/sidebar/sidebar-item.css b/app/theme/client/imports/components/sidebar/sidebar-item.css index 125ed7283f45..17771d9a3081 100644 --- a/app/theme/client/imports/components/sidebar/sidebar-item.css +++ b/app/theme/client/imports/components/sidebar/sidebar-item.css @@ -137,15 +137,15 @@ &-status { &--online { - color: var(--status-online); + color: var(--rc-status-online); } &--away { - color: var(--status-away); + color: var(--rc-status-away); } &--busy { - color: var(--status-busy); + color: var(--rc-status-busy); } } } @@ -175,19 +175,19 @@ border-radius: var(--sidebar-item-user-status-radius); &--online { - background-color: var(--status-online); + background-color: var(--rc-status-online); } &--away { - background-color: var(--status-away); + background-color: var(--rc-status-away); } &--busy { - background-color: var(--status-busy); + background-color: var(--rc-status-busy); } &--offline { - background-color: var(--status-invisible-sidebar); + background-color: var(--rc-status-invisible-sidebar); } } diff --git a/app/theme/client/imports/general/theme_old.css b/app/theme/client/imports/general/theme_old.css index 657ebb4f3c41..2f88a849dfef 100644 --- a/app/theme/client/imports/general/theme_old.css +++ b/app/theme/client/imports/general/theme_old.css @@ -411,19 +411,19 @@ textarea { } i.status-online { - color: var(--status-online); + color: var(--rc-status-online); } .status-bg-online { - background-color: var(--status-online); + background-color: var(--rc-status-online); } .account-box .status-online .thumb::after, .account-box .status.online::after, .popup-user-status-online, .status-online::after { - border-color: var(--status-online-darken-10); - background-color: var(--status-online); + border-color: var(--rc-status-online-darken-10); + background-color: var(--rc-status-online); } .account-box .status-offline .thumb::after, @@ -432,11 +432,11 @@ i.status-online { } i.status-away { - color: var(--status-away); + color: var(--rc-status-away); } .status-bg-away { - background-color: var(--status-away); + background-color: var(--rc-status-away); } .account-box .status-away .thumb::after, @@ -444,38 +444,38 @@ i.status-away { .popup-user-status-away, .status-away::after, .status-pending::after { - border-color: var(--status-away-darken-10); - background-color: var(--status-away); + border-color: var(--rc-status-away-darken-10); + background-color: var(--rc-status-away); } i.status-busy { - color: var(--status-busy); + color: var(--rc-status-busy); } .status-bg-busy { - background-color: var(--status-busy); + background-color: var(--rc-status-busy); } .account-box .status-busy .thumb::after, .account-box .status.busy::after, .popup-user-status-busy, .status-busy::after { - border-color: var(--status-busy-darken-10); - background-color: var(--status-busy); + border-color: var(--rc-status-busy-darken-10); + background-color: var(--rc-status-busy); } i.status-offline { - color: var(--status-offline); + color: var(--rc-status-offline); } .status-bg-offline { - background-color: var(--status-offline); + background-color: var(--rc-status-offline); } .popup-user-status-offline, .status-offline::after { - border-color: var(--status-offline-darken-10); - background-color: var(--status-offline); + border-color: var(--rc-status-offline-darken-10); + background-color: var(--rc-status-offline); } .alert-warning { diff --git a/app/theme/client/imports/general/variables.css b/app/theme/client/imports/general/variables.css index d44f21266256..4d87efb1b951 100644 --- a/app/theme/client/imports/general/variables.css +++ b/app/theme/client/imports/general/variables.css @@ -75,6 +75,7 @@ --component-color: #f2f3f5; --pending-color: #fcb316; --error-color: #bc2031; + --success-color: #2de0a5; --selection-color: #02acec; --attention-color: #9c27b0; @@ -86,7 +87,6 @@ --link-font-color: var(--primary-action-color); --info-font-color: var(--secondary-font-color); --custom-scrollbar-color: var(--transparent-darker); - --status-offline: var(--transparent-darker); /* #endregion */ @@ -98,6 +98,7 @@ /* * General */ + --text-size: 0.875rem; --header-min-height: 60px; --toolbar-height: 55px; @@ -108,11 +109,12 @@ --flex-tab-webrtc-2-width: 850px; --border: 2px; --border-radius: 2px; - --status-online: var(--rc-color-success); - --status-away: var(--rc-color-alert); - --status-busy: var(--rc-color-error); - --status-invisible: var(--color-gray-medium); - --status-invisible-sidebar: var(--rc-color-primary-darkest); + --rc-status-online: var(--rc-color-success); + --rc-status-away: var(--rc-color-alert); + --rc-status-busy: var(--rc-color-error); + --rc-status-invisible: var(--color-gray-medium); + --rc-status-offline: var(--transparent-darker); + --rc-status-invisible-sidebar: var(--rc-color-primary-darkest); --default-padding: 1.5rem; --default-small-padding: 1rem; --status-bullet-size: 10px; diff --git a/app/ui/client/views/app/editStatus.css b/app/ui/client/views/app/editStatus.css index ab2170f62c88..a7b92dc5d7a8 100644 --- a/app/ui/client/views/app/editStatus.css +++ b/app/ui/client/views/app/editStatus.css @@ -1,19 +1,19 @@ .edit-status-type.rc-popover { &__item { &--online { - color: var(--status-online); + color: var(--rc-status-online); } &--away { - color: var(--status-away); + color: var(--rc-status-away); } &--busy { - color: var(--status-busy); + color: var(--rc-status-busy); } &--offline { - color: var(--status-invisible); + color: var(--rc-status-invisible); } } } @@ -21,25 +21,25 @@ .edit-status-type-icon { &--online { & .rc-icon { - color: var(--status-online); + color: var(--rc-status-online); } } &--away { & .rc-icon { - color: var(--status-away); + color: var(--rc-status-away); } } &--busy { & .rc-icon { - color: var(--status-busy); + color: var(--rc-status-busy); } } &--offline { & .rc-icon { - color: var(--status-invisible); + color: var(--rc-status-invisible); } } } From 6389279929db7dce9da6f3540a39fd9d3e76abae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmariaeduardacunha=E2=80=9C?= Date: Wed, 20 May 2020 19:56:19 -0300 Subject: [PATCH 2/3] Changing away status color to --color-orange --- app/theme/client/imports/general/variables.css | 4 ++-- .../client/models/CachedCollection.js | 2 +- server/startup/migrations/index.js | 1 + server/startup/migrations/v190.js | 9 +++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 server/startup/migrations/v190.js diff --git a/app/theme/client/imports/general/variables.css b/app/theme/client/imports/general/variables.css index 4d87efb1b951..8ae8e0c5a4f8 100644 --- a/app/theme/client/imports/general/variables.css +++ b/app/theme/client/imports/general/variables.css @@ -17,7 +17,7 @@ --color-purple: #861da8; --color-red: #f5455c; --color-dark-red: #e0364d; - --color-orange: #f59547; + --color-orange: #F38C39; --color-yellow: #ffd21f; --color-dark-yellow: #f6c502; --color-green: #2de0a5; @@ -40,7 +40,7 @@ /* #region colors Colors */ --rc-color-error: var(--color-red); --rc-color-error-light: #e1364c; - --rc-color-alert: var(--color-yellow); + --rc-color-alert: var(--color-orange); --rc-color-alert-light: var(--color-dark-yellow); --rc-color-success: var(--color-green); --rc-color-success-light: #25d198; diff --git a/app/ui-cached-collection/client/models/CachedCollection.js b/app/ui-cached-collection/client/models/CachedCollection.js index bcd1ffc5b6bb..26dece4ccc93 100644 --- a/app/ui-cached-collection/client/models/CachedCollection.js +++ b/app/ui-cached-collection/client/models/CachedCollection.js @@ -129,7 +129,7 @@ export class CachedCollection extends EventEmitter { userRelated = true, listenChangesForLoggedUsersOnly = false, useSync = true, - version = 10, + version = 11, maxCacheTime = 60 * 60 * 24 * 30, onSyncData = (/* action, record */) => {}, }) { diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js index edee93ea383f..c32aef2646df 100644 --- a/server/startup/migrations/index.js +++ b/server/startup/migrations/index.js @@ -186,4 +186,5 @@ import './v186'; import './v187'; import './v188'; import './v189'; +import './v190'; import './xrun'; diff --git a/server/startup/migrations/v190.js b/server/startup/migrations/v190.js new file mode 100644 index 000000000000..33fe26570579 --- /dev/null +++ b/server/startup/migrations/v190.js @@ -0,0 +1,9 @@ +import { Migrations } from '../../../app/migrations/server'; +import { Settings } from '../../../app/models/server'; + +Migrations.add({ + version: 190, + up() { + Settings.remove({ _id: /theme-color-status/ }, { multi: true }); + }, +}); From db48f7c60c6006429ef49f1f64576dd71ba03573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmariaeduardacunha=E2=80=9C?= Date: Wed, 20 May 2020 19:59:10 -0300 Subject: [PATCH 3/3] resolving lint errors --- app/theme/client/imports/general/variables.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/theme/client/imports/general/variables.css b/app/theme/client/imports/general/variables.css index 8ae8e0c5a4f8..fb317250592e 100644 --- a/app/theme/client/imports/general/variables.css +++ b/app/theme/client/imports/general/variables.css @@ -17,7 +17,7 @@ --color-purple: #861da8; --color-red: #f5455c; --color-dark-red: #e0364d; - --color-orange: #F38C39; + --color-orange: #f38c39; --color-yellow: #ffd21f; --color-dark-yellow: #f6c502; --color-green: #2de0a5; @@ -98,7 +98,6 @@ /* * General */ - --text-size: 0.875rem; --header-min-height: 60px; --toolbar-height: 55px;