Permalink
Browse files

Search widget update

  • Loading branch information...
1 parent 06573a9 commit 4362f39e7dfeefd3c85c5011c626db2ddc8fc3e6 @priithaamer priithaamer committed Jan 24, 2012
Showing with 16 additions and 13 deletions.
  1. +2 −2 components/footer.tpl
  2. +7 −5 components/js.tpl
  3. +2 −5 components/siteheader.tpl
  4. +5 −1 stylesheets/style.css
View
@@ -1,8 +1,8 @@
<div class="footer-inner">{% xcontent name="footer" %}</div>
{% if site.search.enabled %}
-<form action="#" method="post" id="search" class="clear">
- <p class="left"><input type="text" name="" id="onpage_search" /></p>
+<form action="#" method="post" id="search" class="edys-search clear">
+ <p class="left"><input type="text" name="" id="onpage_search" class="edys-search-input" placeholder="{{ "search"|lc }}" /></p>
<p class="right"><input type="submit" name="" value="" class="search-submit" /></p>
</form>
{% endif %}
View
@@ -1,8 +1,10 @@
{% if site.search.enabled %}
- <script type="text/javascript" src="http://www.google.com/jsapi"></script>
- <script type="text/javascript" src="http://static.edicy.com/assets/site_search/2.0/site_search.js"></script>
- <script type="text/javascript" charset="utf-8">
- var search_translations = {"search": "{{ "search"|lc }}", "close": "{{ "search_close"|lc }}", "noresults": "{{ "search_noresults"|lc }}"};
- </script>
+ <script type="text/javascript" src="http://static.edicy.com/assets/site_search/3.0/site_search.js?1"></script>
+ <script type="text/javascript">
+ var edys_site_search_options = {
+ texts: { noresults: "{{ "search_noresults"|lc }}" },
+ default_stylesheet_enabled: false,
+}
+</script>
{% endif %}
{% unless editmode %}{{site.analytics}}{% endunless %}
@@ -3,18 +3,15 @@
<meta name="copyright" content="{{ site.copyright }}" />
<meta name="author" content="{{ site.author }}" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ {% if site.search.enabled %}{% stylesheet_link "assets/site_search/3.0/style.css?1" static_host="true" %}{% endif %}
{% stylesheet_link "reset.css?1" %}
{% stylesheet_link "fonts.css?1" %}
{% stylesheet_link "style.css?1" %}
-
{% if editmode %}{% stylesheet_link "assets/admin/editmode.css" static_host="true" %}{% endif %}
<!--[if lt IE 8]>{% stylesheet_link "style_ie.css?1" %}<![endif]-->
<link rel="icon" href="/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="/favicon.ico" type="image/ico" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
- {% if site.search.enabled %}
- {% stylesheet_link "assets/site_search/2.0/site_search.css?1" static_host="true" %}
- {% endif %}
<meta name="viewport" content="initial-scale=1" />
<!--[if IE]><link rel="stylesheet" href="http://static.edicy.com/assets/ie.css" type="text/css" /><![endif]-->
- <title>{% if article %}{{ article.title }} | {{site.name}}{% else %}{{site.name}} | {{ page.title }}{% endif %}</title>
+ <title>{% if article %}{{ article.title }} | {{page.site_title}}{% else %}{{page.site_title}} | {{ page.title }}{% endif %}</title>
View
@@ -22,7 +22,7 @@ h1, h2, h3, #submenu a {
h1 {
font-size: 48px;
line-height: 50px;
- font-weight: bold;
+ font-weight: normal;
color: #373d42;
margin-bottom: 10px
}
@@ -484,6 +484,10 @@ h2 .date {
width: 17px;
float: right
}
+.placeholder { color: #bbb !important }
+::-webkit-input-placeholder { color: #bbb !important }
+:-moz-placeholder { color: #bbb !important }
+
@media only screen and (min-width: 601px) and (max-width: 1000px) {
#content-wrap .column, .left-column {
height: auto;

0 comments on commit 4362f39

Please sign in to comment.