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

1 files changed, 24 insertions, 4 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 290a1a697..c19005f11 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1383,9 +1383,8 @@ img.mail-conv-sender-photo {
 	-moz-border-radius: $radiuspx;
 }
 
-.profile-thing-list img, .thing-show img, .thing-edit-links a {
-	margin-top: 8px;
-	margin-right: 15px;
+.thing-show img {
+	margin: 10px;
 }
 
 .abook-self {
@@ -1827,8 +1826,29 @@ 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? */
+	/* Copied from fa-asterisk, is there a better way to do it? */
 	font-family: FontAwesome;
 	font-weight: normal;
 	font-style: normal;