From 4d1bb62eadf82829aad37825d6ef9653d99837b7 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev
Date: Sat, 14 Jul 2012 13:45:36 -0400
Subject: fixed display glitch in the closed question
---
askbot/skins/default/templates/question/content.html | 5 -----
askbot/skins/default/templates/question/question_card.html | 6 ++++++
askbot/skins/default/templates/reopen.html | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/askbot/skins/default/templates/question/content.html b/askbot/skins/default/templates/question/content.html
index 58b1bcca..906b1953 100644
--- a/askbot/skins/default/templates/question/content.html
+++ b/askbot/skins/default/templates/question/content.html
@@ -3,11 +3,6 @@
{# ==== BEGIN: question/question_card.html ==== #}
{% include "question/question_card.html" %}
{# ==== END: question/question_card.html ==== #}
-{% if thread.closed %}
- {# ==== START: question/closed_question_info.html ==== #}
- {% include "question/closed_question_info.html" %}
- {# ==== END: question/closed_question_info.html ==== #}
-{% endif %}
{% if answers %}
diff --git a/askbot/skins/default/templates/question/question_card.html b/askbot/skins/default/templates/question/question_card.html
index dd52ea0f..c787bf34 100644
--- a/askbot/skins/default/templates/question/question_card.html
+++ b/askbot/skins/default/templates/question/question_card.html
@@ -25,6 +25,12 @@
}
})();
+ {% if thread.closed %}
+
+ {# ==== START: question/closed_question_info.html ==== #}
+ {% include "question/closed_question_info.html" %}
+ {# ==== END: question/closed_question_info.html ==== #}
+ {% endif %}
{% include "question/question_comments.html" %}
diff --git a/askbot/skins/default/templates/reopen.html b/askbot/skins/default/templates/reopen.html
index 52d926ce..4ddd6f31 100644
--- a/askbot/skins/default/templates/reopen.html
+++ b/askbot/skins/default/templates/reopen.html
@@ -9,8 +9,8 @@
{{ question.get_question_title()|escape }}
-{% trans %}This question has been closed by
- {{closed_by_username|escape}}
+
{% trans username = closed_by_username|escape %}This question has been closed by
+ {{username}}
{% endtrans %}
--
cgit v1.2.3-1-g7c22
From 16a80edf18fcd95dfd3d5611be38412718b2d921 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev
Date: Sun, 15 Jul 2012 15:51:43 -0400
Subject: fixed the broken "follow user" function
---
askbot/skins/default/templates/macros.html | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html
index 3e463c1c..261c860f 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros.html
@@ -6,23 +6,6 @@
>{% if icon == False %}{% if site_label %}{{ site_label }}{% else %}{{ site }}{% endif %}{% endif %}
{%- endmacro -%}
-{%- macro follow_toggle(follow, name, alias, id) -%}
- {# follow - boolean; name - object type name; alias - e.g. users name; id - object id #}
-
- {% if follow %}
-
{% trans %}follow {{alias}}{% endtrans %}
- {% else %}
-
-
{% trans %}unfollow {{alias}}{% endtrans %}
-
{% trans %}following {{alias}}{% endtrans %}
-
- {% endif %}
-
-{%- endmacro -%}
-
{%- macro inbox_post_snippet(response, inbox_section) -%}
@@ -530,8 +513,8 @@ answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_
{%- macro follow_toggle(follow, name, alias, id) -%}
{# follow - boolean; name - object type name; alias - e.g. users name; id - object id #}
{% if follow %}
{% trans %}follow {{alias}}{% endtrans %}
--
cgit v1.2.3-1-g7c22
From f3feb51bea6f6d94ba0d66b8493682fbe0cb0558 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev
Date: Sun, 15 Jul 2012 19:52:59 -0400
Subject: first pass on switching fro Yanone Kaffeesatz to Open Sans Condensed
---
askbot/skins/default/media/style/lib_style.less | 2 +-
askbot/skins/default/media/style/style.less | 82 +++++++++++-----------
.../templates/meta/html_head_stylesheets.html | 3 +-
3 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less
index 63389526..14dcc4bc 100644
--- a/askbot/skins/default/media/style/lib_style.less
+++ b/askbot/skins/default/media/style/lib_style.less
@@ -14,7 +14,7 @@
@body-font:Arial; /* "Trebuchet MS", sans-serif;*/
@sort-font:Georgia, serif;
-@main-font:'Yanone Kaffeesatz', Arial, sans-serif;
+@main-font:'Open Sans Condensed', Arial, sans-serif;
@secondary-font:Arial;
/* Buttons */
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index ea404391..dfda8ec0 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -270,12 +270,13 @@ body.user-messages {
#metaNav {/* Top Navigation bar containing links for tags, people and badges, check widgets/header.html */
float: right;/* for #header.with-logo it is modified */
+ margin-right: 7px;
a {
color: #e2e2ae;
padding: 0px 0px 0px 35px;
height: 25px;
- line-height: 30px;
+ line-height: 25px;
margin:5px 0px 0px 10px;
font-size: 18px;
font-weight: 100;
@@ -368,11 +369,11 @@ body.user-messages {
}
.scope-selector{
- font-size:21px;
- color:#5a5a4b;
+ font-size:20px;
+ color:#7a7a6b;
height:55px;
line-height:55px;
- margin-left:24px
+ margin-left:16px
}
.on{
background:url(../images/scopearrow.png) no-repeat center bottom;
@@ -385,9 +386,9 @@ body.user-messages {
}
#searchBar { /* Main search form , check widgets/search_bar.html */
- display:inline-block;
+ display: inline-block;
background-color: #fff;
- width:412px;
+ width: 400px;
border: 1px solid #c9c9b5;
float:right;
height:42px;
@@ -395,7 +396,7 @@ body.user-messages {
.searchInput, .searchInputCancelable{
font-size: 30px;
- height: 40px;
+ height: 39px;
font-weight:300;
background:#FFF;
border:0px;
@@ -406,7 +407,7 @@ body.user-messages {
}
.searchInput,{
- width: 352px;
+ width: 340px;
}
.searchInputCancelable {
@@ -472,7 +473,7 @@ body.anon {
margin-top:6px;
float:right;
text-transform:uppercase;
- .button-style(200px, 42px, 23px);
+ .button-style(200px, 42px, 20px);
}
#askButton:hover{
@@ -546,12 +547,10 @@ body.anon {
label {
color: @info-text;
font-size:15px;
- display: block;
- float: right;
+ vertical-align: bottom;
+ display: inline;
text-align:left;
font-family:@main-font;
- width:80px;
- margin-right:18px;
}
#displayTagFilterControl label,
@@ -659,7 +658,7 @@ body.anon {
/* notify by email box */
.notify-sidebar #question-subscribe-sidebar {
- margin: 7px 0 0 3px;
+ margin: 0 0 0 3px;
}
}
@@ -813,12 +812,12 @@ body.anon {
#questionCount{
font-weight:bold;
- font-size:23px;
+ font-size:20px;
color:@section-title;
width:200px;
float:left;
- margin-bottom:8px;
- padding-top:6px;
+ margin-bottom:6px;
+ padding-top: 6px;
font-family:@main-font;
}
@@ -868,16 +867,16 @@ ul#searchTags {
.short-summary {
position: relative;
filter: inherit;
- padding: 10px;
+ padding: 10px 0;
border-bottom: 1px solid #DDDBCE;
margin-bottom:1px;
overflow: hidden;
- width: 710px;
+ width: 733px;
float: left;
- background: url(../images/summary-background.png) repeat-x;
-
+ /*background: url(../images/summary-background.png) repeat-x;*/
+
h2 {
- font-size: 24px;
+ font-size: 20px;
font-weight:normal;
line-height: 26px;
padding-left: 0;
@@ -935,7 +934,7 @@ ul#searchTags {
}
.tags {
- margin-top: 0;
+ margin: 0 0 0 1px;
}
.votes, .answers, .favorites, .views {
@@ -1518,14 +1517,14 @@ ul#related-tags li {
h1{
padding-top:0px;
- font-family:@main-font;
- }
-
- h1 a{
- color:@question-link;
- font-size:30px;
- font-weight:normal;
- line-height:1;
+ font-family:@main-font;
+
+ a {
+ color:@question-link;
+ font-size:26px;
+ font-weight:normal;
+ line-height:1;
+ }
}
p.rss {
@@ -1533,7 +1532,7 @@ ul#related-tags li {
clear:both;
padding: 3px 0 0 23px;
font-size: 15px;
- width:110px;
+ width:130px;
background-position:center left;
margin-left:0px !important;
}
@@ -1542,7 +1541,7 @@ ul#related-tags li {
font-family:@main-font;
vertical-align: top;
}
-
+
.question-content{
float:right;
width:682px;
@@ -1556,7 +1555,7 @@ ul#related-tags li {
#question-table,
.answer-table {
- margin: 6px 0 6px 0;
+ margin: 8px 0 6px 0;
border-spacing: 0px;
width: 670px;
padding-right:10px;
@@ -1700,7 +1699,7 @@ ul#related-tags li {
.tabBar{
width:100%;
}
-
+
#questionCount{
float:left;
font-family:@main-font;
@@ -1982,7 +1981,7 @@ ul#related-tags li {
.vote-number {
font-family: @main-font;
- padding: 0px 0 5px 0;
+ padding: 2px 0 5px 0;
font-size: 25px;
font-weight: bold;
color: #777;
@@ -1990,10 +1989,11 @@ ul#related-tags li {
.vote-buttons .notify-sidebar {
text-align: left;
- width:120px;
- }
- .vote-buttons .notify-sidebar label {
- vertical-align: top;
+ width:130px;
+ margin-top: 7px;
+ label {
+ vertical-align: top;
+ }
}
.tabBar-answer{
@@ -2010,7 +2010,7 @@ ul#related-tags li {
.accepted-answer {
background-color: #f7fecc;
border-bottom-color: #9BD59B;
-
+
.vote-buttons {
width:27px;
margin-right:10px;
diff --git a/askbot/skins/default/templates/meta/html_head_stylesheets.html b/askbot/skins/default/templates/meta/html_head_stylesheets.html
index 0d2ba463..8977f152 100644
--- a/askbot/skins/default/templates/meta/html_head_stylesheets.html
+++ b/askbot/skins/default/templates/meta/html_head_stylesheets.html
@@ -1,4 +1,5 @@
{% if settings.ASKBOT_CSS_DEVEL == False %}
+
{% else %}
@@ -7,7 +8,7 @@
{% if settings.USE_LOCAL_FONTS %}
{% include "meta/fonts.html" %}
{% else %}
-
+
{% endif %}
{{ skin.get_extra_css_link() }}
{% if settings.USE_CUSTOM_CSS %}
--
cgit v1.2.3-1-g7c22
From 2fef5cda34dc8c286db9bee3464deaec2084867a Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev
Date: Mon, 16 Jul 2012 00:34:37 -0400
Subject: merged Adolfo's build_livesettings_cache management command
---
askbot/doc/source/changelog.rst | 1 +
askbot/doc/source/management-commands.rst | 2 ++
askbot/management/commands/build_livesettings_cache.py | 12 ++++++++++++
askbot/management/commands/preload_livesettings_cache.py | 12 ------------
askbot/skins/default/media/style/style.less | 7 ++++---
5 files changed, 19 insertions(+), 15 deletions(-)
create mode 100644 askbot/management/commands/build_livesettings_cache.py
delete mode 100644 askbot/management/commands/preload_livesettings_cache.py
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index 430d98de..00918e76 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -3,6 +3,7 @@ Changes in Askbot
Development version
-------------------
+* Added management command `build_livesettings_cache` (Adolfo)
* Welcome email for the case when replying by email is enabled (Evgeny)
* Detection of email signature based on the response to the welcome email (Evgeny)
* Hide "website" and "about" section of the blocked user profiles
diff --git a/askbot/doc/source/management-commands.rst b/askbot/doc/source/management-commands.rst
index b96251dc..2755bcf5 100644
--- a/askbot/doc/source/management-commands.rst
+++ b/askbot/doc/source/management-commands.rst
@@ -80,6 +80,8 @@ The bulk of the management commands fall into this group and will probably be th
+---------------------------------+-------------------------------------------------------------+
| `build_thread_summary_cache` | Rebuilds cache for the question summary snippet. |
+---------------------------------+-------------------------------------------------------------+
+| `build_livesettings_cache` | Rebuilds cache for the live settings. |
++---------------------------------+-------------------------------------------------------------+
| `delete_contextless_...` | `delete_contextless_badge_award_activities` |
| | Deletes Activity objects of type badge award where the |
| | related context object is lost. |
diff --git a/askbot/management/commands/build_livesettings_cache.py b/askbot/management/commands/build_livesettings_cache.py
new file mode 100644
index 00000000..1898fc6a
--- /dev/null
+++ b/askbot/management/commands/build_livesettings_cache.py
@@ -0,0 +1,12 @@
+from django.core.management.base import NoArgsCommand
+
+class Command(NoArgsCommand):
+ '''Loads livesettings values to cache helping speed up
+ initial load time for the users'''
+
+ def handle_noargs(self, **options):
+ from askbot.conf import settings
+ #Just loads all the settings that way they will be in the cache
+ for key, value in settings._ConfigSettings__instance.items():
+ empty1 = getattr(settings, key)
+ print 'cache pre-loaded'
diff --git a/askbot/management/commands/preload_livesettings_cache.py b/askbot/management/commands/preload_livesettings_cache.py
deleted file mode 100644
index 1898fc6a..00000000
--- a/askbot/management/commands/preload_livesettings_cache.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from django.core.management.base import NoArgsCommand
-
-class Command(NoArgsCommand):
- '''Loads livesettings values to cache helping speed up
- initial load time for the users'''
-
- def handle_noargs(self, **options):
- from askbot.conf import settings
- #Just loads all the settings that way they will be in the cache
- for key, value in settings._ConfigSettings__instance.items():
- empty1 = getattr(settings, key)
- print 'cache pre-loaded'
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index dfda8ec0..16790468 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -395,15 +395,16 @@ body.user-messages {
margin:6px 0px 0px 15px;
.searchInput, .searchInputCancelable{
- font-size: 30px;
+ font-size: 26px;
height: 39px;
font-weight:300;
background:#FFF;
border:0px;
color:#484848;
padding-left:10px;
+ padding-top: 1px;
font-family:@body-font;
- vertical-align: middle;
+ vertical-align: top;
}
.searchInput,{
@@ -411,7 +412,7 @@ body.user-messages {
}
.searchInputCancelable {
- width: 317px;
+ width: 305px;
}
.logoutsearch {
--
cgit v1.2.3-1-g7c22
From 526b91ea215168761147df4def028b317eb3485b Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev
Date: Mon, 16 Jul 2012 01:20:46 -0400
Subject: a bug fix on listing users by group and some style adjustments
---
askbot/skins/default/media/style/lib_style.less | 3 +--
askbot/skins/default/media/style/style.less | 29 +++++++++++--------------
askbot/views/users.py | 6 ++---
3 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less
index 14dcc4bc..05ab38f5 100644
--- a/askbot/skins/default/media/style/lib_style.less
+++ b/askbot/skins/default/media/style/lib_style.less
@@ -19,8 +19,7 @@
/* Buttons */
-.button-style(@w:100px ,@h:20px, @f:14px){
- width:@w;
+.button-style(@h:20px, @f:14px){
height:@h;
font-size:@f;
text-align:center;
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index 16790468..b26911d2 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -474,7 +474,8 @@ body.anon {
margin-top:6px;
float:right;
text-transform:uppercase;
- .button-style(200px, 42px, 20px);
+ .button-style(42px, 20px);
+ padding: 0 15px;
}
#askButton:hover{
@@ -587,7 +588,7 @@ body.anon {
#ignoredTagInput,
#subscribedTagInput,
#ab-tag-search {
- width:156px;
+ width:152px;
padding-left:5px;
border:#c9c9b5 1px solid;
height:25px;
@@ -602,7 +603,7 @@ body.anon {
border:0;
font-weight:bold;
margin-top:-2px;
- .button-style(30px, 27px, 14px);
+ .button-style(27px, 14px);
.rounded-corners(4px);
}
#interestingTagAdd:hover,
@@ -627,8 +628,9 @@ body.anon {
font-weight:normal;
margin-top:3px;
display:block;
- .button-style(120px,34px,21px);
+ .button-style(34px,21px);
.center;
+ width: 130px;
}
a.followed:hover, a.follow:hover{
@@ -861,14 +863,10 @@ ul#searchTags {
width: 100%;
}
-.main-page #question-list {
- margin-top: 10px;
-}
-
.short-summary {
position: relative;
filter: inherit;
- padding: 10px 0;
+ padding: 10px 0 3px 0;
border-bottom: 1px solid #DDDBCE;
margin-bottom:1px;
overflow: hidden;
@@ -881,7 +879,7 @@ ul#searchTags {
font-weight:normal;
line-height: 26px;
padding-left: 0;
- margin-bottom:6px;
+ margin-bottom:7px;
display:block;
font-family:@main-font;
}
@@ -1361,7 +1359,7 @@ ul#related-tags li {
float: left;
font-weight:normal;
margin-top:3px;
- .button-style(160px,34px,21px);
+ .button-style(34px,21px);
margin-right:7px;
}
@@ -1820,7 +1818,7 @@ ul#related-tags li {
button{
line-height:25px;
margin-bottom:5px;
- .button-style(100px, 27px, 12px);
+ .button-style(27px, 12px);
font-family:@body-font;
font-weight:bold;
}
@@ -2173,7 +2171,7 @@ ul#related-tags li {
input.submit{
font-weight:normal;
margin:5px 0px;
- .button-style(100px,26px,15px);
+ .button-style(26px,15px);
font-family:@body-font;
}
input.submit:hover{
@@ -2204,7 +2202,7 @@ ul#related-tags li {
width:200px;
}
.submit-b{
- .button-style(100px,24px,15px);
+ .button-style(24px,15px);
font-family:@body-font;
font-weight:bold;
padding-right:10px;
@@ -2363,7 +2361,7 @@ a:hover.medal {
font-weight:bold;
line-height:26px;
margin-top:-2px;
- .button-style(100px,26px,14px);
+ .button-style(26px,14px);
}
.follow-toggle:hover, .submit:hover {
@@ -3431,7 +3429,6 @@ body.anon.lang-es {
margin: 0 5px 3px 0;
}
.follow-toggle.group-join-btn {
- width: 150px;
margin: 4px auto 10px auto;
display: block;
}
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 0ebfb936..66ab7420 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -81,12 +81,12 @@ def show_users(request, by_group = False, group_id = None, group_slug = None):
except models.Tag.DoesNotExist:
raise Http404
if group_slug == slugify(group.name):
- group_users = models.User.objects.filter(
+ users = users.filter(
group_memberships__group__id = group_id
)
if request.user.is_authenticated():
user_is_group_member = bool(
- group_users.filter(
+ users.filter(
id = request.user.id
).count()
)
@@ -125,7 +125,7 @@ def show_users(request, by_group = False, group_id = None, group_slug = None):
order_by_parameter = '-reputation'
objects_list = Paginator(
- models.User.objects.order_by(order_by_parameter),
+ users.order_by(order_by_parameter),
const.USERS_PAGE_SIZE
)
base_url = request.path + '?sort=%s&' % sortby
--
cgit v1.2.3-1-g7c22
From d43fa6a79a21e48021fd528671691e32fbee3fab Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev
Date: Mon, 16 Jul 2012 01:24:15 -0400
Subject: width of ask button == width of sidebar
---
askbot/skins/default/media/style/style.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index b26911d2..fd2d5b5a 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -475,7 +475,7 @@ body.anon {
float:right;
text-transform:uppercase;
.button-style(42px, 20px);
- padding: 0 15px;
+ width: 200px;/* to match width of sidebar */
}
#askButton:hover{
--
cgit v1.2.3-1-g7c22
From fdf633f079cd89606e9564c6bc65d514c1f372e3 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev
Date: Mon, 16 Jul 2012 01:35:52 -0400
Subject: recompiled style.css
---
askbot/skins/default/media/style/style.css | 155 +++++++++++++++--------------
1 file changed, 78 insertions(+), 77 deletions(-)
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index 348eb6b2..7a695825 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -195,7 +195,7 @@ body.user-messages {
text-align: center;
background-color: #f5dd69;
border-top: #fff 1px solid;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.notify p.notification {
margin-top: 6px;
@@ -222,7 +222,7 @@ body.user-messages {
#header {
margin-top: 0px;
background: #16160f;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.content-wrapper {
/* wrapper positioning class */
@@ -275,12 +275,13 @@ body.user-messages {
float: right;
/* for #header.with-logo it is modified */
+ margin-right: 7px;
}
#metaNav a {
color: #e2e2ae;
padding: 0px 0px 0px 35px;
height: 25px;
- line-height: 30px;
+ line-height: 25px;
margin: 5px 0px 0px 10px;
font-size: 18px;
font-weight: 100;
@@ -337,7 +338,7 @@ body.user-messages {
border-bottom: #d3d3c2 1px solid;
border-top: #fcfcfc 1px solid;
margin-bottom: 10px;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
#secondaryHeader #homeButton {
border-right: #afaf9e 1px solid;
@@ -359,11 +360,11 @@ body.user-messages {
float: left;
}
#secondaryHeader #scopeWrapper .scope-selector {
- font-size: 21px;
- color: #5a5a4b;
+ font-size: 20px;
+ color: #7a7a6b;
height: 55px;
line-height: 55px;
- margin-left: 24px;
+ margin-left: 16px;
}
#secondaryHeader #scopeWrapper .on {
background: url(../images/scopearrow.png) no-repeat center bottom;
@@ -376,7 +377,7 @@ body.user-messages {
display: inline-block;
background-color: #fff;
- width: 412px;
+ width: 400px;
border: 1px solid #c9c9b5;
float: right;
height: 42px;
@@ -384,21 +385,22 @@ body.user-messages {
}
#searchBar .searchInput,
#searchBar .searchInputCancelable {
- font-size: 30px;
- height: 40px;
+ font-size: 26px;
+ height: 39px;
font-weight: 300;
background: #FFF;
border: 0px;
color: #484848;
padding-left: 10px;
+ padding-top: 1px;
font-family: Arial;
- vertical-align: middle;
+ vertical-align: top;
}
#searchBar .searchInput {
- width: 352px;
+ width: 340px;
}
#searchBar .searchInputCancelable {
- width: 317px;
+ width: 305px;
}
#searchBar .logoutsearch {
width: 337px;
@@ -450,14 +452,13 @@ body.anon #searchBar .searchInputCancelable {
margin-top: 6px;
float: right;
text-transform: uppercase;
- width: 200px;
height: 42px;
- font-size: 23px;
+ font-size: 20px;
text-align: center;
text-decoration: none;
cursor: pointer;
color: #4a757f;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
text-shadow: 0px 1px 0px #c6d9dd;
-moz-text-shadow: 0px 1px 0px #c6d9dd;
-webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -478,6 +479,9 @@ body.anon #searchBar .searchInputCancelable {
-webkit-box-shadow: 1px 1px 2px #636363;
-moz-box-shadow: 1px 1px 2px #636363;
box-shadow: 1px 1px 2px #636363;
+ width: 200px;
+ /* to match width of sidebar */
+
}
#askButton:hover {
background-color: #cde5e9;
@@ -522,7 +526,7 @@ body.anon #searchBar .searchInputCancelable {
.box p {
margin-bottom: 4px;
color: #707070;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.box p.info-box-follow-up-links {
text-align: right;
@@ -539,7 +543,7 @@ body.anon #searchBar .searchInputCancelable {
color: #656565;
padding-right: 10px;
margin-bottom: 10px;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
width: 190px;
}
.box h3 {
@@ -547,7 +551,7 @@ body.anon #searchBar .searchInputCancelable {
font-size: 18px;
text-align: left;
font-weight: normal;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
padding-left: 0px;
}
.box .contributorback {
@@ -556,12 +560,10 @@ body.anon #searchBar .searchInputCancelable {
.box label {
color: #707070;
font-size: 15px;
- display: block;
- float: right;
+ vertical-align: bottom;
+ display: inline;
text-align: left;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
- width: 80px;
- margin-right: 18px;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.box #displayTagFilterControl label,
.box #emailTagFilterControl label {
@@ -594,7 +596,7 @@ body.anon #searchBar .searchInputCancelable {
.box .inputs #ignoredTagInput,
.box .inputs #subscribedTagInput,
.box .inputs #ab-tag-search {
- width: 156px;
+ width: 152px;
padding-left: 5px;
border: #c9c9b5 1px solid;
height: 25px;
@@ -609,14 +611,13 @@ body.anon #searchBar .searchInputCancelable {
border: 0;
font-weight: bold;
margin-top: -2px;
- width: 30px;
height: 27px;
font-size: 14px;
text-align: center;
text-decoration: none;
cursor: pointer;
color: #4a757f;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
text-shadow: 0px 1px 0px #c6d9dd;
-moz-text-shadow: 0px 1px 0px #c6d9dd;
-webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -672,14 +673,13 @@ body.anon #searchBar .searchInputCancelable {
font-weight: normal;
margin-top: 3px;
display: block;
- width: 120px;
height: 34px;
font-size: 21px;
text-align: center;
text-decoration: none;
cursor: pointer;
color: #4a757f;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
text-shadow: 0px 1px 0px #c6d9dd;
-moz-text-shadow: 0px 1px 0px #c6d9dd;
-webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -702,6 +702,7 @@ body.anon #searchBar .searchInputCancelable {
box-shadow: 1px 1px 2px #636363;
margin: 0 auto;
padding: 0;
+ width: 130px;
}
.box a.followed:hover,
.box a.follow:hover {
@@ -740,7 +741,7 @@ body.anon #searchBar .searchInputCancelable {
text-align: center;
}
.box .notify-sidebar #question-subscribe-sidebar {
- margin: 7px 0 0 3px;
+ margin: 0 0 0 3px;
}
.users-page .box label {
display: inline;
@@ -877,20 +878,20 @@ body.anon #searchBar .searchInputCancelable {
/* ----- Headline, containing number of questions and tags selected, check main_page/headline.html ----- */
#questionCount {
font-weight: bold;
- font-size: 23px;
+ font-size: 20px;
color: #7ea9b3;
width: 200px;
float: left;
- margin-bottom: 8px;
+ margin-bottom: 6px;
padding-top: 6px;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
#listSearchTags {
float: left;
margin-top: 3px;
color: #707070;
font-size: 16px;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
ul#searchTags {
margin-left: 10px;
@@ -904,7 +905,7 @@ ul#searchTags {
margin: 5px 0 10px 0;
padding: 0px;
float: left;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.search-tips a {
text-decoration: underline;
@@ -918,28 +919,26 @@ ul#searchTags {
padding: 0;
width: 100%;
}
-.main-page #question-list {
- margin-top: 10px;
-}
.short-summary {
position: relative;
filter: inherit;
- padding: 10px;
+ padding: 10px 0 3px 0;
border-bottom: 1px solid #DDDBCE;
margin-bottom: 1px;
overflow: hidden;
- width: 710px;
+ width: 733px;
float: left;
- background: url(../images/summary-background.png) repeat-x;
+ /*background: url(../images/summary-background.png) repeat-x;*/
+
}
.short-summary h2 {
- font-size: 24px;
+ font-size: 20px;
font-weight: normal;
line-height: 26px;
padding-left: 0;
- margin-bottom: 6px;
+ margin-bottom: 7px;
display: block;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.short-summary a {
color: #464646;
@@ -964,12 +963,12 @@ ul#searchTags {
.short-summary .counts {
float: right;
margin: 4px 0 0 5px;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.short-summary .counts .item-count {
padding: 0px 5px 0px 5px;
font-size: 25px;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.short-summary .counts .votes div,
.short-summary .counts .views div,
@@ -981,7 +980,7 @@ ul#searchTags {
color: #646464;
}
.short-summary .tags {
- margin-top: 0;
+ margin: 0 0 0 1px;
}
.short-summary .votes,
.short-summary .answers,
@@ -1179,6 +1178,10 @@ ul.tags.marked-tags li,
ul#ab-user-tags li {
width: 160px;
margin: 5px;
+ margin-left: 0;
+}
+.tags-page ul.tags {
+ margin-left: 5px;
}
ul#related-tags li {
margin: 0 5px 8px 0;
@@ -1284,7 +1287,7 @@ ul#related-tags li {
/* ----- Ask and Edit Question Form template----- */
.section-title {
color: #7ea9b3;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
font-weight: bold;
font-size: 24px;
}
@@ -1373,14 +1376,13 @@ ul#related-tags li {
float: left;
font-weight: normal;
margin-top: 3px;
- width: 160px;
height: 34px;
font-size: 21px;
text-align: center;
text-decoration: none;
cursor: pointer;
color: #4a757f;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
text-shadow: 0px 1px 0px #c6d9dd;
-moz-text-shadow: 0px 1px 0px #c6d9dd;
-webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -1560,11 +1562,11 @@ ul#related-tags li {
/* ----- Question template ----- */
.question-page h1 {
padding-top: 0px;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.question-page h1 a {
color: #464646;
- font-size: 30px;
+ font-size: 26px;
font-weight: normal;
line-height: 1;
}
@@ -1573,12 +1575,12 @@ ul#related-tags li {
clear: both;
padding: 3px 0 0 23px;
font-size: 15px;
- width: 110px;
+ width: 130px;
background-position: center left;
margin-left: 0px !important;
}
.question-page p.rss a {
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
vertical-align: top;
}
.question-page .question-content {
@@ -1592,7 +1594,7 @@ ul#related-tags li {
}
.question-page #question-table,
.question-page .answer-table {
- margin: 6px 0 6px 0;
+ margin: 8px 0 6px 0;
border-spacing: 0px;
width: 670px;
padding-right: 10px;
@@ -1743,7 +1745,7 @@ ul#related-tags li {
}
.question-page #questionCount {
float: left;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
line-height: 15px;
}
.question-page .question-img-upvote,
@@ -1792,7 +1794,7 @@ ul#related-tags li {
color: #7ea9b3;
width: 200px;
float: left;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.question-page .comments {
font-size: 12px;
@@ -1855,14 +1857,13 @@ ul#related-tags li {
.question-page .comments button {
line-height: 25px;
margin-bottom: 5px;
- width: 100px;
height: 27px;
font-size: 12px;
text-align: center;
text-decoration: none;
cursor: pointer;
color: #4a757f;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
text-shadow: 0px 1px 0px #c6d9dd;
-moz-text-shadow: 0px 1px 0px #c6d9dd;
-webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -2035,8 +2036,8 @@ ul#related-tags li {
float: left;
text-align: center;
padding-top: 2px;
- margin: 10px 10px 0px 3px;
- /* smalls IE fixes */
+ margin: 0px 10px 0px 3px;
+ /* small IE fixes */
*margin: 0;
*height: 210px;
@@ -2046,15 +2047,16 @@ ul#related-tags li {
cursor: pointer;
}
.question-page .vote-number {
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
- padding: 0px 0 5px 0;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
+ padding: 2px 0 5px 0;
font-size: 25px;
font-weight: bold;
color: #777;
}
.question-page .vote-buttons .notify-sidebar {
text-align: left;
- width: 120px;
+ width: 130px;
+ margin-top: 7px;
}
.question-page .vote-buttons .notify-sidebar label {
vertical-align: top;
@@ -2124,7 +2126,7 @@ ul#related-tags li {
margin-top: 10px;
}
.question-page #fmanswer h2 {
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
color: #7ea9b3;
font-size: 24px;
}
@@ -2245,14 +2247,13 @@ ul#related-tags li {
.user-profile-page input.submit {
font-weight: normal;
margin: 5px 0px;
- width: 100px;
height: 26px;
font-size: 15px;
text-align: center;
text-decoration: none;
cursor: pointer;
color: #4a757f;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
text-shadow: 0px 1px 0px #c6d9dd;
-moz-text-shadow: 0px 1px 0px #c6d9dd;
-webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -2341,14 +2342,13 @@ ul#related-tags li {
#local_login_buttons .submit-b,
#password-fs .submit-b,
#openid-fs .submit-b {
- width: 100px;
height: 24px;
font-size: 15px;
text-align: center;
text-decoration: none;
cursor: pointer;
color: #4a757f;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
text-shadow: 0px 1px 0px #c6d9dd;
-moz-text-shadow: 0px 1px 0px #c6d9dd;
-webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -2492,7 +2492,7 @@ a:hover.medal {
}
.user-profile-page h2 {
padding: 10px 0px 10px 0px;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
.user-details {
font-size: 13px;
@@ -2517,14 +2517,13 @@ a:hover.medal {
font-weight: bold;
line-height: 26px;
margin-top: -2px;
- width: 100px;
height: 26px;
font-size: 14px;
text-align: center;
text-decoration: none;
cursor: pointer;
color: #4a757f;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
text-shadow: 0px 1px 0px #c6d9dd;
-moz-text-shadow: 0px 1px 0px #c6d9dd;
-webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -2579,13 +2578,13 @@ a:hover.medal {
display: none;
}
.count {
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
font-size: 200%;
font-weight: 700;
color: #777777;
}
.scoreNumber {
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
font-size: 35px;
font-weight: 800;
color: #777;
@@ -2696,7 +2695,7 @@ a:hover.medal {
color: #525252;
}
.revision h3 {
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
font-size: 21px;
padding-left: 0px;
}
@@ -2803,7 +2802,7 @@ ins {
padding: 6px 0 0 0;
background: #16160f;
font-size: 16px;
- font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+ font-family: 'Open Sans Condensed', Arial, sans-serif;
}
#ground p {
margin-bottom: 0;
@@ -3375,6 +3374,9 @@ p.signup_p {
padding: 0;
margin-top: -3px;
}
+.user-profile-page ul.tags {
+ margin-left: 5px;
+}
.userList {
font-size: 13px;
}
@@ -3518,7 +3520,6 @@ body.anon.lang-es #searchBar .searchInputCancelable {
margin: 0 5px 3px 0;
}
.group-wiki .follow-toggle.group-join-btn {
- width: 150px;
margin: 4px auto 10px auto;
display: block;
}
--
cgit v1.2.3-1-g7c22