Skip to content
This repository was archived by the owner on Mar 28, 2018. It is now read-only.

Commit 8e63771

Browse files
edgebalmarkharding
authored andcommitted
[Sprint/Caesar] March 17th hotfixes (#15)
* (feat): Render comments rich embeds * (feat): Add Messenger help text * (fix): Fix discovery channel cards text on small screens
1 parent 6809a7d commit 8e63771

File tree

5 files changed

+76
-0
lines changed

5 files changed

+76
-0
lines changed

src/app/modules/comments/list.component.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,18 @@
4141
<div class="m-ionic-comments--comment">
4242
<p allow-text-select [innerHtml]="comment.description | tags"></p>
4343

44+
<!-- Rich content -->
45+
<div class="m-ionic-comments--rich-embed"
46+
*ngIf="comment.perma_url && comment.title"
47+
(click)="openInBrowser(comment.perma_url)"
48+
>
49+
<img [src]="comment.thumbnail_src" (error)="comment.thumbnail_src = null" *ngIf="comment.thumbnail_src">
50+
<div class="m-ionic-comments--rich-embed-meta">
51+
<h3>{{comment.title}}</h3>
52+
<p>{{comment.perma_url | domain }}</p>
53+
</div>
54+
</div>
55+
4456
<!-- Images -->
4557
<div class="m-ionic-image allow-select"
4658
*ngIf="comment.thumbnail_src && !comment.perma_url">

src/app/modules/comments/list.component.scss

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,44 @@
6666
}
6767
}
6868
}
69+
70+
.m-ionic-comments--rich-embed{
71+
margin: 0 16px;
72+
border: 1px solid #eeeeee;
73+
padding: 8px;
74+
75+
img{
76+
width: 25%;
77+
height: 100%;
78+
min-width: 25%;
79+
max-width: 100%;
80+
max-height: 120px;
81+
float: left;
82+
}
83+
84+
.m-ionic-comments--rich-embed-meta {
85+
margin-left: 25%;
86+
padding: 0 8px;
87+
}
88+
89+
h3{
90+
font-size:16px;
91+
margin: 0 0 8px;
92+
padding: 0;
93+
}
94+
95+
p{
96+
margin: 0;
97+
padding: 0;
98+
color:#888;
99+
}
100+
101+
&:before,
102+
&:after {
103+
content: " ";
104+
display: table;
105+
}
106+
&:after {
107+
clear: both;
108+
}
109+
}

src/app/modules/discovery/discovery.component.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@
9292
font-size: 12px;
9393
letter-spacing: 0.5px;
9494

95+
@media only screen and (max-device-width: 320px) {
96+
font-size: 11px;
97+
letter-spacing: 0.2px;
98+
}
99+
95100
label{
96101
font-weight: 500;
97102
}

src/app/modules/messenger/setup.component.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,10 @@
3030

3131
</div>
3232

33+
<div class="m-ionic-messenger--setup-info">
34+
<p>You only need to enter this encryption password once as long as you stay signed in.</p>
35+
<p>It is important so that no one other than you and the people you are communicating with can access the content of your messages.</p>
36+
<p>By default the content of your messages is fully encrypted. For heightened security you may wish to go to your app settings and turn off push notifications in order to disallow metadata from being tracked.</p>
37+
</div>
3338

3439
</ion-content>

src/app/modules/messenger/setup.component.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,16 @@
2222
box-shadow: none;
2323
}
2424
}
25+
26+
.m-ionic-messenger--setup-info {
27+
padding: 16px;
28+
29+
p {
30+
font-size: 12px;
31+
color: #666;
32+
33+
&:before {
34+
content: '\2022\00a0';
35+
}
36+
}
37+
}

0 commit comments

Comments
 (0)