Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

[livejournal] r20195: LJSUP-9980: Need add lines in contextual...

Committer: esavintcev
LJSUP-9980: Need add lines in contextual pop-up
U   trunk/htdocs/js/contextualhover.js
U   trunk/htdocs/stc/lj_base.css
Modified: trunk/htdocs/js/contextualhover.js
===================================================================
--- trunk/htdocs/js/contextualhover.js	2011-10-03 06:42:18 UTC (rev 20194)
+++ trunk/htdocs/js/contextualhover.js	2011-10-03 07:10:15 UTC (rev 20195)
@@ -130,6 +130,7 @@
 			wrapper: '<div class="b-contextualhover"></div>',
 			loading: 'Loading...',
 			content: 
+					'<div class="b-contextualhover-wrapper{{if userpic }} b-contextualhover-userpig{{/if}}">' +
 					'{{if userpic }}' +
 					'<div class="b-contextualhover-side">' +
 						'<div class="b-contextualhover-userpic">' +
@@ -142,12 +143,14 @@
 						'{{each headLinks}}<p><a href="${$value.url}">${$value.text}</a></p>{{/each}}' +
 					'</div>' +
 					'{{each(i, group) linkGroups}}' +
+						'{{if group.length }}' +
 						'<ul class="b-contextualhover-options">' +
 							'{{each group}}<li>' +
 								'{{if $value.url}}<a href="${$value.url}">${$value.text}</a>' +
 								'{{else}}{{html $value}}{{/if}}' +
 							'</li>{{/each}}' +
 						'</ul>' +
+						'{{/if}}' +
 					'{{/each}}' +
 					'{{if showBanOptions }}' +
 					'<ul class="b-contextualhover-options">' +
@@ -161,7 +164,8 @@
 						'</li>' +
 						'{{if reportBot}}<li><a href="${reportBot.url}">${reportBot.text}</a></li>{{/if}}' +
 					'</ul>' +
-					'{{/if}}'
+					'{{/if}}' +
+					'</div>'
 		},
 
 		init: function() {

Modified: trunk/htdocs/stc/lj_base.css
===================================================================
--- trunk/htdocs/stc/lj_base.css	2011-10-03 06:42:18 UTC (rev 20194)
+++ trunk/htdocs/stc/lj_base.css	2011-10-03 07:10:15 UTC (rev 20195)
@@ -2874,7 +2874,16 @@
 	width: 250px;
 	min-height: 50px;
 	font-family: 'Arial', sans-serif;
+	*zoom: 1;
 	}
+.b-contextualhover:before,
+.b-contextualhover:after {
+	content: "";
+	display: table;
+	}
+.b-contextualhover:after {
+	clear: both;
+	}
 	.b-contextualhover,
 	.b-contextualhover DIV,
 	.b-contextualhover P,
@@ -2937,11 +2946,14 @@
 			font-size: 12px;
 			}
 	.b-contextualhover .b-contextualhover-options {
-		padding-top: 5px;
-		padding-bottom: 5px;
+		margin: 0;
+		padding: 5px 0;
 		list-style: none;
 		border-top: 1px dotted #D3D3D3;
 		}
+	.b-contextualhover .b-contextualhover-userpig .b-contextualhover-options {
+		margin: 0 70px 0 0;
+		}
 		.b-contextualhover .b-contextualhover-options LI {
 			line-height: 18px;
 			font-size: 12px;

Tags: css, js, livejournal, savintsev_egor
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments