Merge tag '1.8.18' of git://github.com/Elgg/Elgg into develop

1.8.18

Conflicts:
	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js

1 files changed, 0 insertions, 63 deletions

diff --git a/mod/twitter/views/default/twitter/css.php b/mod/twitter/views/default/twitter/css.php
deleted file mode 100644
index eb0cda98a..000000000
--- a/mod/twitter/views/default/twitter/css.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php 
-/**
- * Elgg Twitter CSS
- * 
- * @package ElggTwitter
- */    
-?>
-
-#twitter_widget {
-	margin:0 10px 0 10px;
-}
-#twitter_widget ul {
-	margin:0;
-	padding:0;
-}
-#twitter_widget li {
-	list-style-image:none;
-	list-style-position:outside;
-	list-style-type:none;
-	margin:0 0 5px 0;
-	padding:0;
-	overflow-x: hidden;
-	border: 2px solid #dedede;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	border-radius: 8px;
-}
-#twitter_widget li span {
-	color:#666666;
-	background:white;
-	
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	border-radius: 8px;
-	
-	padding:5px;
-	display:block;
-}
-p.visit_twitter a {
-	background:url(<?php echo elgg_get_site_url(); ?>mod/twitter/graphics/twitter16px.png) left no-repeat;
-	padding:0 0 0 20px;
-	margin:0;
-}
-p.twitter_username .input-text {
-	width:200px;
-}
-.visit_twitter {
-	background:white;
-	
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	border-radius: 8px;
-	
-	padding:2px;
-	margin:0 0 5px 0;
-}
-#twitter_widget li > a {
-	display:block;
-	margin:0 0 0 4px;
-}
-#twitter_widget li span a {
-	display:inline !important;
-}
\ No newline at end of file