summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--askbot/skins/default/media/images/sprites.pngbin9298 -> 13173 bytes
-rw-r--r--askbot/skins/default/media/style/style.css133
-rw-r--r--askbot/skins/default/templates/blocks/input_bar.html19
-rw-r--r--askbot/skins/default/templates/blocks/secundary_header.html2
-rw-r--r--askbot/skins/default/templates/one_column_body.html3
-rw-r--r--askbot/skins/default/templates/two_column_body.html5
6 files changed, 90 insertions, 72 deletions
diff --git a/askbot/skins/default/media/images/sprites.png b/askbot/skins/default/media/images/sprites.png
index 11dce169..dcc1bdc3 100644
--- a/askbot/skins/default/media/images/sprites.png
+++ b/askbot/skins/default/media/images/sprites.png
Binary files differ
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index 912156d6..983daf06 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -330,42 +330,104 @@ h1 {
}
+#searchBar {
+ display:inline-block;
+ background-color: #fff;
+ width:400px;
+ border: 1px solid #c9c9b5;
+ float:left;
+ height:42px;
+ margin:6px 0px 0px 15px;
+ .searchInput, .searchInputCancelable {
+ font-size: 18px;
+ height: 40px;
+ background:#FFF;
+ border:0px;
+ color:#c2c2c2;
+ padding-left:10px;
+ font-family: 'Yanone Kaffeesatz', sans-serif;
+ }
+ .searchInput, .searchInputCancelable {
+ width: 342px;
+ }
+ .searchInputCancelable {
+ width: 307px;
+ }
-.users-page h1, .tags-page h1 {
- float: left;
-}
-
-.main-page h1 {
- margin-right: 5px;
-}
-
+ .searchBtn {
+ font-size: 10px;
+ color: #666;
+ background-color: #eee;
+ height: 42px;
+ border:#FFF 1px solid;
+ line-height: 22px;
+ text-align: center;
+ float:right;
+ margin: 0px;
+ width:48px;
+ .sprites(-98px,-36px);
+ cursor:pointer;
+ }
+ .searchBtn:hover {
+ .sprites(-98px-48,-36px);
+ }
+ .cancelSearchBtn {
+ font-size: 30px;
+ color: #ce8888;
+ background:#fff;
+ height: 42px;
+ border:0px;
+ border-left:#deded0 1px solid;
+ text-align: center;
+ width: 35px;
+ cursor:pointer;
+ }
+ .cancelSearchBtn:hover {
+ color: #d84040;
+ }
+}
+/* ----- Content layout ----- */
-#CALeft {
+#ContentLeft {
width: 710px;
float: left;
position: relative;
- padding: 0 5px 10px 5px;
}
-#CARight {
+#ContentRight {
width: 230px;
float: right;
padding: 0 5px 10px 5px;
}
-#CAFull {
+#ContentFull {
float: left;
- padding: 0 5px 10px 5px;
width: 950px;
}
+
+.users-page h1, .tags-page h1 {
+ float: left;
+}
+
+.main-page h1 {
+ margin-right: 5px;
+}
+
+
+
+
+
+
+
+
#ground {
width: 100%;
clear: both;
@@ -386,51 +448,6 @@ img.license-logo {
}
-#searchBar {
- display:inline-block;
- background-color: #cccccc;/*888a85; /*#e9b96e;*/
- width:700px;
- border: 1px solid #aaaaaa;
- padding: 4px 5px 4px 4px;
-}
-
-#searchBar .searchInput, #searchBar .searchInputCancelable {
- font-size: 24px;
- line-height: 24px;
- height: 31px;
- margin: 0px 4px 0px 0px;
- padding: 5px 0 0 5px;
-}
-
-#searchBar .searchInput, #searchBar .searchInputCancelable {
- width: 607px;
-}
-
-#searchBar .searchInputCancelable {
- width: 564px;
-}
-
-#searchBar .searchBtn, #searchBar .cancelSearchBtn {
- font-size: 20px;
- color: #666;
- background-color: #eee;
- height: 40px;
- border: 1px solid #aaa;
- line-height: 22px;
- text-align: center;
- padding-bottom: 4px;
-}
-
-#searchBar .searchBtn {
- margin: 0px;
- width: 78px;
-}
-
-#searchBar .cancelSearchBtn {
- width: 40px;
- margin: 0px 3px 0px 0px;
-}
-
#askFormBar {
display:inline-block;
background-color: #e3e3e3;/*888a85; /*#e9b96e;*/
diff --git a/askbot/skins/default/templates/blocks/input_bar.html b/askbot/skins/default/templates/blocks/input_bar.html
index bed97eb4..55917fbc 100644
--- a/askbot/skins/default/templates/blocks/input_bar.html
+++ b/askbot/skins/default/templates/blocks/input_bar.html
@@ -11,6 +11,14 @@
action="{% url questions %}"
{% endif %}
method="get">
+ <input type="submit" value="" name="search" class="searchBtn" />
+ {% if active_tab == "tags" %}
+ <input type="hidden" name="t" value="tag"/>
+ {% else %}
+ {% if active_tab == "users" %}
+ <input type="hidden" name="t" value="user"/>
+ {% endif %}
+ {% endif %}
{# class was searchInput #}
<input
{% if query %}
@@ -25,20 +33,13 @@
id="keywords"/>
{% if query %}{# query is only defined by questions view #}
<input type="button"
- value="x"
+ value="X"
name="reset_query"
{# todo - make sure it works on Enter keypress #}
onclick="window.location.href='{% url questions %}?reset_query=true'"
class="cancelSearchBtn"/>
{% endif %}
- <input type="submit" value="{% trans %}search{% endtrans %}" name="search" class="searchBtn" />
- {% if active_tab == "tags" %}
- <input type="hidden" name="t" value="tag"/>
- {% else %}
- {% if active_tab == "users" %}
- <input type="hidden" name="t" value="user"/>
- {% endif %}
- {% endif %}
+
</form>
</div>
{% endspaceless %}
diff --git a/askbot/skins/default/templates/blocks/secundary_header.html b/askbot/skins/default/templates/blocks/secundary_header.html
index 7b634811..563d3883 100644
--- a/askbot/skins/default/templates/blocks/secundary_header.html
+++ b/askbot/skins/default/templates/blocks/secundary_header.html
@@ -11,6 +11,8 @@
<a class="scope-selector {% if scope == 'favorite' %}on{% endif %}"
href="?scope=favorite" title="{% trans %}see your followed questions{% endtrans %}">FOLLOWED</a>
{% endif %}
+
+ {% include "blocks/input_bar.html" %} {# include search form block #}
<div class="clean"></div>
</div>
</div>
diff --git a/askbot/skins/default/templates/one_column_body.html b/askbot/skins/default/templates/one_column_body.html
index e97de505..852f8fe5 100644
--- a/askbot/skins/default/templates/one_column_body.html
+++ b/askbot/skins/default/templates/one_column_body.html
@@ -1,8 +1,7 @@
{% extends "base.html" %}
{% block body_class %}one-col{% endblock %}
{% block body %}
-<div id="CAFull">
- {% include "blocks/input_bar.html" %}
+<div id="ContentFull">
{% block content%}
{% endblock%}
</div>
diff --git a/askbot/skins/default/templates/two_column_body.html b/askbot/skins/default/templates/two_column_body.html
index a284744e..4c3193be 100644
--- a/askbot/skins/default/templates/two_column_body.html
+++ b/askbot/skins/default/templates/two_column_body.html
@@ -1,12 +1,11 @@
{% extends "base.html" %}
{% block body_class %}two-col{% endblock %}
{% block body %}
-<div id="CALeft">
- {% include "blocks/input_bar.html" %}
+<div id="ContentLeft">
{% block content%}
{% endblock%}
</div>
-<div id="CARight">
+<div id="ContentRight">
{% block sidebar%}
{% endblock%}
</div>
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 18:21:34 +0000