diff --git a/stylesheets/_mentions.scss b/stylesheets/_mentions.scss index 8152672b2..203f83c2d 100644 --- a/stylesheets/_mentions.scss +++ b/stylesheets/_mentions.scss @@ -85,7 +85,6 @@ color: black; } - .module-conversation-list-item--mentioned-us { border-left: 4px solid $session-color-green !important; } diff --git a/stylesheets/_mixins.scss b/stylesheets/_mixins.scss index 594c3f14b..9a7e9b664 100644 --- a/stylesheets/_mixins.scss +++ b/stylesheets/_mixins.scss @@ -30,8 +30,7 @@ } @keyframes highlightedMessageAnimation { - 25% { background-color: #00f782; } - 50% { background-color: #00000000; } - 75% { background-color: #00f782; } + 1% { + background-color: #00f782; + } } - diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss index c0ec2a9ad..d8ffe4995 100644 --- a/stylesheets/_session_left_pane.scss +++ b/stylesheets/_session_left_pane.scss @@ -410,27 +410,30 @@ $session-compose-margin: 20px; padding: 8px 20px; margin: 0px $session-compose-margin; - @at-root .light-theme #{&} { - background: $session-shade-15; - color: $session-color-black; - } - @at-root .dark-theme #{&} { - background: $session-shade-4; - color: $session-color-light-grey; - } + // FIXME themify once this component is enabled back + // @at-root .light-theme #{&} { + // background: $session-shade-15; + // color: $session-color-black; + // } + // @at-root .dark-theme #{&} { + // background: $session-shade-4; + // color: $session-color-light-grey; + // } &-selected, &:hover { font-weight: bold; - @at-root .light-theme #{&} { - color: $session-color-black; - background: $session-color-white; - } - @at-root .dark-theme #{&} { - color: $session-color-white; - background: $session-shade-8; - } + // FIXME themify once this component is enabled back + + // @at-root .light-theme #{&} { + // color: $session-color-black; + // background: $session-color-white; + // } + // @at-root .dark-theme #{&} { + // color: $session-color-white; + // background: $session-shade-8; + // } } } } diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss index 293bffb47..e377b889a 100644 --- a/stylesheets/_session_theme.scss +++ b/stylesheets/_session_theme.scss @@ -87,7 +87,7 @@ .message { &-highlighted { - animation: highlightedMessageAnimation 3s ease-in-out; + animation: highlightedMessageAnimation 1s ease-in-out; } &-selected { diff --git a/stylesheets/themes.scss b/stylesheets/themes.scss index 563a6f9a2..ca7c5ebae 100644 --- a/stylesheets/themes.scss +++ b/stylesheets/themes.scss @@ -6,9 +6,6 @@ $destructive: #ff453a; $accentLightTheme: #00e97b; $accentDarkTheme: #00f782; - - - $themes: ( light: ( accent: $accentLightTheme, @@ -48,7 +45,7 @@ $themes: ( scrollBarTrack: #fcfcfc, scrollBarThumb: #474646, // pill divider: - pillDividerColor: rgba($black, 0.10), + pillDividerColor: rgba($black, 0.1), pillDividerTextColor: #555555, // context menu contextMenuBackground: #f5f5f5, @@ -67,7 +64,7 @@ $themes: ( modalBackground: #101011, fakeChatBubbleBackground: #212121, // input - inputBackground: rgba(#8e8e93, 0.12), + inputBackground: rgba(#8e8e93, 0.12), // text textColor: $white, textColorSubtle: #a0a0a0,