Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit 25d2fa5

Browse files
jjeffryesjjeffryes
committed
fix noOverflow class in wrong place
Closes #1490
1 parent df16038 commit 25d2fa5

File tree

1 file changed

+95
-110
lines changed

1 file changed

+95
-110
lines changed

‎js/templates/userPage.html‎

Lines changed: 95 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -288,55 +288,16 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
288288
<div class="flexCol-4 flex-border border0 userPageSocialAccounts overflowHidden">
289289
<div class="flexRow">
290290
<div class="flexRow borderBottom custCol-border">
291-
<div class="rowItem positionWrapper">
291+
<div class="rowItem positionWrapper noOverflow">
292292
<div class="textOpacity75 fontSize14"><%= polyglot.t('Guid') %></div>
293-
<div class="textSize11px noOverflow">
293+
<div class="textSize11px">
294294
<%= ob.page.profile.guid %>
295295
</div>
296296
</div>
297297
</div>
298298
<div class="flexRow custCol-border">
299-
<div class="rowItem positionWrapper">
299+
<div class="rowItem positionWrapper noOverflow">
300300
<div class="textOpacity75 fontSize14"><%= polyglot.t('Website') %></div>
301-
<div class="noOverflow">
302-
<% if(ob.ownPage) { %>
303-
<a href="#settings/page" class="userPageEditBtn">
304-
<div class="btn btn-txt custCol-secondary fontSize12 js-editPage">
305-
<span class="ion-edit fontSize10 marginRight2 textOpacity1"></span>
306-
<%= polyglot.t('Edit') %>
307-
</div>
308-
</a>
309-
<%}%>
310-
<% if(ob.page.profile.website) { %>
311-
<a href="<%= ob.page.profile.website %>" class="js-externalLink"><%= ob.page.profile.website %></a> <span class="ion-android-open fontSize10"></span>
312-
<%}else{%>
313-
<%= polyglot.t('NotProvided') %>
314-
<%}%>
315-
</div>
316-
</div>
317-
</div>
318-
<div class="flexRow custCol-border">
319-
<div class="rowItem positionWrapper">
320-
<div class="textOpacity75 fontSize14"><%= polyglot.t('Email') %></div>
321-
<div class="noOverflow">
322-
<% if(ob.ownPage) { %>
323-
<a href="#settings/page" class="userPageEditBtn">
324-
<div class="btn btn-txt custCol-secondary fontSize12 js-editPage">
325-
<span class="ion-edit fontSize10 marginRight2 textOpacity1"></span>
326-
<%= polyglot.t('Edit') %>
327-
</div>
328-
</a>
329-
<%}%>
330-
<% if(ob.page.profile.email) { %>
331-
<a href="mailto:<%= ob.page.profile.email %>"><%= ob.page.profile.email %></a> <span class="ion-android-open fontSize10"></span>
332-
<%}else{%>
333-
<%= polyglot.t('NotProvided') %>
334-
<%}%>
335-
</div>
336-
</div>
337-
</div>
338-
<div class="flexRow custCol-border">
339-
<div class="rowItem positionWrapper">
340301
<% if(ob.ownPage) { %>
341302
<a href="#settings/page" class="userPageEditBtn">
342303
<div class="btn btn-txt custCol-secondary fontSize12 js-editPage">
@@ -345,20 +306,16 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
345306
</div>
346307
</a>
347308
<%}%>
348-
<div class="textOpacity75 fontSize14"><%= polyglot.t('Facebook') %></div>
349-
<div class="noOverflow">
350-
<% if(ob.page.profile.social_accounts.facebook && ob.page.profile.social_accounts.facebook.username) { %>
351-
<a href="https://facebook.com/<%= ob.page.profile.social_accounts.facebook.username %>">
352-
<%= ob.page.profile.social_accounts.facebook.username %>
353-
</a> <i class="ion-android-open fontSize10"></i>
354-
<%}else{%>
355-
<%= polyglot.t('NotProvided') %>
356-
<%}%>
357-
</div>
309+
<% if(ob.page.profile.website) { %>
310+
<a href="<%= ob.page.profile.website %>" class="js-externalLink"><%= ob.page.profile.website %></a> <span class="ion-android-open fontSize10"></span>
311+
<%}else{%>
312+
<%= polyglot.t('NotProvided') %>
313+
<%}%>
358314
</div>
359315
</div>
360316
<div class="flexRow custCol-border">
361-
<div class="rowItem positionWrapper">
317+
<div class="rowItem positionWrapper noOverflow">
318+
<div class="textOpacity75 fontSize14"><%= polyglot.t('Email') %></div>
362319
<% if(ob.ownPage) { %>
363320
<a href="#settings/page" class="userPageEditBtn">
364321
<div class="btn btn-txt custCol-secondary fontSize12 js-editPage">
@@ -367,76 +324,104 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
367324
</div>
368325
</a>
369326
<%}%>
370-
<div class="textOpacity75 fontSize14"><%= polyglot.t('Twitter') %></div>
371-
<div class="noOverflow">
372-
<% if(ob.page.profile.social_accounts.twitter && ob.page.profile.social_accounts.twitter.username) { %>
373-
<a href="https://twitter.com/<%= ob.page.profile.social_accounts.twitter.username %>">
374-
<%= ob.page.profile.social_accounts.twitter.username %>
375-
</a> <i class="ion-android-open fontSize10"></i>
376-
<%}else{%>
327+
<% if(ob.page.profile.email) { %>
328+
<a href="mailto:<%= ob.page.profile.email %>"><%= ob.page.profile.email %></a> <span class="ion-android-open fontSize10"></span>
329+
<%}else{%>
330+
<%= polyglot.t('NotProvided') %>
331+
<%}%>
332+
</div>
333+
</div>
334+
<div class="flexRow custCol-border">
335+
<div class="rowItem positionWrapper noOverflow">
336+
<% if(ob.ownPage) { %>
337+
<a href="#settings/page" class="userPageEditBtn">
338+
<div class="btn btn-txt custCol-secondary fontSize12 js-editPage">
339+
<span class="ion-edit fontSize10 marginRight2 textOpacity1"></span>
340+
<%= polyglot.t('Edit') %>
341+
</div>
342+
</a>
343+
<%}%>
344+
<div class="textOpacity75 fontSize14"><%= polyglot.t('Facebook') %></div>
345+
<% if(ob.page.profile.social_accounts.facebook && ob.page.profile.social_accounts.facebook.username) { %>
346+
<a href="https://facebook.com/<%= ob.page.profile.social_accounts.facebook.username %>">
347+
<%= ob.page.profile.social_accounts.facebook.username %>
348+
</a> <i class="ion-android-open fontSize10"></i>
349+
<%}else{%>
377350
<%= polyglot.t('NotProvided') %>
378-
<%}%>
379-
</div>
351+
<%}%>
380352
</div>
381353
</div>
382354
<div class="flexRow custCol-border">
383-
<div class="rowItem positionWrapper">
384-
<% if(ob.ownPage) { %>
385-
<a href="#settings/page" class="userPageEditBtn">
386-
<div class="btn btn-txt custCol-secondary fontSize12 js-editPage">
387-
<span class="ion-edit fontSize10 marginRight2 textOpacity1"></span>
388-
<%= polyglot.t('Edit') %>
389-
</div>
390-
</a>
355+
<div class="rowItem positionWrapper noOverflow">
356+
<% if(ob.ownPage) { %>
357+
<a href="#settings/page" class="userPageEditBtn">
358+
<div class="btn btn-txt custCol-secondary fontSize12 js-editPage">
359+
<span class="ion-edit fontSize10 marginRight2 textOpacity1"></span>
360+
<%= polyglot.t('Edit') %>
361+
</div>
362+
</a>
363+
<%}%>
364+
<div class="textOpacity75 fontSize14"><%= polyglot.t('Twitter') %></div>
365+
<% if(ob.page.profile.social_accounts.twitter && ob.page.profile.social_accounts.twitter.username) { %>
366+
<a href="https://twitter.com/<%= ob.page.profile.social_accounts.twitter.username %>">
367+
<%= ob.page.profile.social_accounts.twitter.username %>
368+
</a> <i class="ion-android-open fontSize10"></i>
369+
<%}else{%>
370+
<%= polyglot.t('NotProvided') %>
371+
<%}%>
372+
</div>
373+
</div>
374+
<div class="flexRow custCol-border">
375+
<div class="rowItem positionWrapper noOverflow">
376+
<% if(ob.ownPage) { %>
377+
<a href="#settings/page" class="userPageEditBtn">
378+
<div class="btn btn-txt custCol-secondary fontSize12 js-editPage">
379+
<span class="ion-edit fontSize10 marginRight2 textOpacity1"></span>
380+
<%= polyglot.t('Edit') %>
381+
</div>
382+
</a>
383+
<%}%>
384+
<div class="textOpacity75 fontSize14"><%= polyglot.t('Instagram') %></div>
385+
<% if(ob.page.profile.social_accounts.instagram && ob.page.profile.social_accounts.instagram.username) { %>
386+
<a href="https://instagram.com/<%= ob.page.profile.social_accounts.instagram.username %>">
387+
<%= ob.page.profile.social_accounts.instagram.username %>
388+
</a> <i class="ion-android-open fontSize10"></i>
389+
<%}else{%>
390+
<%= polyglot.t('NotProvided') %>
391391
<%}%>
392-
<div class="textOpacity75 fontSize14"><%= polyglot.t('Instagram') %></div>
393-
<div class="noOverflow">
394-
<% if(ob.page.profile.social_accounts.instagram && ob.page.profile.social_accounts.instagram.username) { %>
395-
<a href="https://instagram.com/<%= ob.page.profile.social_accounts.instagram.username %>">
396-
<%= ob.page.profile.social_accounts.instagram.username %>
397-
</a> <i class="ion-android-open fontSize10"></i>
398-
<%}else{%>
399-
<%= polyglot.t('NotProvided') %>
400-
<%}%>
401-
</div>
402392
</div>
403393
</div>
404394
<div class="flexRow custCol-border">
405-
<div class="rowItem positionWrapper">
406-
<% if(ob.ownPage) { %>
407-
<a href="#settings/page" class="userPageEditBtn">
408-
<div class="btn btn-txt custCol-secondary fontSize12 js-editPage">
409-
<span class="ion-edit fontSize10 marginRight2 textOpacity1"></span>
410-
<%= polyglot.t('Edit') %>
411-
</div>
412-
</a>
395+
<div class="rowItem positionWrapper noOverflow">
396+
<% if(ob.ownPage) { %>
397+
<a href="#settings/page" class="userPageEditBtn">
398+
<div class="btn btn-txt custCol-secondary fontSize12 js-editPage">
399+
<span class="ion-edit fontSize10 marginRight2 textOpacity1"></span>
400+
<%= polyglot.t('Edit') %>
401+
</div>
402+
</a>
403+
<%}%>
404+
<div class="textOpacity75 fontSize14"><%= polyglot.t('Snapchat') %></div>
405+
<% if(ob.page.profile.social_accounts.snapchat && ob.page.profile.social_accounts.snapchat.username) { %>
406+
<a href="https://snapchat.com/add/<%= ob.page.profile.social_accounts.snapchat.username %>">
407+
<%= ob.page.profile.social_accounts.snapchat.username %>
408+
</a> <i class="ion-android-open fontSize10"></i>
409+
<%}else{%>
410+
<%= polyglot.t('NotProvided') %>
413411
<%}%>
414-
<div class="textOpacity75 fontSize14"><%= polyglot.t('Snapchat') %></div>
415-
<div class="noOverflow">
416-
<% if(ob.page.profile.social_accounts.snapchat && ob.page.profile.social_accounts.snapchat.username) { %>
417-
<a href="https://snapchat.com/add/<%= ob.page.profile.social_accounts.snapchat.username %>">
418-
<%= ob.page.profile.social_accounts.snapchat.username %>
419-
</a> <i class="ion-android-open fontSize10"></i>
420-
<%}else{%>
421-
<%= polyglot.t('NotProvided') %>
422-
<%}%>
423-
</div>
424412
</div>
425413
</div>
426414
<div class="flexRow borderBottom custCol-border TODO">
427-
<div class="rowItem positionWrapper">
428-
<% if(ob.ownPage) { %>
429-
<a href="#settings/page" class="userPageEditBtn">
430-
<div class="btn btn-txt custCol-secondary">
431-
<span class="ion-edit fontSize10 marginRight2 textOpacity1"></span>
432-
<%= polyglot.t('Edit') %>
433-
</div>
434-
</a>
435-
<%}%>
415+
<div class="rowItem positionWrapper noOverflow">
416+
<% if(ob.ownPage) { %>
417+
<a href="#settings/page" class="userPageEditBtn">
418+
<div class="btn btn-txt custCol-secondary">
419+
<span class="ion-edit fontSize10 marginRight2 textOpacity1"></span>
420+
<%= polyglot.t('Edit') %>
421+
</div>
422+
</a>
423+
<%}%>
436424
<div class="textOpacity75 fontSize14"><%= polyglot.t('PGPKey') %></div>
437-
<div class="noOverflow">
438-
<%= polyglot.t('NotProvided') %>
439-
</div>
440425
</div>
441426
</div>
442427
</div>

0 commit comments

Comments
 (0)