Skip to content
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

Jump to bottom

CSS for decorated matrix.to links in the composer #4583

Merged
merged 4 commits into from
Jul 14, 2017
Merged

CSS for decorated matrix.to links in the composer #4583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38899c6
CSS for decorated matrix.to links in the composer
Jul 14, 2017
de0fd58
Add $rte-room-pill-color: #aaa
Jul 14, 2017
18a6ee5
white -> #fff
Jul 14, 2017
a1b4b99
Use $accent-fg-color instead of #fff
Jul 14, 2017
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
16 changes: 10 additions & 6 deletions src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,21 @@
// --Matthew

.mx_UserPill {
color: white;
color: $accent-fg-color;
background-color: $accent-color;
padding: 2px 8px;
padding: 1px 5px 0px 2px;
border-radius: 16px;
}

.mx_UserPill img, .mx_RoomPill img {
vertical-align: -2px;
margin-right: 1px
}

.mx_RoomPill {
background-color: white;
color: $accent-color;
border: 1px solid $accent-color;
padding: 2px 8px;
background-color: $rte-room-pill-color;
color: $accent-fg-color;
padding: 1px 5px 0px 2px;
border-radius: 16px;
}

Expand Down
5 changes: 5 additions & 0 deletions src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ limitations under the License.
word-break: break-word;
}

.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
/* Ensure mx_UserPill and mx_RoomPill (see _RichText) are not obscured from the top */
padding-top: 2px;
}

.mx_MessageComposer_input blockquote {
color: $blockquote-fg-color;
margin: 0 0 16px;
Expand Down
1 change: 1 addition & 0 deletions src/skins/vector/css/themes/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ $voip-accept-color: #80f480;

$rte-bg-color: #e9e9e9;
$rte-code-bg-color: rgba(0, 0, 0, 0.04);
$rte-room-pill-color: #aaa;

// ********************

Expand Down