Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value

util/credits.txt

@@ -19,6 +19,7 @@ balderino
 Beanow
 Beatriz Vital
 Ben Roberts
+ben-utzer
 bufalo1973
 Calango Jr
 Carlos Solís

view/theme/frio/css/font-awesome.custom.css

@@ -0,0 +1,21 @@
+/*
+@fiel view/theme/frio/css/font-awesome.custom.css
+@brief This file applies Font Awesome icons to some friendica standard classes
+*/
+
+.icon:before {
+    font-family: FontAwesome;
+    font-weight: normal;
+    font-style: normal;
+    display: inline-block;
+    text-decoration: inherit;
+    vertical-align: top;
+    font-size: 1.4em;
+}
+/* media icons */
+.icon.type-image:before           { content: "\f1c5"; }
+.icon.type-video:before           { content: "\f1c8"; }
+.icon.type-audio:before           { content: "\f1c7"; }
+.icon.type-text:before            { content: "\f0f6"; }
+.icon.type-application:before     { content: "\f016"; }
+.icon.type-unkn:before            { content: "\f016"; }

view/theme/frio/css/style.css

@@ -1404,6 +1404,15 @@ section #jotOpen {
 .wall-item-body > a > img {
     border-radius: 3px;
 }
+.wall-item-body .body-attach > a {
+    color: #555;
+    display: inline-block;
+}
+.wall-item-body .body-attach > a div {
+    color: #555;
+    width: 20px;
+}
+
 .shared-wrapper,
 .vevent {
     margin-left: 50px;
@@ -1486,7 +1495,8 @@ blockquote.shared_content {
 
 /* wall item hover effects */
 .wall-item-container .wall-item-links,
-.wall-item-container .wall-item-actions {
+.wall-item-container .wall-item-actions,
+.wall-item-container .body-attach > a {
     opacity: 0.3;
     -webkit-transition: all 0.25s ease-in-out;
     -moz-transition: all 0.25s ease-in-out;
@@ -1495,7 +1505,8 @@ blockquote.shared_content {
     transition: all 0.25s ease-in-out;
 }
 .wall-item-container:hover .wall-item-links,
-.wall-item-container:hover .wall-item-actions {
+.wall-item-container:hover .wall-item-actions,
+.wall-item-container:hover .body-attach > a {
     opacity: 0.6;
     -webkit-transition: all 0.25s ease-in-out;
     -moz-transition: all 0.25s ease-in-out;
@@ -1503,6 +1514,9 @@ blockquote.shared_content {
     -ms-transition: all 0.25s ease-in-out;
     transition: all 0.25s ease-in-out;
 }
+.wall-item-container .wall-item-body .body-attach > a:hover {
+    opacity: 1;
+}
 
 /*
 /* Comments

view/theme/frio/templates/head.tpl

@@ -30,6 +30,7 @@
 
 {{* own css files *}}
 <link rel="stylesheet" href="view/theme/frio/css/hovercard.css" type="text/css" media="screen"/>
+<link rel="stylesheet" href="view/theme/frio/css/font-awesome.custom.css" type="text/css" media="screen"/>
 
 <!--
 <link rel="shortcut icon" href="images/friendica-32.png" />