# HG changeset patch # User cavaliet # Date 1361276060 -3600 # Node ID a766937acc12a9e07c6a69c9657601179dbab30c # Parent ea2c1961a51533a3061ae6ee8e1c269fb30af7e0# Parent f2d7c97b7ec9dd690773f21de67febcd18d8d951 Merge with f2d7c97b7ec9dd690773f21de67febcd18d8d951 diff -r ea2c1961a515 -r a766937acc12 integration/css/egonomy.css --- a/integration/css/egonomy.css Tue Feb 19 13:12:30 2013 +0100 +++ b/integration/css/egonomy.css Tue Feb 19 13:14:20 2013 +0100 @@ -152,9 +152,21 @@ box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; - width: 100%; border: none; background: #d0e0FF; - padding: 2px; margin: 3px 0; height: 20px; + border: none; background: #d0e0FF; + padding: 2px; margin: 2px 0; height: 20px; + font-size: 13px; width: 210px; float: left; + line-height: 20px; height: 20px; +} + +.search-type { + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + border: none; background: #E0E0E0; + float: left; width: 100px; + padding: 2px; margin: 2px 0 0 1px; font-size: 13px; + line-height: 20px; height: 20px; } .placeholder { @@ -206,7 +218,7 @@ } .subcol-eighth { - width: 110px; + width: 110px; margin-left: 12px; } .subcol-eighth:nth-child(even) { diff -r ea2c1961a515 -r a766937acc12 integration/home-v1.html --- a/integration/home-v1.html Tue Feb 19 13:12:30 2013 +0100 +++ b/integration/home-v1.html Tue Feb 19 13:14:20 2013 +0100 @@ -14,6 +14,10 @@

TagItAll by eGonomy

Se connecter diff -r ea2c1961a515 -r a766937acc12 src/egonomy/static/egonomy/css/egonomy.css --- a/src/egonomy/static/egonomy/css/egonomy.css Tue Feb 19 13:12:30 2013 +0100 +++ b/src/egonomy/static/egonomy/css/egonomy.css Tue Feb 19 13:14:20 2013 +0100 @@ -156,9 +156,21 @@ box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; - width: 100%; border: none; background: #d0e0FF; - padding: 2px; margin: 3px 0; height: 20px; + border: none; background: #d0e0FF; + padding: 2px; margin: 2px 0; height: 20px; + font-size: 13px; width: 210px; float: left; + line-height: 20px; height: 20px; +} + +.search-type { + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + border: none; background: #E0E0E0; + float: left; width: 100px; + padding: 2px; margin: 2px 0 0 1px; font-size: 13px; + line-height: 20px; height: 20px; } .placeholder { diff -r ea2c1961a515 -r a766937acc12 src/egonomy/templates/egonomy_base.html --- a/src/egonomy/templates/egonomy_base.html Tue Feb 19 13:12:30 2013 +0100 +++ b/src/egonomy/templates/egonomy_base.html Tue Feb 19 13:14:20 2013 +0100 @@ -13,15 +13,33 @@ {% endblock %} {% block css_page %}{% endblock %} - {% block js_import %}{% endblock %} + {% block js_import %} + + {% endblock %} + {% block js_inline %} + + {% endblock %} {% endblock %}

TagItAll {% trans "by" %} eGonomy