Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into new-template

4 files changed, 72 insertions, 44 deletions

diff --git a/askbot/skins/default/media/images/notification.png b/askbot/skins/default/media/images/notification.png
new file mode 100644
index 00000000..c33ba699
--- /dev/null
+++ b/askbot/skins/default/media/images/notification.png
diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less
index cd8aa5d9..6d3bfa34 100644
--- a/askbot/skins/default/media/style/lib_style.less
+++ b/askbot/skins/default/media/style/lib_style.less
@@ -12,10 +12,10 @@
 
 /* Variables for fonts*/
 
-@trebuchet:"Trebuchet MS", sans-serif;
-@georgia:Georgia, serif;
-@yanone:'Yanone Kaffeesatz', sans-serif;
-@arial:Arial;
+@body-font:"Trebuchet MS", sans-serif;
+@sort-font:Georgia, serif;
+@main-font:'Yanone Kaffeesatz', sans-serif;
+@secondary-font:Arial;
 
 /* Receive exactly positions for background Sprite  */
 
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index 1147848c..85039bef 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -10,7 +10,7 @@ body {
     margin: 0;
     padding: 0;
     color: #000;
-    font-family: @yanone;
+    font-family: @main-font;
 }
 
 div {
@@ -151,6 +151,10 @@ h1 {
 .left{float:left}
 .right{float:right}
 .clean{clear:both}
+.center{
+    margin: 0 auto;
+    padding: 0;
+}
 
 
 /* ----- Notify message bar , check blocks/system_messages.html ----- */
@@ -361,7 +365,7 @@ h1 {
         border:0px;
         color:#484848;
         padding-left:10px;
-        font-family:@trebuchet;
+        font-family:@body-font;
         vertical-align: middle;
     }
 
@@ -569,7 +573,7 @@ h1 {
         line-height:34px;
         text-align:center;
         border:0;
-        font-family:@yanone;
+        font-family:@main-font;
         color:@button-label;
         font-weight:normal;
         font-size:21px;
@@ -579,6 +583,7 @@ h1 {
         text-decoration:none;
         .rounded-corners(4px);
         .box-shadow(1px, 1px, 2px, #636363);
+        .center;
     }
 
     a.followed:hover, a.follow:hover{
@@ -663,7 +668,7 @@ h1 {
     margin-bottom: 3px;
     margin-top: 3px;
     float:right;
-    font-family:@georgia;
+    font-family:@sort-font;
     font-size:16px;
     .rounded-corners(5px);
 }
@@ -732,7 +737,7 @@ h1 {
     padding-top:3px;
     background:#fff url(../images/feed-icon-small.png) no-repeat center right;
     float:right;
-    font-family:@georgia;
+    font-family:@sort-font;
     font-size:16px;
 }
 
@@ -816,7 +821,7 @@ ul#searchTags {
     .userinfo {
         text-align:right;
         line-height:16px;
-        font-family:@trebuchet;
+        font-family:@body-font;
         padding-right:4px;
     }
     
@@ -842,7 +847,7 @@ ul#searchTags {
     .counts .item-count {
         padding:0px 5px 0px 5px;
         font-size: 25px;
-        font-family:@yanone;
+        font-family:@main-font;
     }
     
     .counts .votes div,
@@ -956,7 +961,7 @@ ul#searchTags {
          background-color: #fff;
         color: #777;
         padding: 2px 4px 3px 4px;
-        font-family:@yanone;
+        font-family:@main-font;
     }
     a{
         color:@section-title;
@@ -1116,7 +1121,7 @@ ul#related-tags li {
     text-align: center;
     white-space: nowrap;
     vertical-align: middle;
-    font-family:@trebuchet;
+    font-family:@body-font;
     color:#717179;
 }
 .deletable-tag {
@@ -1185,7 +1190,7 @@ span.delete-icon:hover {
 
 .section-title{
     color:@section-title;
-    font-family:@yanone;
+    font-family:@main-font;
     font-weight:bold;
     font-size:24px;
 }
@@ -1280,7 +1285,7 @@ span.delete-icon:hover {
     background: url(../images/medium-button.png) top repeat-x;
     height:34px;
     border:0;
-    font-family:@yanone;
+    font-family:@main-font;
     color:@button-label;
     font-weight:normal;
     font-size:21px;
@@ -1322,7 +1327,7 @@ span.delete-icon:hover {
     min-height: 20px;
     overflow: auto;
     font-size:13px;
-    font-family:@trebuchet;
+    font-family:@body-font;
 
     p{
         margin-bottom:14px;
@@ -1425,14 +1430,15 @@ span.delete-icon:hover {
     p.rss {
         float:none;
         clear:both;
-        padding: 3px 0 0 1px;
+        padding: 3px 0 0 22px;
         font-size: 15px;
         width:110px;
+        background-position:center left;
         
     }
 
     p.rss a {
-        font-family:@yanone;
+        font-family:@main-font;
         vertical-align: top;
     }
        
@@ -1467,7 +1473,7 @@ span.delete-icon:hover {
     .question-body, .answer-body {
         overflow: auto;
         margin-top:10px;
-        font-family:@trebuchet;
+        font-family:@body-font;
         color:#4b4b4b;
 
         p{
@@ -1498,7 +1504,7 @@ span.delete-icon:hover {
         background: #fff url(../images/background-user-info.png) repeat-x bottom;
         float: right;
         font-size: 9px;
-        font-family:@arial;
+        font-family:@secondary-font;
         width: 173px;
         padding:4px;
         margin:0px 0px 5px 5px;
@@ -1543,7 +1549,7 @@ span.delete-icon:hover {
             cursor: pointer;
             border: none;
             font-size:12px;
-            font-family:@trebuchet;
+            font-family:@body-font;
             text-decoration: none;
             height:18px;
             display:block;
@@ -1591,7 +1597,7 @@ span.delete-icon:hover {
     
     #questionCount{
         float:left;
-        font-family:@yanone;
+        font-family:@main-font;
         line-height:15px;
     }
 
@@ -1647,7 +1653,7 @@ span.delete-icon:hover {
         .controls a {
              color: #988e4c;
             padding: 0 3px 2px 22px;
-            font-family:@trebuchet;
+            font-family:@body-font;
             font-size:13px;
             background:url(../images/comment.png) no-repeat center left;
         }
@@ -1677,7 +1683,7 @@ span.delete-icon:hover {
             height: 42px;
             width:100%;
             margin: 12px 0 5px 1px;
-            font-family: @trebuchet;
+            font-family: @body-font;
             outline: none;
             overflow:auto;
             font-size: 12px;
@@ -1718,7 +1724,7 @@ span.delete-icon:hover {
             float:right;
             color:#b6a475 !important;
             vertical-align: top;
-            font-family:@trebuchet;
+            font-family:@body-font;
             float:right;
             text-align:right;
         }
@@ -1728,7 +1734,7 @@ span.delete-icon:hover {
             margin-top:8px;
             padding-bottom:4px;
             overflow: auto;
-            font-family:@trebuchet;
+            font-family:@body-font;
             font-size:11px;
             min-height: 25px;
             background:url(../images/comment-background.png) bottom repeat-x;
@@ -1851,7 +1857,7 @@ span.delete-icon:hover {
     }
 
     .vote-number {
-        font-family: @yanone;
+        font-family: @main-font;
         padding: 0px 0 5px 0;
         font-size: 25px;
         font-weight: bold;
@@ -1864,6 +1870,12 @@ span.delete-icon:hover {
     .vote-buttons .notify-sidebar label {
         vertical-align: top;
     }
+
+    .tabBar-answer{
+        margin-bottom:15px;
+        padding-left:15px;
+    }
+
     .accepted-answer {
         background-color: #f7fecc;
         border-bottom-color: #9BD59B;
@@ -2179,6 +2191,38 @@ a:hover.medal {
     .rounded-corners(4px);
 }
 
+.vote-notification {
+    z-index: 1;
+    cursor: pointer;
+    display: none;
+    position: absolute;
+    font-family:@secondary-font;
+    font-size:14px;
+    font-weight:normal;
+    color: white;
+    background-color: #8e0000;
+    text-align: center;
+    padding-bottom:10px;
+    .box-shadow(0px, 2px, 4px, #370000);
+    .rounded-corners(4px);
+
+    h3{
+        background:url(../images/notification.png) repeat-x top;
+       padding:10px 10px 10px 10px;
+       font-size:13px;
+       margin-bottom:5px;
+       border-top:#8e0000 1px solid;
+       color:#fff;
+       font-weight:normal;
+    }
+    a {
+        color: #fb7321;
+        text-decoration: underline;
+        font-weight:bold;
+    }
+
+}
+
 /* ----- Footer links , check blocks/footer.html----- */
 
 #ground {
@@ -2943,22 +2987,6 @@ p.signup_p {
     margin:0;
 }
 
-.vote-notification {
-    z-index: 1;
-    cursor: pointer;
-    display: none;
-    position: absolute;
-    padding: 15px;
-    color: white;
-    background-color: darkred;
-    text-align: center;
-}
-
-.vote-notification a {
-    color: white;
-    text-decoration: underline;
-}
-
 #responses {
     clear:both;
     line-height:18px;
diff --git a/askbot/skins/default/templates/question/answer_tab_bar.html b/askbot/skins/default/templates/question/answer_tab_bar.html
index 04584bbd..3bf0a2a0 100644
--- a/askbot/skins/default/templates/question/answer_tab_bar.html
+++ b/askbot/skins/default/templates/question/answer_tab_bar.html
@@ -1,4 +1,4 @@
-<div class="tabBar">
+<div class="tabBar tabBar-answer">
     <h1 id="questionCount">
         {% trans counter=answers|length %}
         {{counter}} Answer