ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-06 06:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into fix/bubble-highlight/18295

Browse Source
This commit is contained in:
Šimon Brandner
2021-08-26 15:40:40 +02:00
parent d43eac7722 9aadb7c487
commit e8bf7ac227
282 changed files with 9463 additions and 4137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/views/rooms/_AppsDrawer.scss
+2 -2
View File
@@ -64,7 +64,7 @@ $MiniAppTileHeight: 200px;
&:hover {
.mx_AppsContainer_resizerHandle::after {
opacity: 0.8;
background: $primary-fg-color;
background: $primary-content;
}
.mx_ResizeHandle_horizontal::before {
@@ -79,7 +79,7 @@ $MiniAppTileHeight: 200px;
content: '';
background-color: $primary-fg-color;
background-color: $primary-content;
opacity: 0.8;
}
}
res/css/views/rooms/_Autocomplete.scss
+11 -10
View File
@@ -4,27 +4,29 @@
z-index: 1001;
width: 100%;
border: 1px solid $primary-hairline-color;
background: $primary-bg-color;
background: $background;
border-bottom: none;
border-radius: 8px 8px 0 0;
max-height: 50vh;
overflow: auto;
max-height: 35vh;
overflow: clip;
display: flex;
box-shadow: 0px -16px 32px $composer-shadow-color;
}
.mx_Autocomplete_ProviderSection {
border-bottom: 1px solid $primary-hairline-color;
width: 100%;
}
/* a "block" completion takes up a whole line */
.mx_Autocomplete_Completion_block {
height: 34px;
min-height: 34px;
display: flex;
padding: 0 12px;
user-select: none;
cursor: pointer;
align-items: center;
color: $primary-fg-color;
color: $primary-content;
}
.mx_Autocomplete_Completion_block * {
@@ -40,7 +42,7 @@
user-select: none;
cursor: pointer;
align-items: center;
color: $primary-fg-color;
color: $primary-content;
}
.mx_Autocomplete_Completion_pill > * {
@@ -59,8 +61,8 @@
.mx_Autocomplete_Completion_container_pill {
margin: 12px;
display: flex;
flex-flow: wrap;
height: 100%;
overflow-y: scroll;
}
.mx_Autocomplete_Completion_container_truncate {
@@ -68,7 +70,6 @@
.mx_Autocomplete_Completion_subtitle,
.mx_Autocomplete_Completion_description {
/* Ellipsis for long names/subtitles/descriptions */
max-width: 150px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -83,7 +84,7 @@
.mx_Autocomplete_provider_name {
margin: 12px;
color: $primary-fg-color;
color: $primary-content;
font-weight: 400;
opacity: 0.4;
}
res/css/views/rooms/_BasicMessageComposer.scss
+9 -1
View File
@@ -31,7 +31,7 @@ limitations under the License.
@keyframes visualbell {
from { background-color: $visual-bell-bg-color; }
to { background-color: $primary-bg-color; }
to { background-color: $background; }
}
&.mx_BasicMessageComposer_input_error {
@@ -65,6 +65,14 @@ limitations under the License.
font-size: $font-10-4px;
}
}
span.mx_UserPill {
cursor: pointer;
}
span.mx_RoomPill {
cursor: default;
}
}
&.mx_BasicMessageComposer_input_disabled {
res/css/views/rooms/_EditMessageComposer.scss
+1 -1
View File
@@ -28,7 +28,7 @@ limitations under the License.
.mx_BasicMessageComposer_input {
border-radius: 4px;
border: solid 1px $primary-hairline-color;
background-color: $primary-bg-color;
background-color: $background;
max-height: 200px;
padding: 3px 6px;
res/css/views/rooms/_EntityTile.scss
+3 -3
View File
@@ -18,7 +18,7 @@ limitations under the License.
.mx_EntityTile {
display: flex;
align-items: center;
color: $primary-fg-color;
color: $primary-content;
cursor: pointer;
.mx_E2EIcon {
@@ -86,12 +86,12 @@ limitations under the License.
.mx_EntityTile_ellipsis .mx_EntityTile_name {
font-style: italic;
color: $primary-fg-color;
color: $primary-content;
}
.mx_EntityTile_invitePlaceholder .mx_EntityTile_name {
font-style: italic;
color: $primary-fg-color;
color: $primary-content;
}
.mx_EntityTile_unavailable .mx_EntityTile_avatar,
res/css/views/rooms/_EventBubbleTile.scss
+3 -7
View File
@@ -109,6 +109,8 @@ limitations under the License.
.mx_ReplyTile .mx_SenderProfile {
display: block;
top: unset;
left: unset;
}
.mx_ReactionsRow {
@@ -192,8 +194,6 @@ limitations under the License.
}
.mx_ReplyThread {
margin: 0 calc(-1 * var(--gutterSize));
.mx_EventTile_reply {
max-width: 90%;
padding: 0;
@@ -227,11 +227,6 @@ limitations under the License.
margin-left: -9px;
}
.mx_ReplyThread {
border-left-width: 2px;
border-left-color: $eventbubble-reply-color;
}
/* Special layout scenario for "Unable To Decrypt (UTD)" events */
&.mx_EventTile_bad > .mx_EventTile_line {
display: grid;
@@ -268,6 +263,7 @@ limitations under the License.
}
.mx_EventTile.mx_EventTile_bubbleContainer[data-layout=bubble],
.mx_EventTile.mx_EventTile_leftAlignedBubble[data-layout=bubble],
.mx_EventTile.mx_EventTile_info[data-layout=bubble],
.mx_EventListSummary[data-layout=bubble][data-expanded=false] {
--backgroundColor: transparent;
res/css/views/rooms/_EventTile.scss
+9 -5
View File
@@ -55,7 +55,7 @@ $hover-select-border: 4px;
}
.mx_SenderProfile {
color: $primary-fg-color;
color: $primary-content;
font-size: $font-14px;
display: inline-block; /* anti-zalgo, with overflow hidden */
overflow: hidden;
@@ -161,7 +161,7 @@ $hover-select-border: 4px;
// up with the other read receipts
&::before {
background-color: $tertiary-fg-color;
background-color: $tertiary-content;
mask-repeat: no-repeat;
mask-position: center;
mask-size: 14px;
@@ -480,7 +480,7 @@ $hover-select-border: 4px;
}
pre code > * {
display: inline-block;
display: inline;
}
pre {
@@ -489,6 +489,10 @@ $hover-select-border: 4px;
// https://github.com/vector-im/vector-web/issues/754
overflow-x: overlay;
overflow-y: visible;
&::-webkit-scrollbar-corner {
background: transparent;
}
}
}
@@ -510,7 +514,7 @@ $hover-select-border: 4px;
.mx_EventTile:hover .mx_EventTile_body pre,
.mx_EventTile.focus-visible:focus-within .mx_EventTile_body pre {
border: 1px solid #e5e5e5; // deliberate constant as we're behind an invert filter
border: 1px solid $tertiary-content;
}
.mx_EventTile_pre_container {
@@ -614,7 +618,7 @@ $hover-select-border: 4px;
}
.mx_EventTile_keyRequestInfo_text a {
color: $primary-fg-color;
color: $primary-content;
text-decoration: underline;
cursor: pointer;
}
res/css/views/rooms/_JumpToBottomButton.scss
+1 -1
View File
@@ -56,7 +56,7 @@ limitations under the License.
height: 38px;
border-radius: 19px;
box-sizing: border-box;
background: $primary-bg-color;
background: $background;
border: 1.3px solid $muted-fg-color;
cursor: pointer;
}
res/css/views/rooms/_MemberInfo.scss
+1 -1
View File
@@ -111,7 +111,7 @@ limitations under the License.
.mx_MemberInfo_field {
cursor: pointer;
font-size: $font-15px;
color: $primary-fg-color;
color: $primary-content;
margin-left: 8px;
line-height: $font-23px;
}
res/css/views/rooms/_MessageComposer.scss
+3 -3
View File
@@ -130,7 +130,7 @@ limitations under the License.
@keyframes visualbell {
from { background-color: $visual-bell-bg-color; }
to { background-color: $primary-bg-color; }
to { background-color: $background; }
}
.mx_MessageComposer_input_error {
@@ -160,8 +160,8 @@ limitations under the License.
resize: none;
outline: none;
box-shadow: none;
color: $primary-fg-color;
background-color: $primary-bg-color;
color: $primary-content;
background-color: $background;
font-size: $font-14px;
max-height: 120px;
overflow: auto;
res/css/views/rooms/_NewRoomIntro.scss
+1 -1
View File
@@ -67,6 +67,6 @@ limitations under the License.
> p {
margin: 0;
font-size: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
res/css/views/rooms/_NotificationBadge.scss
+1 -1
View File
@@ -42,7 +42,7 @@ limitations under the License.
// These are the 3 background types
&.mx_NotificationBadge_dot {
background-color: $primary-fg-color; // increased visibility
background-color: $primary-content; // increased visibility
width: 6px;
height: 6px;
res/css/views/rooms/_PinnedEventTile.scss
+2 -2
View File
@@ -67,7 +67,7 @@ limitations under the License.
//left: 0;
height: inherit;
width: inherit;
background: $secondary-fg-color;
background: $secondary-content;
mask-position: center;
mask-size: 8px;
mask-repeat: no-repeat;
@@ -87,7 +87,7 @@ limitations under the License.
.mx_PinnedEventTile_timestamp {
font-size: inherit;
line-height: inherit;
color: $secondary-fg-color;
color: $secondary-content;
}
.mx_AccessibleButton_kind_link {
res/css/views/rooms/_ReplyPreview.scss
+2 -2
View File
@@ -16,7 +16,7 @@ limitations under the License.
.mx_ReplyPreview {
border: 1px solid $primary-hairline-color;
background: $primary-bg-color;
background: $background;
border-bottom: none;
border-radius: 8px 8px 0 0;
max-height: 50vh;
@@ -28,7 +28,7 @@ limitations under the License.
.mx_ReplyPreview_header {
margin: 8px;
color: $primary-fg-color;
color: $primary-content;
font-weight: 400;
opacity: 0.4;
}
res/css/views/rooms/_ReplyTile.scss
+1 -1
View File
@@ -42,7 +42,7 @@ limitations under the License.
display: flex;
flex-direction: column;
text-decoration: none;
color: $primary-fg-color;
color: $primary-content;
}
.mx_RedactedBody {
res/css/views/rooms/_RoomHeader.scss
+2 -2
View File
@@ -17,7 +17,7 @@ limitations under the License.
.mx_RoomHeader {
flex: 0 0 50px;
border-bottom: 1px solid $primary-hairline-color;
background-color: $roomheader-bg-color;
background-color: $background;
.mx_RoomHeader_e2eIcon {
height: 12px;
@@ -74,7 +74,7 @@ limitations under the License.
.mx_RoomHeader_buttons {
display: flex;
background-color: $primary-bg-color;
background-color: $background;
}
.mx_RoomHeader_info {
res/css/views/rooms/_RoomList.scss
+3 -3
View File
@@ -43,11 +43,11 @@ limitations under the License.
div:first-child {
font-weight: $font-semi-bold;
line-height: $font-18px;
color: $primary-fg-color;
color: $primary-content;
}
.mx_AccessibleButton {
color: $primary-fg-color;
color: $primary-content;
position: relative;
padding: 8px 8px 8px 32px;
font-size: inherit;
@@ -64,7 +64,7 @@ limitations under the License.
position: absolute;
top: 8px;
left: 8px;
background: $secondary-fg-color;
background: $secondary-content;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
res/css/views/rooms/_RoomSublist.scss
+1 -1
View File
@@ -233,7 +233,7 @@ limitations under the License.
&:hover, &.mx_RoomSublist_hasMenuOpen {
.mx_RoomSublist_resizerHandle {
opacity: 0.8;
background-color: $primary-fg-color;
background-color: $primary-content;
}
}
}
res/css/views/rooms/_RoomTile.scss
+1 -1
View File
@@ -124,7 +124,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $primary-fg-color;
background: $primary-content;
}
}
res/css/views/rooms/_SearchBar.scss
+1 -1
View File
@@ -47,7 +47,7 @@ limitations under the License.
padding: 5px;
font-size: $font-15px;
cursor: pointer;
color: $primary-fg-color;
color: $primary-content;
border-bottom: 2px solid $accent-color;
font-weight: 600;
}
res/css/views/rooms/_TopUnreadMessagesBar.scss
+2 -2
View File
@@ -41,7 +41,7 @@ limitations under the License.
height: 38px;
border-radius: 19px;
box-sizing: border-box;
background: $primary-bg-color;
background: $background;
border: 1.3px solid $muted-fg-color;
cursor: pointer;
}
@@ -62,7 +62,7 @@ limitations under the License.
display: block;
width: 18px;
height: 18px;
background: $primary-bg-color;
background: $background;
border: 1.3px solid $muted-fg-color;
border-radius: 10px;
margin: 5px auto;
res/css/views/rooms/_VoiceRecordComposerTile.scss
+1 -1
View File
@@ -48,7 +48,7 @@ limitations under the License.
.mx_VoiceRecordComposerTile_uploadingState {
margin-right: 10px;
color: $secondary-fg-color;
color: $secondary-content;
}
.mx_VoiceRecordComposerTile_failedState {
res/css/views/rooms/_WhoIsTypingTile.scss
+2 -2
View File
@@ -36,7 +36,7 @@ limitations under the License.
}
.mx_WhoIsTypingTile_avatars .mx_BaseAvatar {
border: 1px solid $primary-bg-color;
border: 1px solid $background;
border-radius: 40px;
}
@@ -45,7 +45,7 @@ limitations under the License.
display: inline-block;
color: #acacac;
background-color: #ddd;
border: 1px solid $primary-bg-color;
border: 1px solid $background;
border-radius: 40px;
width: 24px;
height: 24px;