Reintegrate merge cacheimp -> trunk.

[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 61b8281466ee94f759488242592a7ce98fc6094b..e100e6a349dbce30e351aa16ebe46be5f808d174 100644 (file)
--- a/forum/skins/default/media/style/style.css
+++ b/forum/skins/default/media/style/style.css
@@ -88,6 +88,7 @@ h1 {
     font-size: 160%;
     padding: 5px 0;
     line-height: 110%;
+    overflow: hidden;
 }
 
 h2 {
@@ -487,7 +488,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;
@@ -503,7 +504,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;
@@ -554,7 +555,7 @@ blockquote {
     margin-top: 0;
 }
 
-a.medal {
+.medal {
     background: none repeat scroll 0 0 #FFFFCD;
     border-color: #EEEEEE #CCCCCC #CCCCCC #EEEEEE;
     border-left: 1px solid #EEEEEE;
@@ -565,7 +566,11 @@ a.medal {
     font-weight: bold;
     line-height: 250%;
     padding: 4px 12px 4px 6px;
+}
+
+a.medal {
     text-decoration: none;
+    color: #333333;
 }
 
 a.medal:hover {
@@ -881,6 +886,7 @@ span.form-error {
     min-height: 20px;
     padding: 6px;
     width: 98%;
+    overflow: hidden;
 }
 
 .preview-toggle {
@@ -904,9 +910,12 @@ span.form-error {
     width: 100%;
 }
 
+.revision .rev-arrow {
+    cursor: pointer;
+}
+
 .revision .header {
     background-color: #EEEEEE;
-    cursor: pointer;
     padding: 5px;
 }
 
@@ -919,7 +928,7 @@ span.form-error {
 }
 
 .revision .summary span {
-    /**background-color: yellow;/**/
+    /**background-color: yellow;**/
     display: inline;
     padding-left: 3px;
     padding-right: 3px;
@@ -1313,6 +1322,10 @@ ul.form-horizontal-rows li input {
     margin: 0 0 16px 0;
 }
 
+#question-tags {
+    margin-top: 15px;
+}
+
 .post-controls {
     float: left;
 }
@@ -1496,7 +1509,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;
 }
@@ -1517,6 +1530,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;
 }
@@ -1817,4 +1838,4 @@ div.wmd-button {
 }
 div.wmd-button-bar {
     float:left;
-}
\ No newline at end of file
+}