Style for paginator and footer

4 files changed, 160 insertions, 139 deletions

diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less
index 1c6f6f5b..a426a476 100644
--- a/askbot/skins/default/media/style/lib_style.less
+++ b/askbot/skins/default/media/style/lib_style.less
@@ -22,7 +22,6 @@
     background:@hor @vert @back;
 }
 
-
 /* CSS3 Elements */
 
 .box-shadow (@hor: 0px, @vert: 0px, @blur: 5px, @shadow: #929292){
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index ce9a7a44..5e6f150d 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -677,26 +677,6 @@ ul#related-tags li {
     margin-right: 5px;
 }
 
-#ground {
-    width: 100%;
-    clear: both;
-    border-top: 1px solid #000;
-    padding: 6px 0 0 0;
-    text-align: center;
-    background: #777;
-}
-
-#ground p {
-    margin-bottom:0;
-}
-
-
-
-img.license-logo {
-    margin: 6px 0 10px 0;
-}
-
-
 #askFormBar {
     display:inline-block;
     background-color: #e3e3e3;/*888a85; /*#e9b96e;*/
@@ -1022,25 +1002,13 @@ ul#searchTags {
 
 }
 
-/* ----- Question list Pager , check main_page/content.html and main_content/pager.html----- */
-
-
-#question-table,
-.answer-table {
-    margin: 2px 0 10px 0;
-    border-spacing: 0px;
-}
-
-.answer-table {
-    border-bottom: 1px solid #bbb;
-    clear: both;
-}
+/* ----- Question list Paginator , check main_content/pager.html and macros/utils_macros.html----- */
 
 .evenMore {
     font-size: 16px;
     color:@info-text;
-    padding:10px 0px 10px 0px;
-    clear:bot;
+    padding:15px 0px 10px 0px;
+    clear:both;
 }
 
 .evenMore a {
@@ -1048,11 +1016,7 @@ ul#searchTags {
     color:@link;
 }
 
-
-
 .pager {
-    clear:both;
-    border-top: 1px solid #777;
     margin-top: 10px;
     margin-bottom: 16px;
 }
@@ -1063,65 +1027,111 @@ ul#searchTags {
     float: right;
 }
 
-/** PAGINATOR **/
 .paginator {
     padding: 5px 0 10px 0;
-    font: normal 12px sans-serif;
-}
+    font-size:16px;
 
-.paginator .prev a, .paginator .prev a:visited,
-.paginator .next a, .paginator .next a:visited {
-    border: 1px solid #fff;
-    background-color: #fff;
-    color: #777;
-    padding: 2px 4px 3px 4px;
-    font: bold 100% sans-serif;
-}
+    .prev a, .prev a:visited,
+    .next a, .next a:visited {
+         background-color: #fff;
+        color: #777;
+        padding: 2px 4px 3px 4px;
+        font-family:@yanone;
+    }
+    a{
+        color:@section-title;
+    }
+    .prev {
+        margin-right: .5em;
+    }
 
-.paginator .prev {
-    margin-right: .5em;
-}
+    .next {
+        margin-left: .5em;
+    }
 
-.paginator .next {
-    margin-left: .5em;
-}
+    .page a, .page a:visited, .curr {
+        padding: .25em;
+        background-color: #fff;
+        margin: 0em .25em;
+        color: #ff;
+    }
 
-.paginator .page a, .paginator .page a:visited, .paginator .curr {
-    padding: .25em;
-    font: normal .875em verdana;
-    border: 1px solid #ccc;
-    background-color: #fff;
-    margin: 0em .25em;
-    color: #777;
-}
+    .curr {
+        background-color: #8ebcc7;
+        color: #fff;
+        font-weight: bold;
+    }
+    .next a, .prev a{
+        color:@section-title
+    }
+    .page a:hover,
+    .curr a:hover,
+    .prev a:hover,
+    .next a:hover {
+        color: #8C8C8C;
+        background-color: #E1E1E1;
+        text-decoration: none;
+    }
+
+    .text {
+        color: #777;
+        padding: .3em;
+    }
+
+    .paginator-container-left {
+        padding: 5px 0 10px 0;
+    }
 
-.paginator .curr {
-    background-color: #777;
-    color: #fff;
-    border: 1px solid #777;
-    font-weight: bold;
 }
 
-.paginator .page a:hover,
-.paginator .curr a:hover,
-.paginator .prev a:hover,
-.paginator .next a:hover {
-    color: #fff;
-    background-color: #777;
-    border: 1px solid #777;
-    text-decoration: none;
+/* ----- Footer links , check blocks/footer.html----- */
+
+#ground {
+    width: 100%;
+    clear: both;
+    border-top: 1px solid #000;
+    padding: 6px 0 0 0;
+    background: @header-color;
+    font-size:16px;
+
+    p {
+        margin-bottom:0;
+    }
 }
 
-.paginator .text {
-    color: #777;
-    padding: .3em;
-    font: bold 100% sans-serif;
+.footer-links {
+    color: #EEE;
+    text-align:left;
+    width:500px;
+    float:left;
+    a {
+        color: #e7e8a8;
+    }
 }
 
-.paginator-container-left {
-    padding: 5px 0 10px 0;
+.powered-link{
+    width:500px;
+    float:left;
+    text-align:left;
+    a{
+        color:#8ebcc7;
+    }
 }
 
+.copyright{
+    color:#616161;
+    width:450px;
+    float:right;
+    text-align:right;
+
+    a{
+        color:#8ebcc7;
+    }
+    img.license-logo {
+        margin: 6px 0px 20px 10px;
+        float:right;
+    }
+}
 
 .question-page p.rss {
     float:none;
@@ -1135,6 +1145,18 @@ ul#searchTags {
     vertical-align: top;
 }
 
+#question-table,
+.answer-table {
+    margin: 2px 0 10px 0;
+    border-spacing: 0px;
+}
+
+.answer-table {
+    border-bottom: 1px solid #bbb;
+    clear: both;
+}
+
+
 /* badges */
 a.medal {
     font-size: 14px;
@@ -2031,15 +2053,6 @@ ins .post-tag {
     color: #333;
 }
 
-.footerLinks {
-    color: #EEE;
-    font-size: 13px; /* letter-spacing:1px;*/
-}
-
-.footerLinks a {
-    color: #FFF;
-    font-size: 13px;
-}
 
 a.comment {
     background: #EEE;
diff --git a/askbot/skins/default/templates/blocks/footer.html b/askbot/skins/default/templates/blocks/footer.html
index 94c409ef..14f18786 100644
--- a/askbot/skins/default/templates/blocks/footer.html
+++ b/askbot/skins/default/templates/blocks/footer.html
@@ -1,53 +1,61 @@
 <!-- template footer.html -->
 <div id="ground">
-    <p class="footerLinks" >
-        <a href="{% url about %}">{% trans %}about{% endtrans %}</a><span class="link-separator"> |</span>
-        <a href="{% url faq %}">{% trans %}faq{% endtrans %}</a><span class="link-separator"> |</span>
-        <a href="{% url privacy %}">{% trans %}privacy policy{% endtrans %}</a><span class="link-separator"> |</span>
-        {% spaceless %}
-        <a href=
-                    {% if settings.FEEDBACK_SITE_URL %}
-                        "{{settings.FEEDBACK_SITE_URL}}"
-                        target="_blank">
-                    {% else %}
-                        "{% url feedback %}?next={{request.path}}">
-                    {% endif %}
-                    {% trans %}give feedback{% endtrans %}
+    <div class="content-wrapper">
+        {% if settings.USE_LICENSE %}{# could be factored out into separate template #}
+            {% if settings.LICENSE_USE_URL %}
+            <div class="copyright">
+                {% if settings.LICENSE_USE_LOGO %}
+                <a href="{{ settings.LICENSE_URL}}">
+                        <img
+                            class="license-logo"
+                            src="{{settings.LICENSE_LOGO_URL|media }}"
+                            title="{{settings.LICENSE_ACRONYM}}"
+                            alt="{{settings.LICENSE_ACRONYM}}"
+                        />
                 </a>
-                {% endspaceless %}
-    </p>
-    <p>
-        <a href="http://askbot.org" target="_blank">
-            Powered by Askbot version {{settings.ASKBOT_VERSION}}
-        </a>
-    </p>
-    {% if settings.USE_LICENSE %}{# could be factored out into separate template #}
-        {% if settings.LICENSE_USE_URL %}
-        <p>{{settings.APP_COPYRIGHT}} {% trans 
-                license_title=settings.LICENSE_TITLE,
-                license_url=settings.LICENSE_URL
-            %}Content on this site is licensed under a <a href="{{license_url}}">{{license_title}}</a> license.{% endtrans %}</p>
-            {% if settings.LICENSE_USE_LOGO %}
-            <a href="{{ settings.LICENSE_URL}}">
-                    <img
-                        class="license-logo"
-                        src="{{settings.LICENSE_LOGO_URL|media }}"
-                        title="{{settings.LICENSE_ACRONYM}}"
-                        alt="{{settings.LICENSE_ACRONYM}}"
-                    />
-            </a>
-            {% endif %}
-        {% else %}
-        <p>{{settings.APP_COPYRIGHT}} {% trans license=settings.LICENSE_TITLE %}Content on this site is licensed under a {{license}}{% endtrans %}</p>
-            {% if settings.LICENSE_USE_LOGO %}
-            <img 
-                class="license-logo"
-                src="{{settings.LICENSE_LOGO_URL|media }}"
-                title="{{settings.LICENSE_ACRONYM}}"
-                alt="{{settings.LICENSE_ACRONYM}}"
-            />
+                {% endif %}
+                {{settings.APP_COPYRIGHT}} {% trans 
+                    license_title=settings.LICENSE_TITLE,
+                    license_url=settings.LICENSE_URL
+                %}Content on this site is licensed under a <a href="{{license_url}}">{{license_title}}</a> license.{% endtrans %}
+
+            </div>
+            {% else %}
+            <div class="copyright">
+                {% if settings.LICENSE_USE_LOGO %}
+                <img 
+                    class="license-logo"
+                    src="{{settings.LICENSE_LOGO_URL|media }}"
+                    title="{{settings.LICENSE_ACRONYM}}"
+                    alt="{{settings.LICENSE_ACRONYM}}"
+                />
+                {% endif %}
+                {{settings.APP_COPYRIGHT}} {% trans license=settings.LICENSE_TITLE %}Content on this site is licensed under a {{license}}{% endtrans %}
+            </div>
             {% endif %}
         {% endif %}
-    {% endif %}
+        <div class="footer-links" >
+            <a href="{% url about %}">{% trans %}about{% endtrans %}</a><span class="link-separator"> |</span>
+            <a href="{% url faq %}">{% trans %}faq{% endtrans %}</a><span class="link-separator"> |</span>
+            <a href="{% url privacy %}">{% trans %}privacy policy{% endtrans %}</a><span class="link-separator"> |</span>
+            {% spaceless %}
+            <a href=
+                        {% if settings.FEEDBACK_SITE_URL %}
+                            "{{settings.FEEDBACK_SITE_URL}}"
+                            target="_blank">
+                        {% else %}
+                            "{% url feedback %}?next={{request.path}}">
+                        {% endif %}
+                        {% trans %}give feedback{% endtrans %}
+                    </a>
+                    {% endspaceless %}
+        </div>
+        <div class="powered-link">
+            <a href="http://askbot.org" target="_blank">
+                Powered by Askbot version {{settings.ASKBOT_VERSION}}
+            </a>
+        </div>
+        <div class="clean"></div>
+    </div>
 </div>
 <!-- end template footer.html -->
diff --git a/askbot/skins/default/templates/main_page/paginator.html b/askbot/skins/default/templates/main_page/paginator.html
index 070a8e34..b9ef1694 100644
--- a/askbot/skins/default/templates/main_page/paginator.html
+++ b/askbot/skins/default/templates/main_page/paginator.html
@@ -3,5 +3,6 @@
     <div id="pager" class="pager">
         {{ utils_macros.paginator(context|setup_paginator, position='left') }}
         {{ utils_macros.pagesize_switch(context, position='right') }}
+        <div class="clean"></div>
     </div>
 {% endif %}