Download as
Browse Code »

Commit ca0175623a1a6dbe6a3c56940fa9d4205ccdb5c0

Authored by AurelioAHeckert
1 parent 82bfcffc
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem496: form nao quebra mais e nao precisa mais definir a largura do box-1 via js. Yeah! :-D 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2094 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 9 changed files with 91 additions and 29 deletions   Show diff stats
app/views/layouts/application.rhtml
  Diff comments   View file @ca01756
... ... @@ -38,9 +38,6 @@
38 38 stylesheet_import( "controller_"+ @controller.controller_name(), :themed_source => true )
39 39 %>
40 40  
41   - <%# FIXME: for unknow reason the @import url(.../article.css) above dont work for class .post_comment_box.opened/closed %>
42   - <%= stylesheet_link_tag 'article' %>
43   -
44 41 <%# FIXME %>
45 42 <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %>
46 43 <%= stylesheet_link_tag '/designs/icons/default/style.css' %>
... ...
app/views/search/category_index.rhtml
  Diff comments   View file @ca01756
1 1 <div id="view-category">
2 2  
3 3 <div id="category-image"><%= image_tag(@category.image.public_filename(:thumb), :id => 'category-image') if @category.image %></div>
4   - <h1 id="category-name"><%= _('Category: %s') % @category.name %></h1>
  4 + <h1 id="category-name"><%= @category.name %></h1>
5 5  
6 6 <%= render :partial => 'display_results' %>
7 7  
... ...
public/designs/templates/default/stylesheets/style.css
  Diff comments   View file @ca01756
... ... @@ -4,12 +4,10 @@
4 4 }
5 5  
6 6 .box-1 {
7   - /* the width of this element is seted by javascript for Firefox */
8   - float: left;
9   - margin-left: 4px;
  7 + margin: 0px 210px 0px 280px;
10 8 }
11   -.msie .box-1 {
12   - margin-right: 4px;
  9 +.box-1 .blocks {
  10 + float: left;
13 11 }
14 12  
15 13 .box-2 {
... ...
public/designs/themes/ecosol/stylesheets/blocks/sellers-search-block.css 0 → 100644
  Diff comments   View file @ca01756
... ... @@ -0,0 +1,16 @@
  1 +
  2 +#content .sellers-search-block {
  3 + -moz-border-radius: 18px;
  4 + border: 2px solid #729FCF;
  5 + background: #B8CFE7;
  6 +}
  7 +
  8 +#content .sellers-search-block h3 {
  9 + -moz-border-radius: 3px;
  10 + -moz-border-radius-topleft: 10px;
  11 + -moz-border-radius-topright: 10px;
  12 + background: #729FCF;
  13 + margin: 0px 5px 5px 5px;
  14 + padding: 2px 0px;
  15 + color: #FFF;
  16 +}
... ...
public/designs/themes/ecosol/stylesheets/login-box.css 0 → 100644
  Diff comments   View file @ca01756
... ... @@ -0,0 +1,9 @@
  1 +
  2 +.login-box-content {
  3 + -moz-border-radius: 40px;
  4 +}
  5 +
  6 +.login-box-content .forgot-passwd {
  7 + text-align: center;
  8 +}
  9 +
... ...
public/designs/themes/zen3/stylesheets/article.css
  Diff comments   View file @ca01756
... ... @@ -15,3 +15,15 @@
15 15 background: #FD8;
16 16 }
17 17  
  18 +
  19 +/* * * Comments * * */
  20 +
  21 +.article-comment {
  22 + border: 1px solid #FD8;
  23 +}
  24 +
  25 +.comment-from-owner {
  26 + border: 1px solid #f57900;
  27 + background: #FD8;
  28 +}
  29 +
... ...
public/javascripts/application.js
  Diff comments   View file @ca01756
... ... @@ -40,22 +40,3 @@ function convToValidLogin( str ) {
40 40 .replace( /[^-_a-z0-9]+/g, "" )
41 41 }
42 42  
43   -
44   -/* * * Template Box Size Help * * */
45   -function resizePrincipalTemplateBox() {
46   - var box1 = $$( "div.box-1" )[0];
47   - var otherBoxSum = 10;
48   - var i = 2;
49   - var b = $$( "div.box-" + i++ )[0];
50   - while ( b && b.nodeName ) {
51   - otherBoxSum += b.clientWidth;
52   - b = $$( "div.box-" + i++ )[0] || false;
53   - }
54   - if ( box1 )
55   - box1.style.width = ( $("boxes").clientWidth - otherBoxSum ) +"px"
56   -}
57   -
58   -if ( window.addEventListener ) {
59   - window.addEventListener( 'resize', resizePrincipalTemplateBox, false );
60   - window.addEventListener( 'load', resizePrincipalTemplateBox, false );
61   -}
... ...
public/stylesheets/article.css
  Diff comments   View file @ca01756
... ... @@ -81,7 +81,7 @@
81 81 .post_comment_box {
82 82 text-align: center;
83 83 padding: 0px 15px 5px 15px;
84   - margin: 10px;
  84 + margin: 10px auto;
85 85 }
86 86  
87 87 .post_comment_box h4 {
... ...
public/stylesheets/blocks/sellers-search-block.css 0 → 100644
  Diff comments   View file @ca01756
... ... @@ -0,0 +1,49 @@
  1 +
  2 +#content .sellers-search-block {
  3 + border: 1px solid #AAA;
  4 + margin: 10px 10px 5px 20px;
  5 + padding: 5px 0px 10px 0px;
  6 + font-size: 12px;
  7 +}
  8 +
  9 +#content .sellers-search-block h3 {
  10 + font-size: 14px;
  11 + margin: 0px 0px 10px 0px;
  12 + text-align: center;
  13 +}
  14 +
  15 +.sellers-search-block form {
  16 + padding: 0px;
  17 + margin: 0px;
  18 +}
  19 +
  20 +.sellers-search-block .search-in-opt {
  21 + padding-left: 40px;
  22 +}
  23 +
  24 +.sellers-search-block .search-in-opt dir {
  25 + margin: 0px 0px 10px 0px;
  26 + padding-left: 20px;
  27 +}
  28 +
  29 +.sellers-search-block .formfield {
  30 + text-align: right;
  31 + padding: 0px 10px 5px 0px;
  32 + font-size: 11px;
  33 +}
  34 +
  35 +.sellers-search-block .formfield input {
  36 + width: 120px;
  37 +}
  38 +
  39 +.sellers-search-block .button-bar {
  40 + text-align: right;
  41 + padding: 0px 10px 0px 0px;
  42 + margin: 0px;
  43 +}
  44 +
  45 +.sellers-search-block .button-bar input {
  46 + margin: 0px;
  47 + float: none;
  48 +}
  49 +
... ...