From 07b6e215a13dbdb12ce63e139dafc2079757e693 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 18 Aug 2017 11:24:52 +0100 Subject: [PATCH] CSS for group invite tiles --- src/skins/vector/css/_components.scss | 1 + .../views/groups/_GroupInviteTile.scss | 74 +++++++++++++++++++ src/skins/vector/css/themes/_base.scss | 2 + 3 files changed, 77 insertions(+) create mode 100644 src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss index 00c19b13da..3493336ab8 100644 --- a/src/skins/vector/css/_components.scss +++ b/src/skins/vector/css/_components.scss @@ -32,6 +32,7 @@ @import "./matrix-react-sdk/views/elements/_ProgressBar.scss"; @import "./matrix-react-sdk/views/elements/_RichText.scss"; @import "./matrix-react-sdk/views/elements/_RoleButton.scss"; +@import "./matrix-react-sdk/views/groups/_GroupInviteTile.scss"; @import "./matrix-react-sdk/views/login/_InteractiveAuthEntryComponents.scss"; @import "./matrix-react-sdk/views/login/_ServerConfig.scss"; @import "./matrix-react-sdk/views/messages/_MEmoteBody.scss"; diff --git a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss new file mode 100644 index 0000000000..6b4034b9aa --- /dev/null +++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss @@ -0,0 +1,74 @@ +/* +Copyright 2017 New Vector Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_GroupInviteTile { + position: relative; + cursor: pointer; + font-size: 13px; + display: block; + height: 34px; +} + +.mx_GroupInviteTile_nameContainer { + display: inline-block; + width: 180px; + height: 24px; +} + +.mx_GroupInviteTile_avatarContainer { + display: inline-block; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 16px; + padding-right: 6px; + width: 24px; + height: 24px; + vertical-align: middle; +} + +.mx_GroupInviteTile_name { + display: inline-block; + position: relative; + width: 165px; + vertical-align: middle; + padding-left: 6px; + padding-right: 6px; + padding-top: 2px; + padding-bottom: 3px; + color: $roomtile-name-color; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.mx_GroupInviteTile_badge { + display: inline-block; + min-width: 15px; + height: 15px; + position: absolute; + right: 8px; /*gutter */ + top: 9px; + border-radius: 8px; + color: $accent-fg-color; + background-color: $group-alert-color; + font-weight: 600; + font-size: 10px; + text-align: center; + padding-top: 1px; + padding-left: 4px; + padding-right: 4px; +} + diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss index 6f613e38f8..a13c517bd0 100644 --- a/src/skins/vector/css/themes/_base.scss +++ b/src/skins/vector/css/themes/_base.scss @@ -22,6 +22,8 @@ $warning-color: #ff0064; $mention-user-pill-bg-color: #ff0064; $other-user-pill-bg-color: rgba(0, 0, 0, 0.1); +$group-alert-color: #774f7e; + $preview-bar-bg-color: #f7f7f7; // left-panel style muted accent color