summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron <byroncorrales@gmail.com>2011-09-29 00:54:34 -0600
committerByron <byroncorrales@gmail.com>2011-09-29 00:54:34 -0600
commit14e2096c6dadd3075c3d3f2e26f1a7eff8495612 (patch)
tree87c3214994abd24d80e8f8cb53b2c566ca4f0f69
parent29186eb8d22106a6ea211cc8d4fe805078b95230 (diff)
downloadaskbot-14e2096c6dadd3075c3d3f2e26f1a7eff8495612.tar.gz
askbot-14e2096c6dadd3075c3d3f2e26f1a7eff8495612.tar.bz2
askbot-14e2096c6dadd3075c3d3f2e26f1a7eff8495612.zip
placing meta-nav in correct position
Diffstat
-rw-r--r--askbot/skins/default/media/images/sprites.pngbin2840 -> 6090 bytes
-rw-r--r--askbot/skins/default/media/style/style.css73
-rw-r--r--askbot/skins/default/templates/base.html3
-rw-r--r--askbot/skins/default/templates/blocks/header.html7
-rw-r--r--askbot/skins/default/templates/blocks/secundary_header.html3
-rw-r--r--askbot/skins/default/templates/blocks/user_navigation.html (renamed from askbot/skins/default/templates/blocks/header_meta_links.html)0
6 files changed, 46 insertions, 40 deletions
diff --git a/askbot/skins/default/media/images/sprites.png b/askbot/skins/default/media/images/sprites.png
index 2a9d1abd..46a8ff8e 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 d36f1c87..63e912f1 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -204,7 +204,7 @@ h1 {
padding: 5px 0px 5px 0px;
}
-#user-tools-navigation {
+#user-tools-nav {
height: 20px;
position:absolute;
bottom: 0;
@@ -212,7 +212,7 @@ h1 {
padding-bottom:5px;
}
-#user-tools-navigation a {
+#user-tools-nav a {
height: 35px;
text-align: right;
margin-left: 20px;
@@ -221,48 +221,40 @@ h1 {
font-size:16px;
}
-#user-tools-navigation a:first-child {
+#user-tools-nav a:first-child {
margin-left: 0;
}
-#user-tools-navigation a#ab-responses {
+#user-tools-nav a#ab-responses {
margin-left: 3px;
}
-#user-tools-navigation .user-info,
-#user-tools-navigation .user-micro-info{
+#user-tools-nav .user-info,
+#user-tools-nav .user-micro-info{
color:#b5b593;
}
-#user-tools-navigation a img {
+#user-tools-nav a img {
vertical-align:middle;
margin-bottom:2px;
}
-#user-tools-navigation .user-info a {
+#user-tools-nav .user-info a {
margin: 0;
text-decoration: none;
}
-#main-nav {
- position: absolute;
- left: 100px;
-}
-
-#main-nav {
- bottom: 0;
+#meta-nav {
+ float:right;
}
-#main-nav a {
- color: #333333;
- background-color: #fff0e0;
- border: 1px solid #888888;
- border-bottom: none;
- padding: 0px 12px 3px 12px;
+#meta-nav a {
+ color: #e2e2ae;
+ padding: 0px 0px 0px 35px;
height: 25px;
line-height: 30px;
- margin-right: 10px;
+ margin:5px 10px 0px 0px;
font-size: 18px;
font-weight: 100;
text-decoration: none;
@@ -270,34 +262,45 @@ h1 {
float: left;
}
-#main-nav a:hover {
+#meta-nav a:hover {
text-decoration: underline;
}
-#main-nav a.on {
- height: 24px;
- line-height: 28px;
- border-bottom: 1px solid #a40000;
- border-right: 1px solid #820000;
- border-top: 1px solid #d40000;
- border-left: 1px solid #d40000; /*background:#A31E39; */
- background: #b03a48;
+#meta-nav a.on {
+ font-weight:bold;
color: #FFF;
- font-weight: 800;
- text-decoration: none
+ text-decoration: none;
}
-#main-nav a.special {
+#meta-nav a.special {
font-size: 18px;
color: #B02B2C;
font-weight: bold;
text-decoration: none;
}
-#main-nav a.special:hover {
+#meta-nav a.special:hover {
text-decoration: underline;
}
+#meta-nav #nav_tags{
+ background: url(../images/sprites.png) -50px -5px no-repeat;
+}
+
+#meta-nav #nav_users{
+ background: url(../images/sprites.png) -125px -5px no-repeat;
+}
+
+#meta-nav #nav_badges{
+ background: url(../images/sprites.png) -210px -5px no-repeat;
+}
+
+#secundary-header{
+ height:55px;
+ background:#e9e9e1;
+ border-bottom:#d3d3c2 1px solid;
+ margin-bottom:10px;
+}
.users-page h1, .tags-page h1 {
float: left;
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index 42a8daf4..9bcaf93f 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -47,7 +47,8 @@
<body class="{% block body_class %}{% endblock %}{% if page_class %} {{page_class}}{% endif %}">
{% include "blocks/system_messages.html" %}
{% include "custom_header.html" ignore missing %}
- {% include "blocks/header.html" %}
+ {% include "blocks/header.html" %} {# Logo, user tool navigation and meta navitation #}
+ {% include "blocks/secundary_header.html" %} {# Scope selector, search input and ask button #}
<div class="content-wrapper">
{% block body %}
{% endblock %}
diff --git a/askbot/skins/default/templates/blocks/header.html b/askbot/skins/default/templates/blocks/header.html
index 1a4deb58..d162078f 100644
--- a/askbot/skins/default/templates/blocks/header.html
+++ b/askbot/skins/default/templates/blocks/header.html
@@ -8,12 +8,12 @@
title="{% trans %}back to home page{% endtrans %}"
alt="{% trans site=settings.APP_SHORT_NAME %}{{site}} logo{% endtrans %}"/></a>
{% endif %}
- <div id="user-tools-navigation">
- {% include "blocks/header_meta_links.html" %}
+ <div id="user-tools-nav">
+ {% include "blocks/user_navigation.html" %}
{{settings.CUSTOM_HEADER}}
</div>
- <div id="main-nav">
+ <div id="meta-nav">
<!--
<a
id="nav_questions"
@@ -44,7 +44,6 @@
>{% trans %}ask a question{% endtrans %}</a>
-->
</div>
-
<div class="clean"></div>
</div>
</div>
diff --git a/askbot/skins/default/templates/blocks/secundary_header.html b/askbot/skins/default/templates/blocks/secundary_header.html
new file mode 100644
index 00000000..a34f3c30
--- /dev/null
+++ b/askbot/skins/default/templates/blocks/secundary_header.html
@@ -0,0 +1,3 @@
+<!-- template secundary_header.html -->
+<div id="secundary-header">
+</div>
diff --git a/askbot/skins/default/templates/blocks/header_meta_links.html b/askbot/skins/default/templates/blocks/user_navigation.html
index 2324291d..2324291d 100644
--- a/askbot/skins/default/templates/blocks/header_meta_links.html
+++ b/askbot/skins/default/templates/blocks/user_navigation.html
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 16:25:31 +0000