Skip to content

Commit

Permalink
Fix minor UI issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@indutny-signal
indutny-signal committed Jun 13, 2022
1 parent 0b41215 commit f2af71f
Show file tree
Hide file tree
Showing 14 changed files with 216 additions and 174 deletions.
2 changes: 1 addition & 1 deletion _locales/en/messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,7 @@
"description": "Label for the time a message was received"
},
"sendMessage": {
"message": "Send a message",
"message": "Message",
"description": "Placeholder text in the message entry field"
},
"groupMembers": {
Expand Down
1 change: 1 addition & 0 deletions images/icons/v2/chevron-down-20.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/icons/v2/phone-outline-24.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
95 changes: 24 additions & 71 deletions stylesheets/_modules.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3950,7 +3950,7 @@ button.module-image__border-overlay:focus {
&__button {
&::before {
@include color-svg(
'../images/icons/v2/arrow-down-24.svg',
'../images/icons/v2/chevron-down-24.svg',
$color-white
);

Expand Down Expand Up @@ -6181,15 +6181,14 @@ button.module-image__border-overlay:focus {
background: none;
width: 32px;
height: 32px;
border-radius: 16px;
display: flex;
justify-content: center;
align-items: center;
opacity: 0.5;

&:focus,
&:hover {
opacity: 1;
@include keyboard-mode {
&:focus {
outline: 1px solid $color-ultramarine;
}
}

outline: none;
Expand All @@ -6209,7 +6208,7 @@ button.module-image__border-overlay:focus {
}
@include dark-theme {
@include color-svg(
'../images/icons/v2/sticker-solid-24.svg',
'../images/icons/v2/sticker-outline-24.svg',
$color-gray-15
);
}
Expand Down Expand Up @@ -6686,15 +6685,14 @@ button.module-image__border-overlay:focus {
background: none;
width: 32px;
height: 32px;
border-radius: 16px;
display: flex;
justify-content: center;
align-items: center;
opacity: 0.5;

&:focus,
&:hover {
opacity: 1;
@include keyboard-mode {
&:focus {
outline: 1px solid $color-ultramarine;
}
}

outline: none;
Expand All @@ -6714,7 +6712,7 @@ button.module-image__border-overlay:focus {
}
@include dark-theme {
@include color-svg(
'../images/icons/v2/emoji-smiley-solid-24.svg',
'../images/icons/v2/emoji-smiley-outline-24.svg',
$color-gray-15
);
}
Expand Down Expand Up @@ -6796,6 +6794,7 @@ button.module-image__border-overlay:focus {
padding: 0;
text-align: start;
white-space: break-spaces;
line-height: inherit;

&--loaded {
caret-color: auto;
Expand Down Expand Up @@ -6830,36 +6829,41 @@ button.module-image__border-overlay:focus {
}

&__input {
border: none;
border-radius: 18px;
overflow: hidden;
word-break: break-word;

// Override Quill styles
.ql-container {
@include font-body-1;
line-height: 21px;
font-size: 15px;
}

.ql-blank::before {
color: $color-gray-45;
@include light-theme() {
color: $color-gray-45;
}

@include dark-theme() {
color: $color-gray-25;
}
}

@include light-theme() {
// Same as background color
border: 1px solid $color-white;
background-color: $color-gray-05;
color: $color-gray-90;
}

@include dark-theme() {
// Same as background color
border: 1px solid $color-gray-95;
background-color: $color-gray-75;
color: $color-gray-05;
}

&__scroller {
padding: 7px 12px;
padding: 5px 11px 6px 11px;
min-height: 32px;
max-height: 80px;
overflow: auto;
Expand All @@ -6885,11 +6889,11 @@ button.module-image__border-overlay:focus {

&:focus-within {
@include light-theme() {
border: 1px solid $color-ultramarine;
outline: 1px solid $color-ultramarine;
}

@include dark-theme() {
border: 1px solid $color-ultramarine;
outline: 1px solid $color-ultramarine;
}
}
}
Expand Down Expand Up @@ -7000,57 +7004,6 @@ button.module-image__border-overlay:focus {
}
}

// Module: Scroll Down Button

.module-scroll-down {
z-index: $z-index-scroll-down-button;
position: absolute;
right: 20px;
bottom: 10px;
}

.module-scroll-down__button {
height: 44px;
width: 44px;
border-radius: 22px;
text-align: center;
border: none;
outline: none;

@include light-theme {
background-color: $color-gray-25;
&:hover {
background-color: $color-gray-45;
}

box-shadow: 0px 3px 5px 0px $color-black-alpha-20;
}
@include dark-theme {
background-color: $color-gray-45;
&:hover {
background-color: $color-gray-25;
}

box-shadow: 0px 3px 5px 0px $color-white-alpha-20;
}
}

.module-scroll-down__button--new-messages {
background-color: $color-ultramarine;

&:hover {
background-color: $color-ultramarine-dark;
}
}

.module-scroll-down__icon {
@include color-svg('../images/icons/v2/arrow-down-24.svg', $color-white);
height: 36px;
width: 36px;
margin-left: -3px;
margin-top: -1px;
}

// Module: Avatar Popup

.module-avatar-popup {
Expand Down
1 change: 1 addition & 0 deletions stylesheets/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ $color-black-alpha-08: rgba($color-black, 0.08);
$color-black-alpha-12: rgba($color-black, 0.12);
$color-black-alpha-16: rgba($color-black, 0.16);
$color-black-alpha-20: rgba($color-black, 0.2);
$color-black-alpha-24: rgba($color-black, 0.24);
$color-black-alpha-30: rgba($color-black, 0.3);
$color-black-alpha-40: rgba($color-black, 0.4);
$color-black-alpha-50: rgba($color-black, 0.5);
Expand Down
14 changes: 8 additions & 6 deletions stylesheets/components/AudioCapture.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,23 @@
justify-content: center;
align-items: center;
background: none;
padding: 0 5px;

&__microphone {
height: 32px;
width: 32px;
text-align: center;
opacity: 0.5;
background: none;
display: flex;
align-items: center;
justify-content: center;

padding: 0;
border: none;

&:focus,
&:hover {
opacity: 1;
@include keyboard-mode {
&:focus {
outline: 1px solid $color-ultramarine;
}
}

outline: none;
Expand All @@ -41,7 +43,7 @@
}
@include dark-theme {
@include color-svg(
'../images/icons/v2/mic-solid-24.svg',
'../images/icons/v2/mic-outline-24.svg',
$color-gray-15
);
}
Expand Down
38 changes: 21 additions & 17 deletions stylesheets/components/CompositionArea.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
&__row {
display: flex;
flex-direction: row;
align-items: center;

&--center {
justify-content: center;
}
Expand All @@ -31,28 +33,22 @@
}

&__button-cell {
margin-top: 2px;
margin: 0 6px;
display: flex;
justify-content: center;
align-items: center;
width: 40px;
height: 100%;
flex-shrink: 0;
&--mic-active {
width: 150px;
}
&--large-right {
margin-left: auto;
margin-right: 4px;

&:first-child {
margin-left: 12px;
}
&--large-right-mic-active {
margin-left: auto;

&:last-child {
margin-right: 12px;
}
}
&__send-button {
width: 32px;
height: 32px;
display: flex;
justify-content: center;
align-items: center;
Expand All @@ -69,14 +65,19 @@
}
&__input {
flex-grow: 1;
margin: 0 6px;

&--large {
margin: 0;
}
}
$comp-area: &;
&__toggle-large {
width: 48px;
height: 24px;
position: absolute;
left: calc(50% - 24px);
top: -18px;
top: -19px;
border-radius: 12px 12px 0 0;
pointer-events: none;

Expand Down Expand Up @@ -188,13 +189,16 @@
width: 32px;
height: 32px;
padding: 0;
opacity: 0.5;
border: none;
background: transparent;
display: flex;
align-items: center;
justify-content: center;

&:focus,
&:hover {
opacity: 1;
@include keyboard-mode {
&:focus {
outline: 1px solid $color-ultramarine;
}
}

outline: none;
Expand Down

0 comments on commit f2af71f

Please sign in to comment.