Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Commits on Source (2)
(fix): Change blocked user's content on remind notice (
#1325
)
· b80660fb
Emiliano Balbuena
authored
May 23, 2019
and
Mark Harding
committed
May 23, 2019
b80660fb
Merge branch 'sprint/FunnyFrog.remind-message' into 'master'
· 6a385887
Mark Harding
authored
May 23, 2019
(fix): Change blocked user's content on remind notice (
#1325
) See merge request
!315
6a385887
Hide whitespace changes
Inline
Side-by-side
src/app/modules/legacy/components/cards/activity/activity.component.scss
View file @
6a385887
...
...
@@ -138,7 +138,7 @@ minds-groups-profile-feed .m-pin-button {
.m-activity__blockedRemind
{
margin
:
0
16px
;
border-radius
:
6px
;
padding
:
8
px
;
padding
:
16
px
;
font-size
:
14px
;
line-height
:
1
.5
;
text-align
:
center
;
...
...
@@ -147,16 +147,11 @@ minds-groups-profile-feed .m-pin-button {
background-color
:
rgba
(
themed
(
$m-grey-50
)
,
0
.7
);
}
.m-activityBlockedRemind__title
,
.m-activityBlockedRemind__description
{
opacity
:
0
.75
;
}
.m-activityBlockedRemind__title
{
font-weight
:
600
;
}
.m-activityBlockedRemind__description
{
font-size
:
13px
;
a
{
text-decoration
:
none
;
}
}
}
src/app/modules/legacy/components/cards/activity/activity.html
View file @
6a385887
...
...
@@ -192,8 +192,9 @@
</ng-container>
<ng-template
#blockedRemindTemplate
>
<div
class=
"m-activity__blockedRemind"
>
<div
class=
"m-activityBlockedRemind__title"
i18n
>
This content is unavailable.
</div>
<div
class=
"m-activityBlockedRemind__description"
i18n
>
You have blocked the author of this activity.
</div>
<div
class=
"m-activityBlockedRemind__description"
i18n
>
This remind is not available because you blocked
<a
target=
"_blank"
[routerLink]=
"['/', activity.remind_object.ownerObj.username]"
>
@{{activity.remind_object.ownerObj.username}}
</a>
.
</div>
</div>
</ng-template>
</div>
...
...