Skip to content

Fixed the white border and flash when bringing up the tapback menu in dark mode #52

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.

Sign up for GitHub

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fixed the white border and flash when bringing up the tapback menu in dark mode #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4560419
Made the `To` text in the transcript toolbar and the background color…
sabogalc Jun 29, 2021
74f9eeb
Removed the `border-radiusborder-radius: 25px;` line from `Acknowledg…
sabogalc Jun 29, 2021
1cd4a2b
Made the dark mode acknowledgment picker a little less darker
sabogalc Jun 29, 2021
72fe165
I accidentally broke light mode in [this](https://github.com/open-imc…
sabogalc Jun 29, 2021
6676aeb
Fixed incorrect coloring on URL previews
sabogalc Jun 29, 2021
2b5a4b8
Changed dark mode to more closely resemble iOS
sabogalc Jun 29, 2021
3731e3b
Fixed transparent context menu text when in light mode
sabogalc Jun 29, 2021
c42bbb4
Fixed the white border and flash when bringing up the tapback menu in…
sabogalc Jun 29, 2021
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
24 changes: 16 additions & 8 deletions src/styles/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $colors: (
from-me-text: white,
not-from-me: (
light: rgb(229,229,234),
dark: #3B3B3D
dark: #272729
),
not-from-me-text: (
light: black,
Expand All @@ -29,23 +29,23 @@ $colors: (
active-chat-text: white,
master-detail-background: (
light: #F0F0F0,
dark: #242424
dark: #010001
),
master-detail-border-color: (
light: #E2E2E2,
dark: #424242
dark: #2a2a2c
),
chat-sidebar-title: (
light: #555655,
dark: white
),
ack-bubble-background: (
light: rgb(229, 229, 234),
dark: rgb(92, 86, 84)
dark: rgb(39, 39, 41)
),
ack-glyph-color: (
light: rgb(124, 124, 124),
dark: rgb(206, 206, 210)
dark: rgb(129, 129, 128)
),
chat-sidebar-description: #808080,
blue-text: #2888F6,
Expand All @@ -61,7 +61,7 @@ $colors: (
light: linear-gradient($transcript-business-chat-gradient-stop, $transcript-business-chat-gradient-start),
dark: linear-gradient($transcript-business-chat-gradient-dark-stop, $transcript-business-chat-gradient-dark-start)
),
heart-active: #E86895,
heart-active: #FA5C99,
ack-active: white,
attachment-background: (
light: #E9E9EB,
Expand All @@ -75,7 +75,7 @@ $colors: (
),
composition-placeholder: (
light: rgba(0, 0, 0, 0.3),
dark: rgba(255, 255, 255, 0.3)
dark: rgba(70, 71, 75, 255)
),
text: (
light: black,
Expand All @@ -87,12 +87,20 @@ $colors: (
),
background: (
light: white,
dark: #1E1E1E
dark: #010001
),
background-secondary: (
light: rgba(0, 0, 0, 0.1),
dark: rgba(255, 255, 255, 0.1)
),
tapback-background: (
light: rgba(255, 255, 255, 1),
dark: rgba(45, 45, 46, 255)
),
to-text: (
light: rgba(0, 0, 0, 0.6),
dark: rgba(157, 157, 157, 1)
),
lp-bottom-caption: rgb(142, 142, 145)
);

Expand Down
2 changes: 1 addition & 1 deletion src/styles/_context-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

.react-contexify__item__content {
padding: 4px 6px;
color: white !important;
color: var(--not-from-me-text) !important;
}
}
}
5 changes: 2 additions & 3 deletions src/styles/ack-picker/AcknowledgmentPicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
width: 200px;
column-gap: 5px;

background: white;

background: var(--tapback-background);
border-radius: 25px;

padding: 2.5px 7.5px;
Expand All @@ -39,7 +38,7 @@
}

&::before {
background-color: white;
background-color: var(--tapback-background);
}

&[attr-selected=true] {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/toolbar/_transcript-toolbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

&::before {
content: 'To: ';
color: rgba(0, 0, 0, 0.6);
color: var(--to-text);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/styles/transcript/AcknowledgmentPickerPresenter.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ $acknowledgment-button-initial: scale(1, 1) translate(75px, -100px);
top: 0;
left: 0;

background: white;
background: var(--tapback-background);
border-radius: 25px;

width: 100px;
Expand Down
2 changes: 1 addition & 1 deletion src/styles/transcript/items/LPRichLink.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
--lp-background-override: var(--dark-lp-background-override);
}

background-color: var(--lp-background-override, rgb(229, 230, 233));
background-color: var(--lp-background-override, var(--not-from-me));

max-width: 300px;

Expand Down