PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Apply border-radius onto linear gradient in bubble layout (#7536)

Browse source
This commit is contained in:
Michael Telatynski 2022-01-13 16:42:32 +00:00 committed by GitHub
parent 3eb5130cda
commit 6d9d9a56b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
res/css/views/rooms/_EventBubbleTile.scss
View file

@ -117,7 +117,9 @@ limitations under the License.
.mx_EventTile_line { .mx_EventTile_line {
border-bottom-right-radius: var(--cornerRadius); border-bottom-right-radius: var(--cornerRadius);
.mx_MImageBody .mx_MImageBody_thumbnail { .mx_MImageBody .mx_MImageBody_thumbnail,
.mx_MImageBody::before,
.mx_MLocationBody_map {
border-bottom-right-radius: var(--cornerRadius); border-bottom-right-radius: var(--cornerRadius);
} }
} }
@ -132,7 +134,9 @@ limitations under the License.
float: right; float: right;
border-bottom-left-radius: var(--cornerRadius); border-bottom-left-radius: var(--cornerRadius);
.mx_MImageBody .mx_MImageBody_thumbnail { .mx_MImageBody .mx_MImageBody_thumbnail,
.mx_MImageBody::before,
.mx_MLocationBody_map {
border-bottom-left-radius: var(--cornerRadius); border-bottom-left-radius: var(--cornerRadius);
} }
} }
@ -231,14 +235,18 @@ limitations under the License.
&.mx_EventTile_continuation[data-self=false] .mx_EventTile_line { &.mx_EventTile_continuation[data-self=false] .mx_EventTile_line {
border-top-left-radius: 0; border-top-left-radius: 0;
.mx_MImageBody .mx_MImageBody_thumbnail, .mx_MLocationBody_map { .mx_MImageBody .mx_MImageBody_thumbnail,
.mx_MImageBody::before,
.mx_MLocationBody_map {
border-top-left-radius: 0; border-top-left-radius: 0;
} }
} }
&.mx_EventTile_lastInSection[data-self=false] .mx_EventTile_line { &.mx_EventTile_lastInSection[data-self=false] .mx_EventTile_line {
border-bottom-left-radius: var(--cornerRadius); border-bottom-left-radius: var(--cornerRadius);
.mx_MImageBody .mx_MImageBody_thumbnail, .mx_MLocationBody_map { .mx_MImageBody .mx_MImageBody_thumbnail,
.mx_MImageBody::before,
.mx_MLocationBody_map {
border-bottom-left-radius: var(--cornerRadius); border-bottom-left-radius: var(--cornerRadius);
} }
} }
@ -246,14 +254,18 @@ limitations under the License.
&.mx_EventTile_continuation[data-self=true] .mx_EventTile_line { &.mx_EventTile_continuation[data-self=true] .mx_EventTile_line {
border-top-right-radius: 0; border-top-right-radius: 0;
.mx_MImageBody .mx_MImageBody_thumbnail, .mx_MLocationBody_map { .mx_MImageBody .mx_MImageBody_thumbnail,
.mx_MImageBody::before,
.mx_MLocationBody_map {
border-top-right-radius: 0; border-top-right-radius: 0;
} }
} }
&.mx_EventTile_lastInSection[data-self=true] .mx_EventTile_line { &.mx_EventTile_lastInSection[data-self=true] .mx_EventTile_line {
border-bottom-right-radius: var(--cornerRadius); border-bottom-right-radius: var(--cornerRadius);
.mx_MImageBody .mx_MImageBody_thumbnail, .mx_MLocationBody_map { .mx_MImageBody .mx_MImageBody_thumbnail,
.mx_MImageBody::before,
.mx_MLocationBody_map {
border-bottom-right-radius: var(--cornerRadius); border-bottom-right-radius: var(--cornerRadius);
} }
} }

5
src/settings/enums/Layout.ts
View file

@ -15,14 +15,9 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import PropTypes from 'prop-types';
/* TODO: This should be later reworked into something more generic */ /* TODO: This should be later reworked into something more generic */
export enum Layout { export enum Layout {
IRC = "irc", IRC = "irc",
Group = "group", Group = "group",
Bubble = "bubble", Bubble = "bubble",
} }
/* We need this because multiple components are still using JavaScript */
export const LayoutPropType = PropTypes.oneOf(Object.values(Layout));