Merge of branches/jambazov to trunk. Incoporating the new convert comment to answer...

[osqa.git] / forum / skins / default / media / style / style.css

diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css
index 409ce5abecbe7185cd72d5fd9760579c243bac4b..e0b805220504ab446420aa8830622098941fe060 100644 (file)
--- a/forum/skins/default/media/style/style.css
+++ b/forum/skins/default/media/style/style.css
@@ -1,8 +1,8 @@
 @import "jquery.autocomplete.css";
 
 body {
-    overflow-y: scroll;
-    height: 100%;
+    /*overflow-y: scroll;
+    height: 100%; */
     background: none repeat scroll 0 0 #FFFFFF;
     color: #000000;
     font-family: sans-serif;
@@ -58,6 +58,12 @@ a {
     text-decoration: none;
 }
 
+.clear {
+  clear: both;
+  width: 0px;
+  height: 0px;
+}
+
 .badges a {
     color: #763333;
     text-decoration: underline;
@@ -150,9 +156,6 @@ blockquote {
 }
 
 #roof {
-    background: none repeat scroll 0 0 #FFFFFF;
-    margin-top: 0;
-    position: relative;
     width: 990px;
 }
 
@@ -189,13 +192,10 @@ blockquote {
 }
 
 #top {
+    float: right;
     background-color: #FFFFFF;
-    height: 20px;
     padding: 3px;
-    position: absolute;
-    right: 0;
     text-align: right;
-    top: 0;
     width: 500px;
 }
 
@@ -209,20 +209,17 @@ blockquote {
 }
 
 #logo {
+    float: left;
     padding: 5px 0 0;
 }
 
-#navBar {
-    display: block;
-    position: relative;
-    width: 990px;
-}
-
-#navBar .nav {
-    margin: 20px 0 0 16px;
+#nav {
+    float: right;
+    margin: 35px 0px 0px 0px;
+    width: 750px;
 }
 
-#navBar .nav a {
+#nav a {
     background-color: #E5EBF8;
     border-color: #888888 #888888 -moz-use-text-color;
     border-style: solid solid none;
@@ -239,11 +236,11 @@ blockquote {
     text-decoration: none;
 }
 
-#navBar .nav a:hover {
+#nav a:hover {
     text-decoration: underline;
 }
 
-#navBar .nav a.on {
+#nav a.on {
     background: none repeat scroll 0 0 #356FCB;
     border: 1px solid #356FCB;
     color: #FFFFFF;
@@ -253,23 +250,24 @@ blockquote {
     text-decoration: none;
 }
 
-#navBar .nav a.special {
+#nav a#nav_ask {
+    float: right;
     color: #B02B2C;
     font-size: 14px;
     font-weight: bold;
     text-decoration: none;
 }
 
-#navBar .nav a.special:hover {
+#nav a#nav_ask:hover {
     text-decoration: underline;
 }
 
-#navBar .nav div.focus {
-    float: right;
-    padding-right: 0;
+#nav a#nav_ask.on {
+   color: #FFFFFF;
 }
 
 #searchBar {
+    text-align: center;
     background-color: #B6C4E2;
     border-color: #EEEEEC #A9ACA5 #BABDB6 #EEEEEC;
     border-style: solid;
@@ -282,6 +280,8 @@ blockquote {
 }
 
 #searchBar .searchInput {
+    border: 0px;
+    padding: 3px;
     font-size: 13px;
     height: 18px;
     width: 400px;
@@ -331,6 +331,10 @@ blockquote {
     border-top: 0;
 }
 
+.user-stats-table .short-summary {
+    width: 764px;
+}
+
 .short-summary h2 a {
     color: #2A5594;
     font-family: "Trebuchet MS", "segoe ui", arial, sans-serif;
@@ -483,7 +487,7 @@ blockquote {
     margin-left: 0.5em;
 }
 
-.paginator .page a, .paginator .page a:visited, .paginator .curr {
+.paginator .page, .paginator .page a:visited, .paginator .curr {
     background-color: #FFFFFF;
     border: 1px solid #CCCCCC;
     color: #777777;
@@ -499,7 +503,7 @@ blockquote {
     font-weight: bold;
 }
 
-.paginator .page a:hover, .paginator .prev a:hover, .paginator .next a:hover {
+.paginator .page:hover, .paginator .prev a:hover, .paginator .next a:hover {
     background-color: #777777;
     border: 1px solid #777777;
     color: #FFFFFF;
@@ -915,7 +919,7 @@ span.form-error {
 }
 
 .revision .summary span {
-    /**background-color: yellow;/**/
+    /**background-color: yellow;**/
     display: inline;
     padding-left: 3px;
     padding-right: 3px;
@@ -1492,7 +1496,7 @@ a.accept-answer.on, a.accept-answer:hover {
     margin-left: 4px;
 }
 
-a.comment-like, a.comment-delete, a.comment-edit {
+a.comment-like, a.comment-delete, a.comment-edit, a.comment-convert {
     margin-left: 2px;
     width: 18px;
 }
@@ -1513,6 +1517,14 @@ a.comment-delete:hover {
     background: url("../images/comment-delete-hover.png") no-repeat scroll center center transparent;
 }
 
+a.comment-convert {
+    background: url("../images/convert-off.png") no-repeat scroll center center transparent;
+}
+
+a.comment-convert:hover {
+    background: url("../images/convert-hover.png") no-repeat scroll center center transparent;
+}
+
 a.comment-edit {
     background: url("../images/comment-edit.png") no-repeat scroll center center transparent;
 }
@@ -1754,8 +1766,8 @@ div.dialog.prompt .dialog-content select, div.dialog.prompt .dialog-content text
 }
 
 div#subscription_list {
-    width: 500px;
-    float:left;
+    width: 100%;
+    /*float:left;*/
 }
 
 div.subscription_summary {
@@ -1764,28 +1776,24 @@ div.subscription_summary {
     padding: 3px 0px 5px 0;
     position: relative;
     width:100%;
-    margin-bottom:30px;
+    margin-top: 5px;
 }
 
 div.subscription_title {
-    float:left;
-
-    width:350px;
-
-    line-height:30px;
-
-    font-size: 25px;
+    /*float:left;
+    line-height:30px;*/
+    margin-top: 5px;
+    font-size: 16px;
     font-weight:bold;
-    font-family: Arial;
 }
 
 a.subscription_unsubscribe_button {
     float:left;
-    font-size: 15px;
+    font-size: 11px;
     font-weight:bold;
 
     margin-right:15px;
-    margin-top:5px;
+    margin-top: 5px;
 }
 
 div.subscription_userinfo {
@@ -1812,3 +1820,9 @@ div.subscription_tags a:hover {
     color: #FFFFFF;
 }
 
+div.wmd-button {
+    color:white;
+}
+div.wmd-button-bar {
+    float:left;
+}