Merge https://github.com/friendica/red into pending_merge

3 files changed, 19 insertions, 29 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index a382a42b3..ba4cc08b0 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -1,37 +1,15 @@
 /* override some bootstrap settings */
 
-html {
-	font-size: 100%;
+h1, h2 {
+   font-size: 1.583em;
 }
 
-h1,
-.h1 {
-  font-size: 24px;
+h3, h4 {
+   font-size: 1.334em;
 }
 
-h2,
-.h2 {
-  font-size: 18px;
-}
-
-h3,
-.h3 {
-  font-size: 16px;
-}
-
-h4,
-.h4 {
-  font-size: 14px;
-}
-
-h5,
-.h5 {
-  font-size: 12px;
-}
-
-h6,
-.h6 {
-  font-size: 10px;
+h5, h6 {
+   font-size: 0.75rem;
 }
 
 /* nav overrides */
diff --git a/view/css/conversation.css b/view/css/conversation.css
index c7b381928..80b5de250 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -107,6 +107,18 @@
 	overflow: auto;
 }
 
+.wall-item-content h1,  .wall-item-content h2 {
+   font-size: 1.319em;
+}
+
+.wall-item-title {
+   font-size: $font_size;
+}
+
+.wall-item-title h3, .wall-item-content h3,  .wall-item-content h4 {
+   font-size: 1.112em;
+}
+
 .wall-item-content img {
     max-width: 95%;
 }
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 8bf5a9e97..96b4c1d60 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -2,6 +2,7 @@
 /* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */
 
 .widget {
+	word-wrap: break-word;
 	margin-bottom: 10px;
 	padding: 10px 10px 10px 20px;
 }
@@ -9,7 +10,6 @@
 .widget h3 {
 	margin-left: -10px;
 	margin-top: 0px;
-	margin-bottom: 10px;
 }
 
 /* suggest */