Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

2 files changed, 24 insertions, 3 deletions

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 21ce2d150..41077d427 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -103,7 +103,7 @@ function submit_form(e) {
 function getWord(text, caretPos) {
 	var index = text.indexOf(caretPos);
 	var postText = text.substring(caretPos, caretPos+8);
-	if ((postText.indexOf("[/list]") > 0) || postText.indexOf("[/ul]") > 0 || postText.indexOf("[/ol]") > 0) {
+	if ((postText.indexOf('[/list]') > 0) || postText.indexOf('[/ul]') > 0 || postText.indexOf('[/ol]') > 0 || postText.indexOf('[/dl]') > 0) {
 		return postText;
 	}
 }
@@ -265,7 +265,7 @@ function string2bb(element) {
 	$.fn.bbco_autocomplete = function(type) {
 
 		if(type=='bbcode') {
-			var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer'];
+			var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer'];
 			var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr',  ];
 
 			var elements = open_close_elements.concat(open_elements);
@@ -296,7 +296,7 @@ function string2bb(element) {
 			replace: function (element) {
 				element = string2bb(element);
 				if(open_elements.indexOf(element) < 0) {
-					if(element === 'list' || element === 'ol' || element === 'ul') {
+					if(element === 'list' || element === 'ol' || element === 'ul' || element === 'dl') {
 						return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]'];
 					}
 					else if(element === 'table') {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 290a1a697..e1076a79f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1827,6 +1827,27 @@ nav .badge.mail-update:hover {
 	margin-top:-3px;
 }
 
+dl.bb-dl > dt { 
+	/* overriding the default dl style from bootstrap, as bootstrap's
+	   style of a bold unindented line followed by a plain unindented
+	   line is already acheivable in bbcode without dl */
+	font-weight: normal; 
+} 
+dl.dl-terms-monospace > dt { font-family:     monospace; }
+dl.dl-terms-bold      > dt { font-weight:     bold; }
+dl.dl-terms-italic    > dt { font-style:      italic; }
+dl.dl-terms-underline > dt { text-decoration: underline; }
+dl.dl-terms-large     > dt { font-size:       120%; }
+dl.bb-dl:not(.dl-horizontal) > dd {
+	display: block;
+	margin-left: 2em;
+}
+dl.bb-dl > dd > li {
+	/* adding some indent so bullet-list items will line up better with 
+	   dl descriptions if someone wants to be impure and combine them */
+	margin-left: 1em;
+}
+
 .bootstrap-tagsinput .tag:before {
 	/* Copied from icon-asterisk, is there a better way to do it? */
 	font-family: FontAwesome;