From fda951797c825d9a8380c08edc1895be2f5ecc7c Mon Sep 17 00:00:00 2001 From: Lukasz Anwajler Date: Tue, 27 Jul 2010 17:57:51 +0800 Subject: [PATCH 1/1] Minor css fix for search engine. It needs more improvements. --- apps/catalogue/forms.py | 2 +- wolnelektury/static/css/facelist_2-0.css | 2 +- wolnelektury/static/css/master.css | 21 ++++++++++++++-- .../templates/catalogue/breadcrumbs.html | 24 +++++++++---------- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py index 6a3345679..3aceb4f86 100644 --- a/apps/catalogue/forms.py +++ b/apps/catalogue/forms.py @@ -26,7 +26,7 @@ class SearchForm(forms.Form): tags = kwargs.pop('tags', []) super(SearchForm, self).__init__(*args, **kwargs) self.fields['q'].widget.attrs['title'] = _('title, author, theme/topic, epoch, kind, genre') - self.fields['q'].widget.attrs['style'] = 'float: left; width: 200px; border: medium none; height: 15px; margin-top: 2px;' + #self.fields['q'].widget.attrs['style'] = '' self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags)) diff --git a/wolnelektury/static/css/facelist_2-0.css b/wolnelektury/static/css/facelist_2-0.css index f723ea5e2..bd6d35e20 100644 --- a/wolnelektury/static/css/facelist_2-0.css +++ b/wolnelektury/static/css/facelist_2-0.css @@ -18,7 +18,7 @@ ul.facelist-selections { box-shadow:inset 0 1px 2px #888; -webkit-box-shadow:inset 0 1px 2px #888; -moz-box-shadow:inset 0 1px 2px #888; - width: 600px; + width: 90%; } ul.facelist-selections.loading { diff --git a/wolnelektury/static/css/master.css b/wolnelektury/static/css/master.css index 744082718..cc7ca3789 100644 --- a/wolnelektury/static/css/master.css +++ b/wolnelektury/static/css/master.css @@ -146,6 +146,13 @@ em { margin: 0.5em 0; padding: 0.5em; background-color: rgb(132, 191, 42); +} + +#searchContainer { + width: 100%; + min-height: 65px; + background-color: rgb(132, 191, 42); + padding: 0px 5px; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; @@ -153,6 +160,11 @@ em { border-right: 0.15em solid #7B9C2D; } +#searchContainer #search-form { + padding: 0; + margin: 0; +} + #search-form p { margin: 0em 0 0 0; } @@ -195,14 +207,19 @@ em { } .ac_input { - width: 18em; + width: 300px; + border: 0; } p .ac_input { width: 28em; } - +#searchSubmit { + float: left; + margin-top: 10px; + height: 33px; +} /* ================== */ /* = Search matches = */ /* ================== */ diff --git a/wolnelektury/templates/catalogue/breadcrumbs.html b/wolnelektury/templates/catalogue/breadcrumbs.html index 9213adb9f..5aafeb974 100644 --- a/wolnelektury/templates/catalogue/breadcrumbs.html +++ b/wolnelektury/templates/catalogue/breadcrumbs.html @@ -1,24 +1,24 @@ {% load i18n %} {% load catalogue_tags %} -
-
+
+
    {% for tag in tag_list %}
  • - - {{ tag }} - x - -
  • + + {{ tag }} + x + + {% empty %} -
  • -
  • +
  • +
  • {% endfor %} {% if search_form %}
  • {{ search_form.q }} {{ search_form.tags }}
  • {% endif %}
- -
- + + +
-- 2.20.1