fix theme input and cleanup

pull/1317/head
Audric Ackermann 5 years ago
parent c82d4e5f01
commit 495683ec3d
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -175,9 +175,11 @@
} }
input { input {
color: $color-dark-05; @include themify($themes) {
background-color: $color-dark-70; background-color: themed('inputBackground');
border-color: $color-dark-55; color: themed('textColor');
border: themed('sessionBorder');
}
} }
} }
@ -266,7 +268,7 @@
justify-content: center; justify-content: center;
margin-top: $session-margin-lg; margin-top: $session-margin-lg;
&-input { input {
height: 38px; height: 38px;
width: 142px; width: 142px;
border-radius: 5px; border-radius: 5px;
@ -275,6 +277,7 @@
@include themify($themes) { @include themify($themes) {
background: themed('inputBackground'); background: themed('inputBackground');
color: themed('textColor'); color: themed('textColor');
border: themed('sessionBorder');
} }
} }

@ -1404,8 +1404,9 @@ input {
width: 100%; width: 100%;
max-height: 400px; max-height: 400px;
overflow-y: auto; overflow-y: auto;
box-shadow: inset 0px 14px 7px -15px $session-color-dark-grey, @include themify($themes) {
inset 0px -14px 7px -15px $session-color-dark-grey; border: themed('sessionBorder');
}
} }
&__selection { &__selection {
@ -1416,6 +1417,9 @@ input {
&__no-contacts { &__no-contacts {
font-family: $session-font-mono; font-family: $session-font-mono;
@include themify($themes) {
background: themed('cellBackground');
}
text-align: center; text-align: center;
padding: 20px; padding: 20px;
} }
@ -1454,12 +1458,20 @@ input {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
transition: $session-transition-duration; transition: $session-transition-duration;
@include themify($themes) {
background: themed('cellBackground');
}
&:first-child { &:not(:last-child) {
border-top: 1px solid rgba($session-shade-8, 0.6); @include themify($themes) {
border-bottom: themed('sessionBorder');
}
} }
&:last-child {
border-bottom: 1px solid rgba($session-shade-8, 0.6); &:hover {
@include themify($themes) {
background-color: themed('clickableHovered');
}
} }
&.selected { &.selected {

@ -95,7 +95,7 @@ $session-compose-margin: 20px;
font-size: 15px; font-size: 15px;
@include themify($themes) { @include themify($themes) {
color: themed('textColorSubtle'); color: subtle(themed('textColorSubtle'));
} }
} }
} }
@ -179,15 +179,6 @@ $session-compose-margin: 20px;
} }
} }
&-compose {
@at-root .light-theme #{&} {
background: $session-color-white;
}
@at-root .dark-theme #{&} {
@include session-dark-background-lighter;
}
}
&-overlay { &-overlay {
@include themify($themes) { @include themify($themes) {
background: themed('leftpaneOverlayBackground'); background: themed('leftpaneOverlayBackground');

@ -1,46 +1,53 @@
// 13592 lines for manifest.css on date 25 august // 13592 lines for manifest.css on date 25 august
$white: #ffffff;
$black: #000000;
$destructive: #ff453a;
$accentLightTheme: #00e97b;
$accentDarkTheme: #00f782;
$themes: ( $themes: (
light: ( light: (
accent: #00e97b, accent: $accentLightTheme,
accentButton: #000, accentButton: $black,
destructive: #ff453a, destructive: $destructive,
cellBackground: #fcfcfc, cellBackground: #fcfcfc,
modalBackground: #fcfcfc, modalBackground: #fcfcfc,
fakeChatBubbleBackground: #f5f5f5, fakeChatBubbleBackground: #f5f5f5,
// input // input
inputBackground: #8e8e931f, inputBackground: rgba(#8e8e93, 0.12),
// text // text
textColor: #000, textColor: $black,
textColorSubtle: #a0a0a0, textColorSubtle: #a0a0a0,
textColorOpposite: #fff, textColorOpposite: $white,
// inbox // inbox
inboxBackground: #fff, inboxBackground: $white,
// buttons // buttons
backgroundPrimary: #272726, backgroundPrimary: #272726,
foregroundPrimary: #fff, foregroundPrimary: $white,
buttonGreen: #272726, buttonGreen: #272726,
// conversation view // conversation view
composeViewBackground: #fcfcfc, composeViewBackground: #fcfcfc,
composeViewTextFieldBackground: #ededed, composeViewTextFieldBackground: #ededed,
receivedMessageBackground: #f5f5f5, receivedMessageBackground: #f5f5f5,
sentMessageBackground: #00e97b, sentMessageBackground: $accentLightTheme,
receivedMessageText: #000, receivedMessageText: $black,
sentMessageText: #000, sentMessageText: $black,
sessionShadow: 0 0 4px 0 rgba(#000, 0.37), sessionShadow: 0 0 4px 0 rgba($black, 0.37),
// left pane // left pane
conversationList: #fff, conversationList: $white,
conversationItemHasUnread: #fcfcfc, conversationItemHasUnread: #fcfcfc,
conversationItemSelected: #f0f0f0, conversationItemSelected: #f0f0f0,
clickableHovered: #dfdfdf, clickableHovered: #dfdfdf,
sessionBorder: 1px solid #f1f1f1, sessionBorder: 1px solid #f1f1f1,
leftpaneOverlayBackground: #fff, leftpaneOverlayBackground: $white,
// scrollbars // scrollbars
scrollBarTrack: #fcfcfc, scrollBarTrack: #fcfcfc,
scrollBarThumb: #474646, scrollBarThumb: #474646,
// pill divider: // pill divider:
pillDividerColor: #0000001a, pillDividerColor: rgba($black, 0.10),
pillDividerTextColor: #555, pillDividerTextColor: #555555,
// context menu // context menu
contextMenuBackground: #f5f5f5, contextMenuBackground: #f5f5f5,
filterSessionText: brightness(0) saturate(100%), filterSessionText: brightness(0) saturate(100%),
@ -51,38 +58,38 @@ $themes: (
quoteBottomBarBackground: #f0f0f0, quoteBottomBarBackground: #f0f0f0,
), ),
dark: ( dark: (
accent: #00f782, accent: $accentDarkTheme,
accentButton: #00f782, accentButton: $accentDarkTheme,
destructive: #ff453a, destructive: $destructive,
cellBackground: #1b1b1b, cellBackground: #1b1b1b,
modalBackground: #101011, modalBackground: #101011,
fakeChatBubbleBackground: #212121, fakeChatBubbleBackground: #212121,
// input // input
inputBackground: #8e8e931f, inputBackground: rgba(#8e8e93, 0.12),
// text // text
textColor: #fff, textColor: $white,
textColorSubtle: #a0a0a0, textColorSubtle: #a0a0a0,
textColorOpposite: #000, textColorOpposite: $black,
// inbox // inbox
inboxBackground: linear-gradient(180deg, #171717 0%, #121212 100%), inboxBackground: linear-gradient(180deg, #171717 0%, #121212 100%),
// buttons // buttons
backgroundPrimary: #474646, backgroundPrimary: #474646,
foregroundPrimary: #fff, foregroundPrimary: $white,
buttonGreen: #00f782, buttonGreen: $accentDarkTheme,
// conversation view // conversation view
composeViewBackground: #1b1b1b, composeViewBackground: #1b1b1b,
composeViewTextFieldBackground: #141414, composeViewTextFieldBackground: #141414,
receivedMessageBackground: #222325, receivedMessageBackground: #222325,
sentMessageBackground: #3f4146, sentMessageBackground: #3f4146,
receivedMessageText: #fff, receivedMessageText: $white,
sentMessageText: #fff, sentMessageText: $white,
sessionShadow: 0 0 4px 0 rgba(#fff, 0.2), sessionShadow: 0 0 4px 0 rgba($white, 0.2),
// left pane // left pane
conversationList: #1b1b1b, conversationList: #1b1b1b,
conversationItemHasUnread: #2c2c2c, conversationItemHasUnread: #2c2c2c,
conversationItemSelected: #404040, conversationItemSelected: #404040,
clickableHovered: #414347, clickableHovered: #414347,
sessionBorder: 1px solid #ffffff0f, sessionBorder: 1px solid rgba($white, 0.06),
leftpaneOverlayBackground: linear-gradient(180deg, #171717 0%, #121212 100%), leftpaneOverlayBackground: linear-gradient(180deg, #171717 0%, #121212 100%),
// scrollbars // scrollbars
scrollBarTrack: #1b1b1b, scrollBarTrack: #1b1b1b,

Loading…
Cancel
Save