Skip to content

Commit

Permalink
Regression: Status presence color (#17707)
Browse files Browse the repository at this point in the history 
Co-authored-by: Guilherme Gazzo <[email protected]>
  • Loading branch information
@dudizilla @ggazzo
dudizilla and ggazzo authored May 21, 2020
1 parent 6ed0e44 commit 5a6a084
Show file tree
Hide file tree
Showing 12 changed files with 77 additions and 66 deletions.
10 changes: 5 additions & 5 deletions app/theme/client/imports/components/header.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions app/theme/client/imports/components/main-content.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
8 changes: 4 additions & 4 deletions app/theme/client/imports/components/memberlist.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
8 changes: 4 additions & 4 deletions app/theme/client/imports/components/popover.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions app/theme/client/imports/components/sidebar/sidebar-header.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down Expand Up @@ -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);
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions app/theme/client/imports/components/sidebar/sidebar-item.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down Expand Up @@ -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);
}
}

Expand Down
32 changes: 16 additions & 16 deletions app/theme/client/imports/general/theme_old.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -432,50 +432,50 @@ 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,
.account-box .status.away::after,
.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 {
Expand Down
17 changes: 9 additions & 8 deletions app/theme/client/imports/general/variables.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -75,6 +75,7 @@
--component-color: #f2f3f5;
--pending-color: #fcb316;
--error-color: #bc2031;
--success-color: #2de0a5;
--selection-color: #02acec;
--attention-color: #9c27b0;

Expand All @@ -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 */

Expand All @@ -108,11 +108,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;
Expand Down
2 changes: 1 addition & 1 deletion app/ui-cached-collection/client/models/CachedCollection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */) => {},
}) {
Expand Down
Loading

0 comments on commit 5a6a084

Please sign in to comment.