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

1 files changed, 47 insertions, 9 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ee3534a11..3212d98a3 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -50,6 +50,11 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
 	cursor: pointer;
 }
 
+
+input[type=text] {
+	font-family: arial,freesans,sans-serif;
+}
+
 input {
 	border: 1px solid #666666;
 	-moz-border-radius: $radiuspx;
@@ -57,7 +62,6 @@ input {
 	padding: 3px;
 }
 
-
 code {
 	font-family: Courier, monospace;
 	display: block;
@@ -1890,6 +1894,19 @@ a.mail-list-link {
 #side-follow-url, #side-peoplefind-url {
 	margin-top: 5px;
 }
+
+#side-peoplefind-url {
+	font-size: 1em;
+}
+
+#side-peoplefind-url::-webkit-input-placeholder {
+	font-family: FontAwesome;
+}
+
+#side-peoplefind-url::-moz-placeholder {
+	font-family: FontAwesome;
+}
+
 #side-follow-submit, #side-peoplefind-submit {
 	margin-top: 15px;
 }
@@ -2036,6 +2053,26 @@ a.mail-list-link {
     	transition: background-color 300ms ease 0s;
 }
 
+#nav-search-text::-webkit-input-placeholder {
+	font-family: FontAwesome;
+}
+
+#nav-search-text::-moz-placeholder {
+	font-family: FontAwesome;
+}
+
+#search-text {
+	font-size: 1em;
+}
+
+#search-text::-webkit-input-placeholder {
+	font-family: FontAwesome;
+}
+
+#search-text::-moz-placeholder {
+	font-family: FontAwesome;
+}
+
 #nav-user-linkmenu img {
 	border-radius: $radiuspx;
 	margin-top: -4px;
@@ -2864,8 +2901,8 @@ div.jGrowl div.info {
 }
 
 .autocomplete-w1 {
-	position:fixed;
-	top:24px;
+	position: fixed;
+	top: 24px;
 }
 
 .autocomplete { 
@@ -2877,18 +2914,19 @@ div.jGrowl div.info {
 	text-align: left;
 	max-height: 350px;
 	overflow: auto;
-	border-bottom-left-radius:$radiuspx;
-	border-bottom-right-radius:$radiuspx;
+	border-bottom-left-radius: $radiuspx;
+	border-bottom-right-radius: $radiuspx;
 }
 
 .autocomplete .selected {
-	background:$bgcolour;
+	background: $search_background;
 }
 
 .autocomplete div {
-	padding:2px 5px;
-	white-space:nowrap;
-	overflow:hidden;
+	padding: 2px 5px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 #datebrowse-sidebar select {