Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theming efforts #911

Merged
merged 52 commits into from
Aug 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
34b5b80
Centeralize scss vars pt1
Jul 25, 2019
993972b
@simon-laux rename some styled components
Jul 25, 2019
69905f4
more renaming vars on js side of things
Simon-Laux Jul 25, 2019
3d21c45
theming manger development +minmal documentation
Simon-Laux Jul 25, 2019
1d3ba3e
bp3 dialogs background
Simon-Laux Jul 25, 2019
3ded62c
Centralize scss vars pt2
Jul 26, 2019
e10579a
Centralize scss vars pt3 of 3
Jul 26, 2019
0682526
thinking about naming
Simon-Laux Jul 26, 2019
2dd6a88
replace css vars with scss ones
Simon-Laux Jul 26, 2019
f0bd9e0
remove unused css
Simon-Laux Jul 26, 2019
501679e
grouping very close vars
Simon-Laux Jul 26, 2019
33abc2e
some of those color vars
Simon-Laux Jul 26, 2019
dd74f58
remove a scss style that is overwritten by styled
Simon-Laux Jul 26, 2019
426bf77
continue sorting
Simon-Laux Jul 26, 2019
b94580f
add todo
Simon-Laux Jul 26, 2019
a3ee0b2
renaming stuff, remove unused scss
Simon-Laux Jul 26, 2019
be06b8a
deduplicate message status and sorting
Simon-Laux Jul 26, 2019
6f87345
remove some more unused vars
Simon-Laux Jul 26, 2019
f548934
some more
Simon-Laux Jul 26, 2019
c8c42df
more progress and removing unused stuff
Simon-Laux Jul 27, 2019
3c46d43
fix indent and update todo comment
Simon-Laux Jul 27, 2019
b63c254
make css vars availible in js
Simon-Laux Jul 27, 2019
1deb6fa
remove some unused stuff
Simon-Laux Jul 27, 2019
bc96a58
fix a typo
Simon-Laux Jul 27, 2019
c0a9fde
remove unused css & start messages from bottom
Simon-Laux Jul 28, 2019
81f6dfd
some more progress
Simon-Laux Jul 29, 2019
3ddea0e
rename bp3 file
Simon-Laux Jul 29, 2019
1fe3037
login button color
Simon-Laux Jul 30, 2019
c2b1a3e
add bp3 header and button vars
Jul 30, 2019
13b075b
fix it
Simon-Laux Jul 30, 2019
36bdaa8
"accent color"
Simon-Laux Jul 31, 2019
4bda2e1
composer colors
Simon-Laux Aug 2, 2019
9dc91ae
extract emojimart styles to new file
Simon-Laux Aug 2, 2019
adcf76e
chatlist name theming fix
Simon-Laux Aug 2, 2019
ec0dc63
chatlist group icon color
Simon-Laux Aug 2, 2019
fb65a30
fix standard
Simon-Laux Aug 2, 2019
81da399
remove 3 unused images
Simon-Laux Aug 2, 2019
9aa8354
prepare bp3 input & a few todo points
Simon-Laux Aug 2, 2019
5c87e48
clarify some todo things
Simon-Laux Aug 2, 2019
7b71d43
make input background on login screen transparent
Simon-Laux Aug 2, 2019
e1bbb1f
simplify code, remove debug statements
Simon-Laux Aug 2, 2019
4b46c09
remove 2 unused css vars
Simon-Laux Aug 2, 2019
33c06df
remove css var fallback
Simon-Laux Aug 2, 2019
fd41872
remove a var that gets overwritten anyways
Simon-Laux Aug 2, 2019
0ef33d9
one more var
Simon-Laux Aug 2, 2019
a49fbb3
include emojimart in ThemeBackend
Aug 2, 2019
3ace56b
moar bp3 overwrites
Aug 2, 2019
a3addd6
dirty quick reload for themes
Aug 2, 2019
4703bdd
somw progress and playin' around with theming
Simon-Laux Aug 2, 2019
cc1e643
fix standard
Simon-Laux Aug 2, 2019
8924cc6
emoji picker search icon color
Simon-Laux Aug 2, 2019
c99aa8e
make available chat bubble color in "highlevel"
Simon-Laux Aug 2, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6,478 changes: 6,478 additions & 0 deletions images/background_dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
1 change: 0 additions & 1 deletion images/chat-bubble-outline.svg

This file was deleted.

1 change: 0 additions & 1 deletion images/chat-bubble.svg

This file was deleted.

Binary file removed images/group-icon.png
Binary file not shown.
8 changes: 8 additions & 0 deletions images/group-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/ic_close_white_24dp.png
Binary file not shown.
1 change: 0 additions & 1 deletion images/x.svg

This file was deleted.

91 changes: 0 additions & 91 deletions scss/_conversation.scss

This file was deleted.

6 changes: 1 addition & 5 deletions scss/_emoji.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,11 @@ button.emoji {
display: inline-block;
width: $button-height;
height: $button-height;
@include color-svg('../images/smile.svg', var(--color-grey));
@include color-svg('../images/smile.svg', $color-composer-emoji-btn);
}

&:focus,
&:hover {
opacity: 1;
}
}

.emoji-mart-category-list > li {
min-width: initial;
}
68 changes: 7 additions & 61 deletions scss/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ body {
margin: 0;
font-family: $roboto!important;
font-size: 14px;
color: var(--color-light-90);
background-color: var(--bg-color);
color: $color-global-text;
background-color: $color-global-bg;
}

.window {
Expand Down Expand Up @@ -53,30 +53,13 @@ h1, h2, h3, h4, h5, p, .bp3-button, .bp3-dialog-header, button>span, label {
display: none;
}

.title-bar {
color: var(--color-light-90);

height: $header-height;
display: flex;
flex-direction: row;
align-items: center;
}

.logo {
margin-left: 16px;
font-size: 16px;
line-height: 24px;
font-weight: 300;
color: var(--color-light-90);
}

button {
cursor: pointer;
font-size: inherit;
}

a {
color: var(--color-blue);
color: $color-global-a;
}


Expand All @@ -100,7 +83,7 @@ a {
display: inline-block;
width: $button-height;
height: $button-height;
@include color-svg('../images/paperclip.svg', var(--color-grey));
@include color-svg('../images/paperclip.svg', $color-composer-file-btn);
transform: rotateZ(-45deg);
}

Expand All @@ -123,24 +106,6 @@ a {
}
}

$avatar-size: 48px;

.avatar {
display: inline-block;
height: $avatar-size;
width: $avatar-size;
border-radius: 50%;
background-size: cover;
vertical-align: middle;
text-align: center;
line-height: $avatar-size;
overflow-x: hidden;
text-overflow: ellipsis;
color: var(--color-white);
font-size: 18px;
background-color: var(--color-grey);
}

.SelectGroupImage {
width: 100px;
}
Expand Down Expand Up @@ -171,31 +136,12 @@ $new-contact-left-margin: 16px;
}
}

.x {
display: inline-block;
float: right;
cursor: pointer;
border-radius: 50%;
width: 22px;
height: 22px;
padding: 3px;
background: var(--color-grey);

&:before {
content: '';
display: block;
width: 100%;
height: 100%;
@include color-svg('../images/x.svg', var(--color-white));
}
}

input[type='text'],
input[type='search'],
textarea {
&:active,
&:focus {
outline: 1px solid var(--color-blue);
outline: 1px solid $color-global-textarea-outline;
}
}

Expand Down Expand Up @@ -231,11 +177,11 @@ button:focus {
}

::-webkit-scrollbar-thumb {
background: var(--scrollbar-thumb);
background: $color-scrollbar-thumb;
}

::-webkit-scrollbar-thumb:hover {
background: var(--scrollbar-thumb-hover);
background: $color-scrollbar-thumb-hover;
}

::-webkit-scrollbar-corner {
Expand Down
57 changes: 0 additions & 57 deletions scss/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,63 +3,6 @@
overflow: auto;
}

// $search-x-size: 16px;
// $search-padding-right: 12px;
// $search-padding-left: 30px;

// input.search {
// border: 1px solid $color-black-02;
// padding: 0 $search-padding-right 0 $search-padding-left;
// margin-left: 8px;
// margin-right: 8px;
// outline: 0;
// height: 32px;
// width: calc(100% - 16px);
// outline-offset: -2px;
// font-size: 14px;
// line-height: 18px;
// font-weight: normal;

// position: relative;
// border-radius: 4px;

// &:focus {
// outline: solid 1px var(--color-blue);
// }

// &.active {
// background-image: url('../images/x.svg');
// background-repeat: no-repeat;
// background-size: $search-x-size;

// &.ltr {
// background-position: right $search-padding-right center;
// }

// &.rtl {
// background-position: left $search-padding-left center;
// }
// }

// &::-webkit-search-cancel-button {
// -webkit-appearance: none;
// display: block;
// width: $search-x-size;
// height: $search-x-size;
// }

// &::-webkit-search-cancel-button:hover {
// cursor: pointer;
// }
// }

.last-timestamp {
font-size: smaller;
float: right;
margin: 0 10px;
color: var(--color-grey);
}

.new-contact {
display: none;
cursor: pointer;
Expand Down
Loading