IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: User card @mentions looked pretty bad

Browse Source
This commit is contained in:
Robin Ward 2014-11-04 14:25:35 -05:00
parent 9161b8529f
commit 74e2b8f674
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/templates/user/user.hbs
View File

@ -94,11 +94,11 @@
{{#if websiteName}} {{#if websiteName}}
<i class="fa fa-globe"></i> <i class="fa fa-globe"></i>
{{#if linkWebsite}} {{#if linkWebsite}}
<a {{bind-attr href="website"}} rel="nofollow" target="_blank">{{websiteName}}</a> <a {{bind-attr href="website"}} rel="nofollow" target="_blank">{{websiteName}}</a>
{{else}} {{else}}
<span {{bind-attr title="website"}}>{{websiteName}}</span> <span {{bind-attr title="website"}}>{{websiteName}}</span>
{{/if}} {{/if}}
{{/if}} {{/if}}
</h3> </h3>

10
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -614,11 +614,11 @@ iframe {
position: relative; position: relative;
} }
a.mention { a.mention {
padding: 2px 4px; padding: 2px 4px;
color: $primary; color: $primary;
background: scale-color-diff(); background: scale-color-diff();
} }
.modal-body { .modal-body {

3
app/assets/stylesheets/desktop/user-card.scss
View File

@ -127,6 +127,9 @@
max-width: 100%; max-width: 100%;
} }
a.mention {
background-color: dark-light-diff($secondary, $primary, 50%, -60%);
}
.overflow { .overflow {
max-height: 60px; max-height: 60px;
overflow: hidden; overflow: hidden;

4
app/assets/stylesheets/desktop/user.scss
View File

@ -292,6 +292,10 @@
overflow: auto; overflow: auto;
max-width: 750px; max-width: 750px;
a.mention {
background-color: dark-light-diff($secondary, $primary, 50%, -60%);
}
a[href] { a[href] {
color: dark-light-diff($secondary, $primary, 75%, 0%); color: dark-light-diff($secondary, $primary, 75%, 0%);
text-decoration: underline; text-decoration: underline;