From ca0175623a1a6dbe6a3c56940fa9d4205ccdb5c0 Mon Sep 17 00:00:00 2001 From: AurelioAHeckert Date: Thu, 26 Jun 2008 20:13:15 +0000 Subject: [PATCH] ActionItem496: form nao quebra mais e nao precisa mais definir a largura do box-1 via js. Yeah! :-D --- app/views/layouts/application.rhtml | 3 --- app/views/search/category_index.rhtml | 2 +- public/designs/templates/default/stylesheets/style.css | 8 +++----- public/designs/themes/ecosol/stylesheets/blocks/sellers-search-block.css | 16 ++++++++++++++++ public/designs/themes/ecosol/stylesheets/login-box.css | 9 +++++++++ public/designs/themes/zen3/stylesheets/article.css | 12 ++++++++++++ public/javascripts/application.js | 19 ------------------- public/stylesheets/article.css | 2 +- public/stylesheets/blocks/sellers-search-block.css | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 91 insertions(+), 29 deletions(-) create mode 100644 public/designs/themes/ecosol/stylesheets/blocks/sellers-search-block.css create mode 100644 public/designs/themes/ecosol/stylesheets/login-box.css create mode 100644 public/stylesheets/blocks/sellers-search-block.css diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 4aa9f59..e83c70c 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -38,9 +38,6 @@ stylesheet_import( "controller_"+ @controller.controller_name(), :themed_source => true ) %> - <%# FIXME: for unknow reason the @import url(.../article.css) above dont work for class .post_comment_box.opened/closed %> - <%= stylesheet_link_tag 'article' %> - <%# FIXME %> <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %> <%= stylesheet_link_tag '/designs/icons/default/style.css' %> diff --git a/app/views/search/category_index.rhtml b/app/views/search/category_index.rhtml index 8a201d8..1e1b7cb 100644 --- a/app/views/search/category_index.rhtml +++ b/app/views/search/category_index.rhtml @@ -1,7 +1,7 @@
<%= image_tag(@category.image.public_filename(:thumb), :id => 'category-image') if @category.image %>
-

<%= _('Category: %s') % @category.name %>

+

<%= @category.name %>

<%= render :partial => 'display_results' %> diff --git a/public/designs/templates/default/stylesheets/style.css b/public/designs/templates/default/stylesheets/style.css index 713af4d..4e39f84 100644 --- a/public/designs/templates/default/stylesheets/style.css +++ b/public/designs/templates/default/stylesheets/style.css @@ -4,12 +4,10 @@ } .box-1 { - /* the width of this element is seted by javascript for Firefox */ - float: left; - margin-left: 4px; + margin: 0px 210px 0px 280px; } -.msie .box-1 { - margin-right: 4px; +.box-1 .blocks { + float: left; } .box-2 { diff --git a/public/designs/themes/ecosol/stylesheets/blocks/sellers-search-block.css b/public/designs/themes/ecosol/stylesheets/blocks/sellers-search-block.css new file mode 100644 index 0000000..30d5a2f --- /dev/null +++ b/public/designs/themes/ecosol/stylesheets/blocks/sellers-search-block.css @@ -0,0 +1,16 @@ + +#content .sellers-search-block { + -moz-border-radius: 18px; + border: 2px solid #729FCF; + background: #B8CFE7; +} + +#content .sellers-search-block h3 { + -moz-border-radius: 3px; + -moz-border-radius-topleft: 10px; + -moz-border-radius-topright: 10px; + background: #729FCF; + margin: 0px 5px 5px 5px; + padding: 2px 0px; + color: #FFF; +} diff --git a/public/designs/themes/ecosol/stylesheets/login-box.css b/public/designs/themes/ecosol/stylesheets/login-box.css new file mode 100644 index 0000000..601cfa5 --- /dev/null +++ b/public/designs/themes/ecosol/stylesheets/login-box.css @@ -0,0 +1,9 @@ + +.login-box-content { + -moz-border-radius: 40px; +} + +.login-box-content .forgot-passwd { + text-align: center; +} + diff --git a/public/designs/themes/zen3/stylesheets/article.css b/public/designs/themes/zen3/stylesheets/article.css index 44eecb7..48e8140 100644 --- a/public/designs/themes/zen3/stylesheets/article.css +++ b/public/designs/themes/zen3/stylesheets/article.css @@ -15,3 +15,15 @@ background: #FD8; } + +/* * * Comments * * */ + +.article-comment { + border: 1px solid #FD8; +} + +.comment-from-owner { + border: 1px solid #f57900; + background: #FD8; +} + diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 6d6b37b..1d77b05 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -40,22 +40,3 @@ function convToValidLogin( str ) { .replace( /[^-_a-z0-9]+/g, "" ) } - -/* * * Template Box Size Help * * */ -function resizePrincipalTemplateBox() { - var box1 = $$( "div.box-1" )[0]; - var otherBoxSum = 10; - var i = 2; - var b = $$( "div.box-" + i++ )[0]; - while ( b && b.nodeName ) { - otherBoxSum += b.clientWidth; - b = $$( "div.box-" + i++ )[0] || false; - } - if ( box1 ) - box1.style.width = ( $("boxes").clientWidth - otherBoxSum ) +"px" -} - -if ( window.addEventListener ) { - window.addEventListener( 'resize', resizePrincipalTemplateBox, false ); - window.addEventListener( 'load', resizePrincipalTemplateBox, false ); -} diff --git a/public/stylesheets/article.css b/public/stylesheets/article.css index 1e32cc8..1618cef 100644 --- a/public/stylesheets/article.css +++ b/public/stylesheets/article.css @@ -81,7 +81,7 @@ .post_comment_box { text-align: center; padding: 0px 15px 5px 15px; - margin: 10px; + margin: 10px auto; } .post_comment_box h4 { diff --git a/public/stylesheets/blocks/sellers-search-block.css b/public/stylesheets/blocks/sellers-search-block.css new file mode 100644 index 0000000..c95c2af --- /dev/null +++ b/public/stylesheets/blocks/sellers-search-block.css @@ -0,0 +1,49 @@ + +#content .sellers-search-block { + border: 1px solid #AAA; + margin: 10px 10px 5px 20px; + padding: 5px 0px 10px 0px; + font-size: 12px; +} + +#content .sellers-search-block h3 { + font-size: 14px; + margin: 0px 0px 10px 0px; + text-align: center; +} + +.sellers-search-block form { + padding: 0px; + margin: 0px; +} + +.sellers-search-block .search-in-opt { + padding-left: 40px; +} + +.sellers-search-block .search-in-opt dir { + margin: 0px 0px 10px 0px; + padding-left: 20px; +} + +.sellers-search-block .formfield { + text-align: right; + padding: 0px 10px 5px 0px; + font-size: 11px; +} + +.sellers-search-block .formfield input { + width: 120px; +} + +.sellers-search-block .button-bar { + text-align: right; + padding: 0px 10px 0px 0px; + margin: 0px; +} + +.sellers-search-block .button-bar input { + margin: 0px; + float: none; +} + -- libgit2 0.21.2