Commit ee961ba5 authored by Giuseppe Terrasi's avatar Giuseppe Terrasi

parents f7605306 6f8f63cc
...@@ -12,14 +12,6 @@ body { ...@@ -12,14 +12,6 @@ body {
min-width: 985px; min-width: 985px;
margin: 0 1px 0 0; margin: 0 1px 0 0;
padding: 0; padding: 0;
scrollbar-3dlight-color: orange;
scrollbar-arrow-color: #313131;
scrollbar-base-color: red;
scrollbar-darkshadow-color: #80FFFF;
scrollbar-face-color: red;
scrollbar-highlight-color: rgb(50,0,1);
scrollbar-shadow-color: rgb(112,22,21);
scrollbar-track-color: black;
} }
div { div {
...@@ -165,6 +157,10 @@ blockquote blockquote { ...@@ -165,6 +157,10 @@ blockquote blockquote {
padding: 0; padding: 0;
} }
#main-body {
clear: both;
}
.shadowed { .shadowed {
box-shadow: 0 1px 3px #989898; box-shadow: 0 1px 3px #989898;
-webkit-box-shadow: 0 1px 3px #989898; -webkit-box-shadow: 0 1px 3px #989898;
...@@ -371,6 +367,7 @@ padding-top: 4px; ...@@ -371,6 +367,7 @@ padding-top: 4px;
-webkit-box-shadow: 0 1px 1px #DFDFDF; -webkit-box-shadow: 0 1px 1px #DFDFDF;
-moz-box-shadow: 0 1px 1px #DFDFDF; -moz-box-shadow: 0 1px 1px #DFDFDF;
font-size: 12px; font-size: 12px;
min-width: 974px;
} }
#top { #top {
...@@ -438,11 +435,10 @@ padding-top: 4px; ...@@ -438,11 +435,10 @@ padding-top: 4px;
color: black; color: black;
} }
#listA { #listA {
float: left; float: left;
padding: 0 0; padding: 0 0;
width: auto; width: 100%;
} }
.thousand { .thousand {
...@@ -470,6 +466,7 @@ padding-top: 4px; ...@@ -470,6 +466,7 @@ padding-top: 4px;
color: #DD4814; color: #DD4814;
font-family: "Trebuchet MS", "segoe ui", arial, sans-serif; font-family: "Trebuchet MS", "segoe ui", arial, sans-serif;
font-size: 17px; font-size: 17px;
float: left;
} }
.short-summary .userinfo { .short-summary .userinfo {
...@@ -494,15 +491,16 @@ padding-top: 4px; ...@@ -494,15 +491,16 @@ padding-top: 4px;
font-weight: bold; font-weight: bold;
} }
.short-summary .question-summary-wrapper { /*.short-summary .question-summary-wrapper {
float: left;
width: 100%;
}*/
.short-summary-title {
float: left; float: left;
width: 565px;
} }
.short-summary .votes, .short-summary .status, .short-summary .views { .short-summary .votes, .short-summary .status, .short-summary .views {
-moz-border-radius: 5px 5px 5px 5px;
border-bottom: 1px solid #CCCCCC;
border-right: 1px solid #CCCCCC;
float: left; float: left;
font-size: 11px; font-size: 11px;
height: 42px; height: 42px;
...@@ -619,31 +617,36 @@ padding-top: 4px; ...@@ -619,31 +617,36 @@ padding-top: 4px;
} }
.paginator .page, .paginator .page a:visited, .paginator .curr { .paginator .page, .paginator .page a:visited, .paginator .curr {
background-color: #FFFFFF; background-color: white;
border: 1px solid #CCCCCC; border: 1px solid #DD4818;
color: #777777; color: #DD4818;
font: 0.875em verdana; font: 0.875em Ubuntu;
margin: 0 0.25em; margin: 0 0.25em;
padding: 0.25em; padding: 0.25em;
} }
.paginator .curr { .paginator .curr {
background-color: #777777; background-color: #DD4818;
border: 1px solid #777777; border: 1px solid #DD4818;
color: #FFFFFF; color: #FFFFFF;
font-weight: bold; font-weight: bold;
} }
.paginator .page:hover, .paginator .prev a:hover, .paginator .next a:hover { .paginator .page:hover, .paginator .prev a:hover, .paginator .next a:hover {
background-color: #777777; background-color: #DD4818;
border: 1px solid #777777; border: 1px solid #DD4818;
color: #FFFFFF; color: white !important;
text-decoration: none;
}
.paginator .page:hover a {
color: white;
text-decoration: none; text-decoration: none;
} }
.paginator .text { .paginator .text {
color: #777777; color: #777777;
font: bold 100% sans-serif; font: bold 100% Ubuntu;
padding: 0.3em; padding: 0.3em;
} }
...@@ -658,7 +661,12 @@ padding-top: 4px; ...@@ -658,7 +661,12 @@ padding-top: 4px;
margin-top: 5px; margin-top: 5px;
} }
.tags a, span.tag { .tags-summary {
font-family: sans-serif;
float: left;
}
.tags a, span.tag, .tags-summary a {
background-color: #EEEEEE; background-color: #EEEEEE;
border-bottom: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC;
border-right: 1px solid #CCCCCC; border-right: 1px solid #CCCCCC;
...@@ -670,14 +678,15 @@ padding-top: 4px; ...@@ -670,14 +678,15 @@ padding-top: 4px;
white-space: nowrap; white-space: nowrap;
} }
.tags a:hover { .tags a:hover, .tags-summary a:hover {
background-color: #356FCB; background-color: #DD4818;
color: #FFFFFF; color: #FFFFFF;
} }
.tag-number { .tag-number {
font-family: sans-serif; font-family: sans-serif;
font-weight: 700; font-weight: 700;
margin-right: 25px;
} }
.marked-tags { .marked-tags {
...@@ -754,7 +763,7 @@ a.medal:hover { ...@@ -754,7 +763,7 @@ a.medal:hover {
.tabsA a.on, .tabsA a:hover { .tabsA a.on, .tabsA a:hover {
background: none repeat scroll 0 0 #FFFFFF; background: none repeat scroll 0 0 #FFFFFF;
color: #A40000; color: #DD4818;
} }
.tabsA a:hover { .tabsA a:hover {
...@@ -822,7 +831,8 @@ a.medal:hover { ...@@ -822,7 +831,8 @@ a.medal:hover {
font-weight: 800; font-weight: 800;
margin-bottom: 12px; margin-bottom: 12px;
padding: 5px; padding: 5px;
text-align: left; float: left;
width: auto;
} }
.questions-related { .questions-related {
...@@ -896,18 +906,29 @@ div.question-body p, div.answer-body p { ...@@ -896,18 +906,29 @@ div.question-body p, div.answer-body p {
} }
.answered { .answered {
background: none repeat scroll 0 0 #E5EBF8; background-image: url(../images/light/answered.png);
color: #314362; background-repeat: no-repeat;
color: black;
} }
.answered-accepted, .answer-votes.answered-accepted { .answered-accepted, .answer-votes.answered-accepted {
background: none repeat scroll 0 0 #E6F8DD; background-image: url(../images/light/answered-accepted.png);
color: #3A6231; background-repeat: no-repeat;
color: white;
} }
.unanswered { .unanswered {
background: none repeat scroll 0 0 #F3E3E1; background: url(../images/light/unanswered.png);
color: #6B2B28; background-repeat: no-repeat;
color: white;
}
.answer-summary .answered {
background-color: #DD4818;
}
.answer-summary .answered-accepted {
background-color: #2DB651;
} }
.focusedAnswer { .focusedAnswer {
...@@ -961,7 +982,7 @@ div.question-body p, div.answer-body p { ...@@ -961,7 +982,7 @@ div.question-body p, div.answer-body p {
} }
#medalList .intoMyBadges { #medalList .intoMyBadges {
float: left; float: left;
min-width: 5%; min-width: 25px;
text-align: right; text-align: right;
height:30px; height:30px;
} }
...@@ -1166,6 +1187,7 @@ ins { ...@@ -1166,6 +1187,7 @@ ins {
.relativetime { .relativetime {
text-decoration: none; text-decoration: none;
float: right;
} }
.answer-summary { .answer-summary {
...@@ -2031,7 +2053,13 @@ div.dialog.prompt .dialog-content select, div.dialog.prompt .dialog-content text ...@@ -2031,7 +2053,13 @@ div.dialog.prompt .dialog-content select, div.dialog.prompt .dialog-content text
.feed-icon { .feed-icon {
width: 14px; width: 14px;
height: 14px; height: 14px;
display: inline-block; float: left;
}
.feed-icon-big {
width: 28px;
height: 28px;
float: left;
} }
div#subscription_list { div#subscription_list {
......
...@@ -89,10 +89,10 @@ ...@@ -89,10 +89,10 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div id="main-bar" class="headNormal"> <div id="main-bar" class="headUser" >
{% trans "Ask a question" %} {% trans "Ask a question" %}
</div> </div>
<div id="main-body" class="ask-body"> <div id="main-body" class="ask-body" style="clear:both;">
<div id="askform"> <div id="askform">
<form id="fmask" action="" method="post" accept-charset="utf-8"> <form id="fmask" action="" method="post" accept-charset="utf-8">
{% csrf_token %} {% csrf_token %}
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
{{ provider.pre_code|safe }} {{ provider.pre_code|safe }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<div class="headNormal"> <div class="headUser">
{% trans "User login" %} {% trans "User login" %}
</div> </div>
{% if msg %} {% if msg %}
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
{% if top_stackitem_providers %} {% if top_stackitem_providers %}
<h3 class="or_label">{% trans 'Or...' %}</h3> <h3 class="or_label">{% trans 'Or...' %}</h3>
{% endif %} {% endif %}
<div style="width:600px;float:left;margin-bottom:5px;"> <div style="width:600px;float:left;margin-bottom:5px;clear:both;">
{% blocktrans %} {% blocktrans %}
External login services use <b><a href="http://openid.net/">OpenID</a></b> technology, where your password always stays confidential between External login services use <b><a href="http://openid.net/">OpenID</a></b> technology, where your password always stays confidential between
you and your login provider and you don't have to remember another one. you and your login provider and you don't have to remember another one.
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="headUser"> <div class="headUser">
{% trans "Badges" %} {% trans "Badges" %}
</div> </div>
<div class="badges" id="main-body" style="width:100%"> <div class="badges" id="main-body" style="width:100%; clear: both;">
<p> <p>
{% trans "Community gives you awards for your questions, answers and votes." %} {% trans "Community gives you awards for your questions, answers and votes." %}
{% blocktrans %}Below is the list of available badges and number of times each type of badge has been awarded. {% blocktrans %}Below is the list of available badges and number of times each type of badge has been awarded.
......
...@@ -20,21 +20,23 @@ ...@@ -20,21 +20,23 @@
</div> </div>
</div> </div>
<div class="question-summary-wrapper"> <div class="userinfo">
<h2><a {% if not question_summary %}title="{{ question.summary }}"{% endif %} href="{{ question.get_absolute_url }}">{{question.headline}}</a></h2> {% if question.last_activity_by %}{% user_signature question.last_activity_by signature_type %}{% endif %} <br/>
<span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>
</div>
<div class="short-summary-title">
<h2><a {% if not question_summary %}title="{{ question.summary }}"{% endif %} href="{{ question.get_absolute_url }}">{% if question.headline|wordcount >= 10 %} {{ question.headline|truncatewords:10 }} {% else %} {{ question.headline }} {% endif %} </a></h2>
{% if question_summary %} {% if question_summary %}
<div class="summary"> <div class="summary">
{{ question.summary }} {{ question.summary }}
</div> </div>
{% endif %} {% endif %}
<div class="userinfo">
<span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>
{% if question.last_activity_by %}{% user_signature question.last_activity_by signature_type %}{% endif %}
</div> </div>
<div class="tags">{% for tag in question.tagname_list %} <br/><br/>
<div class="tags-summary">{% for tag in question.tagname_list %}
<a class="tag-link-{{ tag }}" href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}'" rel="tag">{{ tag }}</a>{% endfor %} <a class="tag-link-{{ tag }}" href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}'" rel="tag">{{ tag }}</a>{% endfor %}
</div> </div>
</div>
</div> </div>
{% load i18n %} {% load i18n %}
<div class="headQuestions"> <div class="headUser">
{% if searchtag %} {% if searchtag %}
{% trans "Found by tags" %} {% trans "Found by tags" %}
{% else %} {% else %}
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="tabBar"> <div class="tabBar">
{% include "question_list/title.html" %} {% include "question_list/title.html" %}
<a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');" href="{{ feed_url }}" title="{% trans "subscribe to question RSS feed" %}"></a> <a class="feed-icon-big" style="background-image:url('{% media "media/images/feed-icon.png" %}');" href="{{ feed_url }}" title="{% trans "subscribe to question RSS feed" %}"></a>
{{ questions.paginator.sort_tabs }} {{ questions.paginator.sort_tabs }}
</div> </div>
<div id="listA">{% for question in questions.paginator.page %} <div id="listA">{% for question in questions.paginator.page %}
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
{% block content %} {% block content %}
<!-- Tabs --> <!-- Tabs -->
<div class="tabBar"> <div class="tabBar">
<div class="headQuestions">{% trans "Tag list" %}</div> <div class="headUser">{% trans "Tag list" %}</div>
{{ tags.paginator.sort_tabs }} {{ tags.paginator.sort_tabs }}
</div> </div>
<div id="searchtags"> <div id="searchtags">
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
{% load humanize %} {% load humanize %}
{% load question_list_tags %} {% load question_list_tags %}
{% block usercontent %} {% block usercontent %}
<a class="feed-icon-big" style="background-image:url('{% media "media/images/feed-icon.png" %}');"
href="{{ view_user.get_asked_url }}?type=rss" title="{% trans "subscribe to question RSS feed" %}"></a>
<div id="questionsBlock" class="userSection"> <div id="questionsBlock" class="userSection">
<a name="questions"></a> <a name="questions"></a>
{% spaceless %} {% spaceless %}
...@@ -15,12 +17,10 @@ ...@@ -15,12 +17,10 @@
{% plural %} {% plural %}
<span class="count">{{counter}}</span> Questions <span class="count">{{counter}}</span> Questions
{% endblocktrans %} {% endblocktrans %}
<a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');"
href="{{ view_user.get_asked_url }}?type=rss" title="{% trans "subscribe to question RSS feed" %}"></a>
</h2> </h2>
{% endspaceless %} {% endspaceless %}
<div id="questionTabs">{{ questions.paginator.sort_tabs }}</div> <div id="questionTabs">{{ questions.paginator.sort_tabs }}</div>
<div id="listA" class="user-stats-table"> <div id="listA">
{% for question in questions.paginator.page %} {% for question in questions.paginator.page %}
{% question_list_item question favorite_count=yes signature_type=badges %} {% question_list_item question favorite_count=yes signature_type=badges %}
{% endfor %} {% endfor %}
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
</h2> </h2>
{% endspaceless %} {% endspaceless %}
<div id="answerTabs">{{ answers.paginator.sort_tabs }}</div> <div id="answerTabs">{{ answers.paginator.sort_tabs }}</div>
<div class="user-stats-table">
{% for answer in answers.paginator.page %} {% for answer in answers.paginator.page %}
<div class="answer-summary"> <div class="answer-summary">
<a title="{{answer.question.title}}" <a title="{{answer.question.title}}"
...@@ -59,7 +58,6 @@ ...@@ -59,7 +58,6 @@
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
</div>
<br clear="all"/> <br clear="all"/>
<div class="pager">{{ answers.paginator.page_numbers }}</div> <div class="pager">{{ answers.paginator.page_numbers }}</div>
<br clear="all"/> <br clear="all"/>
...@@ -76,7 +74,6 @@ ...@@ -76,7 +74,6 @@
{% endblocktrans %} {% endblocktrans %}
</h2> </h2>
{% endspaceless %} {% endspaceless %}
<div class="user-stats-table">
<table> <table>
<tr> <tr>
<td width="60"> <td width="60">
...@@ -91,7 +88,6 @@ ...@@ -91,7 +88,6 @@
</td> </td>
</tr> </tr>
</table> </table>
</div>
<a name="tags"></a> <a name="tags"></a>
{% spaceless %} {% spaceless %}
<h2> <h2>
...@@ -102,7 +98,6 @@ ...@@ -102,7 +98,6 @@
{% endblocktrans %} {% endblocktrans %}
</h2> </h2>
{% endspaceless %} {% endspaceless %}
<div class="user-stats-table">
<table class="tags"> <table class="tags">
<tr style="vertical-align: top;"> <tr style="vertical-align: top;">
<td valign="top" style="padding-right: 20px;"> <td valign="top" style="padding-right: 20px;">
...@@ -111,16 +106,17 @@ ...@@ -111,16 +106,17 @@
class="tag-link-{{ tag.name }}" class="tag-link-{{ tag.name }}"
title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}" title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}"
href="{% url tag_questions tag|urlencode %}?user={{view_user.username}}">{{tag.name}}</a> href="{% url tag_questions tag|urlencode %}?user={{view_user.username}}">{{tag.name}}</a>
<span class="tag-number">&#215; {{ tag.user_tag_usage_count|intcomma }}</span><br/> <span class="tag-number">&#215; {{ tag.user_tag_usage_count|intcomma }}</span>
{% if forloop.counter|divisibleby:"10" %} {% if forloop.counter|divisibleby:"5" %}
</td> </td>
</tr>
<tr>
<td width="180" valign="top"> <td width="180" valign="top">
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</td> </td>
</tr> </tr>
</table> </table>
</div>
<a name="badges"></a> <a name="badges"></a>
{% spaceless %} {% spaceless %}
<h2> <h2>
...@@ -131,7 +127,6 @@ ...@@ -131,7 +127,6 @@
{% endblocktrans %} {% endblocktrans %}
</h2> </h2>
{% endspaceless %} {% endspaceless %}
<div class="user-stats-table">
<table> <table>
<tr style="vertical-align: top;"> <tr style="vertical-align: top;">
<td style="line-height:35px; padding-right: 20px;"> <td style="line-height:35px; padding-right: 20px;">
...@@ -152,6 +147,5 @@ ...@@ -152,6 +147,5 @@
</td> </td>
</tr> </tr>
</table> </table>
</div>
{% endblock %} {% endblock %}
<!-- end user_stats.html --> <!-- end user_stats.html -->
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment