Merge remote-tracking branch 'askbot/master' into wikipost

Conflicts:
	askbot/skins/old/templates/macros.html
	askbot/skins/old/templates/question.html
	askbot/skins/old/templates/reopen.html
	askbot/skins/old/templates/user_profile/user_stats.html

1 files changed, 0 insertions, 130 deletions

diff --git a/askbot/skins/old/media/js/wmd/wmd.css b/askbot/skins/old/media/js/wmd/wmd.css
deleted file mode 100644
index f1091a35..00000000
--- a/askbot/skins/old/media/js/wmd/wmd.css
+++ /dev/null
@@ -1,130 +0,0 @@
-/*body 
-{ 
-	background-color: White
-}
-*/
-.wmd-panel
-{
-}
-
-#wmd-button-bar 
-{
-	background-color: White; 
-}
-
-#wmd-input 
-{ 
-	height: 500px;
-	background-color: Gainsboro;
-	border: 1px solid DarkGray;
-	margin-top: -20px;
-}
-
-#wmd-preview 
-{ 
-	background-color: LightSkyBlue; 
-}
-
-#wmd-output 
-{ 
-	background-color: Pink;
-}
-
-#wmd-button-row 
-{
-	position: relative; 
-	margin-left: 5px;
-	margin-right: 5px;
-	margin-bottom: 5px;
-	margin-top: 10px;
-	padding: 0px;  
-	height: 20px;
-}
-
-.wmd-spacer
-{
-	width: 1px; 
-	height: 20px; 
-	margin-left: 14px;
-	
-	position: absolute;
-	background-color: Silver;
-	display: inline-block; 
-	list-style: none;
-}
-
-.wmd-button
-{
-	width: 20px; 
-	height: 20px; 
-	margin-left: 5px;
-	margin-right: 5px;
-	
-	position: absolute;
-	background-image: url(images/wmd-buttons.png);
-	background-repeat: no-repeat;
-	background-position: 0px 0px;
-	display: inline-block; 
-	list-style: none;
-}
-
-.wmd-button > a
-{
-	width: 20px; 
-	height: 20px; 
-	margin-left: 5px;
-	margin-right: 5px;
-	
-	position: absolute;
-	display: inline-block; 
-}
-
-
-/* sprite button slicing style information */
-#wmd-button-bar #wmd-bold-button    {left: 0px;   background-position: 0px 0;}
-#wmd-button-bar #wmd-italic-button  {left: 25px;  background-position: -20px 0;}
-#wmd-button-bar #wmd-spacer1        {left: 50px;}
-#wmd-button-bar #wmd-link-button    {left: 75px;  background-position: -40px 0;}
-#wmd-button-bar #wmd-quote-button   {left: 100px;  background-position: -60px 0;}
-#wmd-button-bar #wmd-code-button    {left: 125px;  background-position: -80px 0;}
-#wmd-button-bar #wmd-image-button   {left: 150px;  background-position: -100px 0;}
-#wmd-button-bar #wmd-attachment-button   {left: 175px;  background-position: -120px 0;}
-#wmd-button-bar #wmd-spacer2        {left: 200px;}
-#wmd-button-bar #wmd-olist-button   {left: 225px;  background-position: -140px 0;}
-#wmd-button-bar #wmd-ulist-button   {left: 250px; background-position: -160px 0;}
-#wmd-button-bar #wmd-heading-button {left: 275px; background-position: -180px 0;}
-#wmd-button-bar #wmd-hr-button      {left: 300px; background-position: -200px 0;}
-#wmd-button-bar #wmd-spacer3        {left: 325px;}
-#wmd-button-bar #wmd-undo-button    {left: 350px; background-position: -220px 0;}
-#wmd-button-bar #wmd-redo-button    {left: 375px; background-position: -240px 0;}
-#wmd-button-bar #wmd-help-button    {right: 0px; background-position: -260px 0;}
-
-
-.wmd-prompt-background
-{
-	background-color: Black;
-}
-
-.wmd-prompt-dialog
-{
-	border: 1px solid #999999;
-	background-color: #F5F5F5;
-}
-
-.wmd-prompt-dialog > div {
-	font-size: 1em;
-	font-family: arial, helvetica, sans-serif;
-}
-
-
-.wmd-prompt-dialog > form > input[type="text"] {
-	border: 1px solid #999999;
-	color: black;
-}
-
-.wmd-prompt-dialog > form > input[type="button"]{
-	border: 1px solid #888888;
-	font-family: trebuchet MS, helvetica, sans-serif;
-	font-size: 1em;
-	font-weight: bold;
-}