Merge branch 'byron'

2 files changed, 24 insertions, 27 deletions

diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index 0f56e2fd..3a38a9cb 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -189,7 +189,6 @@ span.delete-icon:hover{background:url(../images/close-small-dark.png) top no-rep
 .tag-number{font-weight:normal;float:left;font-size:16px;color:#5d5d5d;}
 .badges .tag-number{float:none;display:inline;padding-right:15px;}
 .section-title{color:#7ea9b3;font-family:'Yanone Kaffeesatz',sans-serif;font-weight:bold;font-size:24px;}
-.ask-body{padding-right:10px;}
 #fmask{margin-bottom:30px;width:100%;}
 #askFormBar{display:inline-block;padding:4px 7px 5px 0px;margin-top:0px;}#askFormBar p{margin:0 0 5px 0;font-size:14px;color:#525252;line-height:1.4;}
 #askFormBar .questionTitleInput{font-size:24px;line-height:24px;height:36px;margin:0px;padding:0px 0 0 5px;border:#cce6ec 3px solid;width:725px;}
@@ -214,10 +213,10 @@ span.delete-icon:hover{background:url(../images/close-small-dark.png) top no-rep
 .question-options{margin-top:1px;color:#666;line-height:13px;margin-bottom:5px;}
 .question-options label{vertical-align:text-bottom;}
 .edit-content-html{border-top:1px dotted #D8D2A9;border-bottom:1px dotted #D8D2A9;margin:5px 0 5px 0;}
-.edit-question-page,#fmedit{color:#525252;}.edit-question-page #id_revision,#fmedit #id_revision{font-size:14px;margin-top:5px;margin-bottom:5px;}
-.edit-question-page #id_title,#fmedit #id_title{font-size:24px;line-height:24px;height:36px;margin:0px;padding:0px 0 0 5px;border:#cce6ec 3px solid;width:725px;margin-bottom:10px;}
-.edit-question-page #id_summary,#fmedit #id_summary{border:#cce6ec 3px solid;height:25px;padding-left:5px;width:395px;font-size:14px;}
-.edit-question-page .title-desc,#fmedit .title-desc{margin-bottom:10px;}
+.edit-question-page,#fmedit,.wmd-preview{color:#525252;}.edit-question-page #id_revision,#fmedit #id_revision,.wmd-preview #id_revision{font-size:14px;margin-top:5px;margin-bottom:5px;}
+.edit-question-page #id_title,#fmedit #id_title,.wmd-preview #id_title{font-size:24px;line-height:24px;height:36px;margin:0px;padding:0px 0 0 5px;border:#cce6ec 3px solid;width:725px;margin-bottom:10px;}
+.edit-question-page #id_summary,#fmedit #id_summary,.wmd-preview #id_summary{border:#cce6ec 3px solid;height:25px;padding-left:5px;width:395px;font-size:14px;}
+.edit-question-page .title-desc,#fmedit .title-desc,.wmd-preview .title-desc{margin-bottom:10px;}
 .question-page h1{padding-top:0px;font-family:'Yanone Kaffeesatz',sans-serif;}
 .question-page h1 a{color:#464646;font-size:30px;font-weight:normal;line-height:1;}
 .question-page p.rss{float:none;clear:both;padding:3px 0 0 23px;font-size:15px;width:110px;background-position:center left;margin-left:0px !important;}
@@ -236,7 +235,7 @@ span.delete-icon:hover{background:url(../images/close-small-dark.png) top no-rep
 .question-page .post-update-info a{color:#444;}
 .question-page .post-update-info .gravatar{float:left;margin-right:4px;}
 .question-page .post-update-info p.tip{color:#444;line-height:13px;font-size:10px;}
-.question-page .post-controls{font-size:11px;line-height:12px;min-width:200px;padding-left:5px;text-align:right;clear:left;float:right;margin-top:10px;}.question-page .post-controls a{color:#777;padding:0px 3px 3px 22px;cursor:pointer;border:none;font-size:12px;font-family:Arial;text-decoration:none;height:18px;display:block;float:right;line-height:18px;margin-top:-2px;margin-left:4px;}
+.question-page .post-controls{font-size:11px;line-height:12px;min-width:200px;padding-left:5px;text-align:right;clear:left;float:right;margin-top:10px;margin-bottom:8px;}.question-page .post-controls a{color:#777;padding:0px 3px 3px 22px;cursor:pointer;border:none;font-size:12px;font-family:Arial;text-decoration:none;height:18px;display:block;float:right;line-height:18px;margin-top:-2px;margin-left:4px;}
 .question-page .post-controls a:hover{background-color:#f5f0c9;border-radius:3px;-ms-border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;-khtml-border-radius:3px;}
 .question-page .post-controls .sep{color:#ccc;float:right;height:18px;font-size:18px;}
 .question-page .post-controls .question-delete,.question-page .answer-controls .question-delete{background:url(../images/delete.png) no-repeat center left;padding-left:16px;}
@@ -261,13 +260,13 @@ span.delete-icon:hover{background:url(../images/close-small-dark.png) top no-rep
 .question-page .comments .controls a:hover{background-color:#f5f0c9;text-decoration:none;}
 .question-page .comments .button{color:#988e4c;font-size:11px;padding:3px;cursor:pointer;}
 .question-page .comments a{background-color:inherit;color:#1b79bd;padding:0;}
-.question-page .comments form.post-comments{margin:3px 10px 7px 0px;}
-.question-page .comments textarea{height:42px;width:100%;margin:12px 0 5px 1px;font-family:Arial;outline:none;overflow:auto;font-size:12px;line-height:140%;padding-left:2px;padding-top:4px;border:#cce6ec 3px solid;}
+.question-page .comments form.post-comments{margin:3px 26px 0 42px;}.question-page .comments form.post-comments textarea{font-size:13px;line-height:1.3;}
+.question-page .comments textarea{height:42px;width:100%;margin:7px 0 5px 1px;font-family:Arial;outline:none;overflow:auto;font-size:12px;line-height:140%;padding-left:2px;padding-top:4px;border:#cce6ec 3px solid;}
 .question-page .comments input{margin-left:10px;margin-top:1px;vertical-align:top;width:100px;}
-.question-page .comments button{background:url(../images/small-button-blue.png) repeat-x top;border:0;color:#4a757f;font-family:Arial;font-size:13px;width:100px;font-weight:bold;height:27px;line-height:25px;margin-top:-2px;cursor:pointer;border-radius:4px;-ms-border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;-khtml-border-radius:4px;text-shadow:0px 1px 0px #e6f6fa;-moz-text-shadow:0px 1px 0px #e6f6fa;-webkit-text-shadow:0px 1px 0px #e6f6fa;-webkit-box-shadow:1px 1px 2px #808080;-moz-box-shadow:1px 1px 2px #808080;box-shadow:1px 1px 2px #808080;float:left;}
+.question-page .comments button{background:url(../images/small-button-blue.png) repeat-x top;border:0;color:#4a757f;font-family:Arial;font-size:13px;width:100px;font-weight:bold;height:27px;line-height:25px;margin-bottom:5px;cursor:pointer;border-radius:4px;-ms-border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;-khtml-border-radius:4px;text-shadow:0px 1px 0px #e6f6fa;-moz-text-shadow:0px 1px 0px #e6f6fa;-webkit-text-shadow:0px 1px 0px #e6f6fa;-webkit-box-shadow:1px 1px 2px #808080;-moz-box-shadow:1px 1px 2px #808080;box-shadow:1px 1px 2px #808080;}
 .question-page .comments button:hover{background:url(../images/small-button-blue.png) bottom repeat-x;text-shadow:0px 1px 0px #c6d9dd;-moz-text-shadow:0px 1px 0px #c6d9dd;-webkit-text-shadow:0px 1px 0px #c6d9dd;}
 .question-page .comments .counter{display:inline-block;width:245px;float:right;color:#b6a475 !important;vertical-align:top;font-family:Arial;float:right;text-align:right;}
-.question-page .comments .comment{border-bottom:1px solid #edeeeb;margin:0;margin-top:8px;padding-bottom:4px;overflow:auto;font-family:Arial;font-size:11px;min-height:25px;background:#ffffff url(../images/comment-background.png) bottom repeat-x;border-radius:5px;-ms-border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-khtml-border-radius:5px;}
+.question-page .comments .comment{border-bottom:1px solid #edeeeb;clear:both;margin:0;margin-top:8px;padding-bottom:4px;overflow:auto;font-family:Arial;font-size:11px;min-height:25px;background:#ffffff url(../images/comment-background.png) bottom repeat-x;border-radius:5px;-ms-border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-khtml-border-radius:5px;}
 .question-page .comments div.comment:hover{background-color:#efefef;}
 .question-page .comments a.author{background-color:inherit;color:#1b79bd;padding:0;}
 .question-page .comments a.author:hover{text-decoration:underline;}
@@ -303,8 +302,7 @@ span.delete-icon:hover{background:url(../images/close-small-dark.png) top no-rep
 .question-page .answer-img-accept:hover{background:url(../images/vote-accepted-on.png);}
 .question-page .answer-body a{color:#1b79bd;}
 .question-page .answer-body li{margin-bottom:0.7em;}
-.question-page #fmanswer{color:#707070;line-height:1.2;margin-top:10px;}.question-page #fmanswer p{font-size:13px;line-height:1.3;}
-.question-page #fmanswer h2{font-family:'Yanone Kaffeesatz',sans-serif;color:#7ea9b3;font-size:24px;}
+.question-page #fmanswer{color:#707070;line-height:1.2;margin-top:10px;}.question-page #fmanswer h2{font-family:'Yanone Kaffeesatz',sans-serif;color:#7ea9b3;font-size:24px;}
 .question-page #fmanswer label{font-size:13px;}
 .question-page .message{padding:5px;margin:0px 0 10px 0;}
 .facebook-share.icon,.twitter-share.icon,.linkedin-share.icon,.identica-share.icon{background:url(../images/socialsprite.png) no-repeat;display:block;text-indent:-100em;height:25px;width:25px;margin-bottom:3px;}
@@ -518,5 +516,5 @@ a.edit{padding-left:3px;color:#145bff;}
 .atn{color:#606;}
 .atv{color:#080;}
 .dec{color:#606;}
-pre.prettyprint{padding:3px;border:0px solid #888;}
+pre.prettyprint{clear:both;padding:3px;border:0px solid #888;}
 @media print{.str{color:#060;} .kwd{color:#006;font-weight:bold;} .com{color:#600;font-style:italic;} .typ{color:#404;font-weight:bold;} .lit{color:#044;} .pun{color:#440;} .pln{color:#000;} .tag{color:#006;font-weight:bold;} .atn{color:#404;} .atv{color:#060;}}
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index ba2e5c15..6c21e6d3 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -1265,10 +1265,6 @@ span.delete-icon:hover {
     font-size:24px;
 }
 
-.ask-body {
-    padding-right: 10px;
-}
-
 #fmask{
     margin-bottom:30px;
     width:100%;
@@ -1459,7 +1455,7 @@ span.delete-icon:hover {
     margin: 5px 0 5px 0;
 }
 
-.edit-question-page, #fmedit{
+.edit-question-page, #fmedit, .wmd-preview{
     color:@info-text-dark;
     
     #id_revision{
@@ -1623,6 +1619,7 @@ span.delete-icon:hover {
         clear: left;
         float: right;
         margin-top:10px;
+        margin-bottom:8px;
         
         a {
              color: #777;
@@ -1762,13 +1759,18 @@ span.delete-icon:hover {
         }
         
         form.post-comments {
-            margin: 3px 10px 7px 0px;
+            margin: 3px 26px 0 42px;
+            textarea{
+                font-size: 13px;
+                line-height: 1.3;
+
+            }
         }
 
         textarea {
             height: 42px;
             width:100%;
-            margin: 12px 0 5px 1px;
+            margin: 7px 0 5px 1px;
             font-family: @body-font;
             outline: none;
             overflow:auto;
@@ -1795,12 +1797,11 @@ span.delete-icon:hover {
             font-weight:bold;
             height:27px;
             line-height:25px;
-            margin-top:-2px;
+            margin-bottom:5px;
             cursor:pointer;
             .rounded-corners(4px);
              .text-shadow(0px,1px,0px,#E6F6FA);
              .box-shadow(1px, 1px, 2px, #808080);
-             float:left;
         }
         button:hover{
             background: url(../images/small-button-blue.png) bottom repeat-x;
@@ -1818,6 +1819,7 @@ span.delete-icon:hover {
         }
         .comment {
             border-bottom: 1px solid #edeeeb;
+            clear:both;
             margin: 0;
             margin-top:8px;
             padding-bottom:4px;
@@ -2035,10 +2037,7 @@ span.delete-icon:hover {
         color:@info-text;
         line-height:1.2;
         margin-top:10px;
-        p{
-            font-size:13px;
-          line-height:1.3;
-        }
+ 
         h2{
           font-family:@main-font;
           color:@section-title;
@@ -3319,7 +3318,7 @@ a.edit {
 .atn { color: #606; }
 .atv { color: #080; }
 .dec { color: #606; }
-pre.prettyprint { padding: 3px; border: 0px solid #888; }
+pre.prettyprint { clear:both;padding: 3px; border: 0px solid #888; }
 
 @media print {
   .str { color: #060; }