themify widget selection, compose and slider

pull/1315/head
Audric Ackermann 5 years ago
parent 269f799d6b
commit 5cdb25ca00
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -34,7 +34,9 @@
.rc-slider-rail { .rc-slider-rail {
position: absolute; position: absolute;
width: 100%; width: 100%;
background-color: $session-shade-6; @include themify($themes) {
background: themed('inputBackground');
}
height: 8px; height: 8px;
border-radius: 6px; border-radius: 6px;
margin: 0px 0px 0px -1px; margin: 0px 0px 0px -1px;

@ -578,8 +578,8 @@ label {
@include themify($themes) { @include themify($themes) {
background-color: themed('modalBackground'); background-color: themed('modalBackground');
color: themed('textColor'); color: themed('textColor');
border: 1px solid themed('modalBorder');
} }
border: 1px solid $session-shade-8;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -962,7 +962,7 @@ label {
text-align: center; text-align: center;
font-size: $session-font-md; font-size: $session-font-md;
@include themify($themes) { @include themify($themes) {
background: themed('searchBarBackground'); background: themed('inputBackground');
} }
} }
@ -1100,9 +1100,10 @@ label {
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background-color: $session-shade-6;
height: $main-view-header-height; height: $main-view-header-height;
@include themify($themes) {
background: themed('cellBackground');
}
&-title { &-title {
line-height: $main-view-header-height; line-height: $main-view-header-height;
font-weight: bold; font-weight: bold;
@ -1119,13 +1120,14 @@ label {
&-item { &-item {
font-size: $session-font-md; font-size: $session-font-md;
color: $session-color-white;
background-color: $session-shade-1;
padding: $session-margin-lg; padding: $session-margin-lg;
margin-bottom: 20px; margin-bottom: 20px;
border-bottom: 1px solid $session-shade-5; border-bottom: 1px solid $session-shade-5;
@include themify($themes) {
background: themed('cellBackground');
color: themed('textColor');
}
&.inline { &.inline {
display: flex; display: flex;
align-items: center; align-items: center;
@ -1147,12 +1149,21 @@ label {
font-size: $session-font-sm; font-size: $session-font-sm;
font-weight: 100; font-weight: 100;
max-width: 700px; max-width: 700px;
@include session-color-subtle($session-color-white); @include themify($themes) {
@include session-color-subtle(themed('textColor'));
}
} }
&__content { &__content {
label { label {
@include session-color-subtle($session-color-white); @include themify($themes) {
@include session-color-subtle(themed('textColor'));
}
}
}
&__selection {
.session-toggle {
transition: $session-transition-duration;
} }
} }
} }
@ -1170,7 +1181,7 @@ label {
justify-content: space-between; justify-content: space-between;
padding: $session-margin-sm $session-margin-md; padding: $session-margin-sm $session-margin-md;
background-color: $session-shade-5; background: none;
font-size: $session-font-xs; font-size: $session-font-xs;
span { span {
@ -1279,7 +1290,9 @@ label {
} }
textarea.send-message { textarea.send-message {
background-color: $session-shade-4; @include themify($themes) {
background: themed('composeViewBackground');
}
border: none; border: none;
margin: 0px; margin: 0px;
padding: 0px $session-margin-lg; padding: 0px $session-margin-lg;
@ -1293,7 +1306,9 @@ label {
.bottom-bar form { .bottom-bar form {
&.send { &.send {
background-color: $session-shade-4; @include themify($themes) {
background: themed('composeViewBackground');
}
} }
&.active textarea { &.active textarea {
@ -1302,7 +1317,9 @@ label {
} }
.dark-theme .bottom-bar .send-message[disabled='disabled'] { .dark-theme .bottom-bar .send-message[disabled='disabled'] {
background: $session-shade-4 !important; @include themify($themes) {
background: themed('composeViewBackground');
}
} }
.session-radio-group fieldset { .session-radio-group fieldset {
@ -1338,17 +1355,24 @@ label {
vertical-align: -3px; vertical-align: -3px;
border: 2px solid rgba($session-color-white, 0.6); border: 2px solid rgba($session-color-white, 0.6);
padding: 0.2em; padding: 0.2em;
background-color: transparent; @include themify($themes) {
background: none;
border-color: themed('accent');
}
background-clip: content-box; background-clip: content-box;
transition: $session-transition-duration;
} }
input:hover + label:before { input:hover + label:before {
border-color: $session-color-white; @include themify($themes) {
background: themed('accent');
}
} }
input:checked + label:before { input:checked + label:before {
background-color: $session-color-white; @include themify($themes) {
border-color: $session-color-white; background: themed('accent');
}
} }
} }

@ -341,7 +341,9 @@ $session-compose-margin: 20px;
font-family: $session-font-default; font-family: $session-font-default;
text-overflow: ellipsis; text-overflow: ellipsis;
background: none; background: none;
@include themify($themes) {
color: themed('textColor');
}
&:focus { &:focus {
outline: none !important; outline: none !important;
} }
@ -464,7 +466,7 @@ $session-compose-margin: 20px;
} }
&-category-list-item { &-category-list-item {
@include session-dark-background; background: none;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
@ -481,11 +483,15 @@ $session-compose-margin: 20px;
} }
&.active { &.active {
background-color: $session-shade-5; @include themify($themes) {
background: themed('conversationItemSelected');
}
} }
&:hover { &:hover {
background-color: $session-shade-6; @include themify($themes) {
background: themed('clickableHovered');
}
} }
&__buttons { &__buttons {

@ -8,8 +8,6 @@ $themes: (
unimportantButtonBackground: #0000, unimportantButtonBackground: #0000,
border: #979797, border: #979797,
cellBackground: #fcfcfc, cellBackground: #fcfcfc,
searchBarPlaceholder: #8e8e93,
searchBarBackground: #8e8e931f,
separator: #36383c, separator: #36383c,
buttonBackground: #fcfcfc, buttonBackground: #fcfcfc,
modalBackground: #fcfcfc, modalBackground: #fcfcfc,
@ -17,6 +15,8 @@ $themes: (
fakeChatBubbleBackground: #f5f5f5, fakeChatBubbleBackground: #f5f5f5,
fakeChatBubbleText: #000, fakeChatBubbleText: #000,
newConversationButtonShadow: hsl(151, 89%, 26%), newConversationButtonShadow: hsl(151, 89%, 26%),
// input
inputBackground: #8e8e931f,
// text // text
textColor: #000, textColor: #000,
textColorSubtle: #a0a0a0, textColorSubtle: #a0a0a0,
@ -55,8 +55,6 @@ $themes: (
unimportantButtonBackground: #323232, unimportantButtonBackground: #323232,
border: #979797, border: #979797,
cellBackground: #1b1b1b, cellBackground: #1b1b1b,
searchBarPlaceholder: #8e8e93,
searchBarBackground: #8e8e931f,
separator: #36383c, separator: #36383c,
buttonBackground: #1b1b1b, buttonBackground: #1b1b1b,
modalBackground: #101011, modalBackground: #101011,
@ -64,6 +62,8 @@ $themes: (
fakeChatBubbleBackground: #3f4146, fakeChatBubbleBackground: #3f4146,
fakeChatBubbleText: #000, fakeChatBubbleText: #000,
newConversationButtonShadow: #077c44, newConversationButtonShadow: #077c44,
// input
inputBackground: #8e8e931f,
// text // text
textColor: #fff, textColor: #fff,
textColorSubtle: #a0a0a0, textColorSubtle: #a0a0a0,

@ -61,7 +61,7 @@ export class SessionSettingListItem extends React.Component<Props, State> {
<div className="session-settings-item__content"> <div className="session-settings-item__content">
{type === SessionSettingType.Toggle && ( {type === SessionSettingType.Toggle && (
<div className="session-sessings-item__selection"> <div className="session-settings-item__selection">
<SessionToggle <SessionToggle
active={Boolean(value)} active={Boolean(value)}
onClick={this.handleClick} onClick={this.handleClick}

Loading…
Cancel
Save