merging 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 6cbca137dd03558703d5393264e8194d00573e24..deab17b9d6391fddead7b5639be57d1c5bd7b5a4 100644 (file)
--- a/forum/skins/default/media/style/style.css
+++ b/forum/skins/default/media/style/style.css
@@ -1,6 +1,8 @@
 @import "jquery.autocomplete.css";
 
 body {
+    /*overflow-y: scroll;
+    height: 100%; */
     background: none repeat scroll 0 0 #FFFFFF;
     color: #000000;
     font-family: sans-serif;
@@ -56,6 +58,12 @@ a {
     text-decoration: none;
 }
 
+.clear {
+  clear: both;
+  width: 0px;
+  height: 0px;
+}
+
 .badges a {
     color: #763333;
     text-decoration: underline;
@@ -80,6 +88,7 @@ h1 {
     font-size: 160%;
     padding: 5px 0;
     line-height: 110%;
+    overflow: hidden;
 }
 
 h2 {
@@ -140,16 +149,20 @@ blockquote {
     max-width: 650px;
 }
 
+blockquote blockquote {
+    margin: 0;
+    padding: 0;
+}
+
 #wrapper, #announcement {
     margin: auto;
     padding: 0;
     width: 990px;
+    background-color: #FFF;
 }
 
 #roof {
-    background: none repeat scroll 0 0 #FFFFFF;
-    margin-top: 0;
-    position: relative;
+    width: 990px;
 }
 
 #room {
@@ -181,17 +194,14 @@ blockquote {
     padding-bottom: 0;
     padding-top: 6px;
     text-align: center;
-    width: 100%;
+    width: 990px;
 }
 
 #top {
+    float: right;
     background-color: #FFFFFF;
-    height: 20px;
     padding: 3px;
-    position: absolute;
-    right: 0;
     text-align: right;
-    top: 0;
     width: 500px;
 }
 
@@ -205,20 +215,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;
@@ -235,11 +242,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;
@@ -249,23 +256,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;
@@ -278,6 +286,8 @@ blockquote {
 }
 
 #searchBar .searchInput {
+    border: 0px;
+    padding: 3px;
     font-size: 13px;
     height: 18px;
     width: 400px;
@@ -323,6 +333,14 @@ blockquote {
     width: 740px;
 }
 
+#listA .short-summary:first-of-type {
+    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;
@@ -351,6 +369,11 @@ blockquote {
     font-weight: bold;
 }
 
+.short-summary .question-summary-wrapper {
+  float: right;
+  width: 565px;
+}
+
 .short-summary .votes, .short-summary .status, .short-summary .views {
     -moz-border-radius: 5px 5px 5px 5px;
     border-bottom: 1px solid #CCCCCC;
@@ -470,7 +493,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;
@@ -486,7 +509,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;
@@ -537,7 +560,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;
@@ -548,7 +571,11 @@ a.medal {
     font-weight: bold;
     line-height: 250%;
     padding: 4px 12px 4px 6px;
+}
+
+a.medal {
     text-decoration: none;
+    color: #333333;
 }
 
 a.medal:hover {
@@ -864,6 +891,7 @@ span.form-error {
     min-height: 20px;
     padding: 6px;
     width: 98%;
+    overflow: hidden;
 }
 
 .preview-toggle {
@@ -887,9 +915,12 @@ span.form-error {
     width: 100%;
 }
 
+.revision .rev-arrow {
+    cursor: pointer;
+}
+
 .revision .header {
     background-color: #EEEEEE;
-    cursor: pointer;
     padding: 5px;
 }
 
@@ -902,7 +933,7 @@ span.form-error {
 }
 
 .revision .summary span {
-    /**background-color: yellow;/**/
+    /**background-color: yellow;**/
     display: inline;
     padding-left: 3px;
     padding-right: 3px;
@@ -1101,6 +1132,7 @@ ins {
     line-height: 140%;
     padding: 5px;
     width: 170px;
+    display: inline-block;
 }
 
 .user ul {
@@ -1295,6 +1327,10 @@ ul.form-horizontal-rows li input {
     margin: 0 0 16px 0;
 }
 
+#question-tags {
+    margin-top: 15px;
+}
+
 .post-controls {
     float: left;
 }
@@ -1478,7 +1514,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;
 }
@@ -1499,6 +1535,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;
 }
@@ -1507,6 +1551,10 @@ a.comment-edit:hover {
     background: url("../images/comment-edit-hover.png") no-repeat scroll center center transparent;
 }
 
+img.subscription-remove {
+    float:right;
+}
+
 .comment-form-container {
     display: none;
     padding-top: 12px;
@@ -1676,7 +1724,7 @@ div.dialog, .context-menu-dropdown {
 }
 
 div.dialog .dialog-content {
-    padding: 12px 12px 37px 12px;
+    padding: 12px 12px 42px 12px;
     z-index: 1000;
 }
 
@@ -1732,5 +1780,67 @@ div.dialog.prompt .dialog-content select, div.dialog.prompt .dialog-content text
 .feed-icon {
     width: 14px;
     height: 14px;
-    float: left;
-}
\ No newline at end of file
+    display: inline-block;
+}
+
+div#subscription_list {
+    width: 100%;
+    /*float:left;*/
+}
+
+div.subscription_summary {
+    border-top: 2px dotted #CCCCCE;
+    overflow: hidden;
+    padding: 3px 0px 5px 0;
+    position: relative;
+    width:100%;
+    margin-top: 5px;
+}
+
+div.subscription_title {
+    /*float:left;
+    line-height:30px;*/
+    margin-top: 5px;
+    font-size: 16px;
+    font-weight:bold;
+}
+
+a.subscription_unsubscribe_button {
+    float:left;
+    font-size: 11px;
+    font-weight:bold;
+
+    margin-right:15px;
+    margin-top: 5px;
+}
+
+div.subscription_userinfo {
+    float:right;
+}
+
+div.subscription_tags {
+    font-family: sans-serif;
+    float:left;
+}
+div.subscription_tags a, span.tag {
+    background-color: #EEEEEE;
+    border-bottom: 1px solid #CCCCCC;
+    border-right: 1px solid #CCCCCC;
+    color: #777777;
+    font-size: 11px;
+    font-weight: normal;
+    padding: 1px 8px;
+    text-decoration: none;
+    white-space: nowrap;
+}
+div.subscription_tags a:hover {
+    background-color: #356FCB;
+    color: #FFFFFF;
+}
+
+div.wmd-button {
+    color:white;
+}
+div.wmd-button-bar {
+    float:left;
+}