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

[IMPROVE] User mentions #11001

Merged
merged 12 commits into from Jun 12, 2018
Merged

[IMPROVE] User mentions #11001

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cd2e02a
Nice mentions
vynmera Jun 4, 2018
1bfb579
Merge branch 'develop' into nice-mentions
vynmera Jun 4, 2018
e2d586c
Merge branch 'develop' into nice-mentions
vynmera Jun 4, 2018
70bd275
Merge branch 'develop' into nice-mentions
vynmera Jun 5, 2018
b7b0741
Merge branch 'develop' into nice-mentions
vynmera Jun 5, 2018
49f2e50
Merge branch 'develop' into nice-mentions
vynmera Jun 5, 2018
afe4e68
Merge branch 'develop' into nice-mentions
vynmera Jun 7, 2018
2a0f056
Merge branch 'develop' into nice-mentions
vynmera Jun 9, 2018
5d451d4
Merge branch 'develop' into nice-mentions
vynmera Jun 12, 2018
c4abc67
Merge remote-tracking branch 'origin/develop' into pr/11001-vynmera-n…
ggazzo Jun 12, 2018
ad805b1
style fix
ggazzo Jun 12, 2018
9e6ded6
Merge branch 'nice-mentions' of github.com:vynmera/Rocket.Chat into p…
ggazzo Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/rocketchat-theme/client/imports/general/base_old.css
View file
Open in desktop
Expand Up @@ -4790,11 +4790,10 @@ body:not(.is-cordova) {

.rc-old .mention-link {
border-radius: 4px;
padding: 0 4px 2px;

&.mention-link-me,
&.mention-link-all {
padding: 0 4px 2px;

font-weight: bold;
}
}
Expand Down
4 changes: 4 additions & 0 deletions packages/rocketchat-theme/server/colors.less
View file
Open in desktop
Expand Up @@ -598,6 +598,10 @@ input:-webkit-autofill {
}

.mention-link {
&:not(.mention-link-me):not(.mention-link-all) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@karlprieb @ggazzo do we need this? or till the more specific selector class="mention-link mention-link-me" already overwrite the background colour?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just tried it, doesn't work :(
2018-06-12_20-01-55

background-color: fade(@rc-color-button-primary, 20%);
}

&.mention-link-me {
color: @primary-action-contrast;
}
Expand Down