Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / view / theme / frio / css / style.css

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index e284310b860a815fee2e15a1c55ede601029fca7..91b6219f1787a46215f1ac78dbcd9c26a69e4da0 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -88,7 +88,7 @@ blockquote {
     display: none !important;
 }
 code {
-       white-space: pre;
+    white-space: pre-wrap;
 }
 
 /*
@@ -1157,6 +1157,9 @@ section #jotOpen {
 #profile-jot-wrapper button#jot-submit {
     margin-top: 5px;
 }
+#profile-jot-wrapper #character-counter {
+    padding: 10px 15px;
+}
 
 /* ACL */
 /*#jot-modal-body {
@@ -1496,14 +1499,19 @@ code > .hl-main {
 /* item social action buttons */
 .wall-item-actions, .wall-item-actions a {
     font-size: 13px;
-    /*color: #aeaeae;*/
     color: #555;
     margin-top: 15px;
     margin-bottom: 0;
 }
+.wall-item-actions a.active {
+    font-weight: bold;
+}
 .wall-item-actions a:hover {
     color: #555;
 }
+.wall-item-actions a.active:hover {
+    color: $link_color;
+}
 .wall-item-actions-left {
     display: table-cell;
     vertical-align: middle;
@@ -2097,7 +2105,6 @@ ul li:hover .contact-wrapper a.contact-action-link:hover {
 
 /* Events page */
 
-
 .fc .fc-month-view .fc-content .fc-title .item-desc:hover {
     color: $link_hover_color;
 }
@@ -2297,6 +2304,44 @@ little modifications to emulate a standard page template */
     -moz-box-shadow: 0 0 3px #dadada;
 }
 
+/* Help Page */
+section.help-content-wrapper h1 {
+    padding-bottom: 0.3em;
+    font-size: 1.8em;
+    border-bottom: 1px solid #ddd;
+}
+section.help-content-wrapper h2 {
+    padding-bottom: 0.3em;
+    font-size: 1.5em;
+    border-bottom: 1px solid #ddd;
+}
+section.help-content-wrapper h3 {
+    font-size: 1.2em;
+}
+section.help-content-wrapper h4 {
+    font-size: 1em;
+}
+section.help-content-wrapper h1,
+section.help-content-wrapper h2,
+section.help-content-wrapper h3,
+section.help-content-wrapper h4,
+section.help-content-wrapper h5,
+section.help-content-wrapper h6 {
+    margin-top: 24px;
+    margin-bottom: 16px;
+    font-weight: 600;
+    line-height: 1.25;
+}
+section.help-content-wrapper p {
+    margin: 0.4em 0;
+}
+section.help-content-wrapper p,
+section.help-content-wrapper a,
+section.help-content-wrapper li {
+    line-height: 1.6;
+    font-size: 0.96em;
+}
+
 /*
 * Overwriting for transparency and other colors
 */
@@ -2404,3 +2449,11 @@ body .tread-wrapper .hovercard a:hover {
 body .tread-wrapper .hovercard:hover .hover-card-content a {
     color: $link_color !important;
 }
+
+/*
+ * some temporary workarounds until this will solved
+ * elsewhere (e.g. new templates)
+ */
+section .profile-match-wrapper {
+    float: left;
+}