From 4d92265e39359ee3113b6c7cf7bed62abcba04be Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Sun, 21 Jul 2013 18:44:04 -0300 Subject: [PATCH] Fix contents columns alignment --- app/views/search/_full_article.html.erb | 6 +++++- app/views/search/_full_blog.html.erb | 6 +++++- app/views/search/_full_event.html.erb | 46 +++++++++++++++++++++++++--------------------- app/views/search/_full_folder.html.erb | 6 +++++- app/views/search/_full_forum.html.erb | 6 +++++- app/views/search/_full_gallery.html.erb | 6 +++++- app/views/search/_full_text_article.html.erb | 4 +++- app/views/search/_full_uploaded_file.html.erb | 4 +++- plugins/solr/public/style.css | 3 --- public/stylesheets/search.css | 15 +++++---------- 10 files changed, 61 insertions(+), 41 deletions(-) diff --git a/app/views/search/_full_article.html.erb b/app/views/search/_full_article.html.erb index 25c2a41..15d509f 100644 --- a/app/views/search/_full_article.html.erb +++ b/app/views/search/_full_article.html.erb @@ -1,8 +1,12 @@
  • - <%= link_to(article.title, article.url, :class => "search-result-title") %> +
    + <%= link_to(article.title, article.url, :class => "search-result-title") %> +
    +
    <%= render :partial => 'image', :object => article %>
    + <%= render :partial => 'article_common', :object => article %>
    diff --git a/app/views/search/_full_blog.html.erb b/app/views/search/_full_blog.html.erb index 1cbdea1..1998580 100644 --- a/app/views/search/_full_blog.html.erb +++ b/app/views/search/_full_blog.html.erb @@ -1,8 +1,12 @@
  • - <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %> +
    + <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %> +
    +
    <%= render :partial => 'image', :object => blog %>
    + diff --git a/app/views/search/_full_event.html.erb b/app/views/search/_full_event.html.erb index eacbf2e..b438e8b 100644 --- a/app/views/search/_full_event.html.erb +++ b/app/views/search/_full_event.html.erb @@ -1,25 +1,29 @@
  • -<%= link_to(event.title, event.url, :class => "search-result-title") %> -
    - <%= render :partial => 'image', :object => event %> -
    -
    • <%= _("Last posts") %>
    - <% if event.start_date %> - - - - - <% end %> - <% if event.end_date %> - - - - - <% end %> +
    + <%= link_to(event.title, event.url, :class => "search-result-title") %> +
    - <%= render :partial => 'article_common', :object => event %> -
    <%= _('Start date') %><%= event.start_date %>
    <%= _('End date') %><%= event.end_date %>
    -<%= render :partial => 'article_last_change', :object => event %> +
    + <%= render :partial => 'image', :object => event %> +
    -
    + + <% if event.start_date %> + + + + + <% end %> + <% if event.end_date %> + + + + + <% end %> + + <%= render :partial => 'article_common', :object => event %> +
    <%= _('Start date') %><%= event.start_date %>
    <%= _('End date') %><%= event.end_date %>
    + <%= render :partial => 'article_last_change', :object => event %> + +
    • diff --git a/app/views/search/_full_folder.html.erb b/app/views/search/_full_folder.html.erb index a322481..8d9167d 100644 --- a/app/views/search/_full_folder.html.erb +++ b/app/views/search/_full_folder.html.erb @@ -1,8 +1,12 @@
  • - <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %> +
    + <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %> +
    +
    <%= render :partial => 'image', :object => folder %>
    + diff --git a/app/views/search/_full_forum.html.erb b/app/views/search/_full_forum.html.erb index 54df4a2..8e3a60c 100644 --- a/app/views/search/_full_forum.html.erb +++ b/app/views/search/_full_forum.html.erb @@ -1,8 +1,12 @@
  • - <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %> +
    + <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %> +
    +
    <%= render :partial => 'image', :object => forum %>
    +
    • <%= _("Last items") %>
    diff --git a/app/views/search/_full_gallery.html.erb b/app/views/search/_full_gallery.html.erb index 28e2e66..6aded4d 100644 --- a/app/views/search/_full_gallery.html.erb +++ b/app/views/search/_full_gallery.html.erb @@ -1,8 +1,12 @@
  • - <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %> +
    + <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %> +
    +
    <%= render :partial => 'image', :object => gallery %>
    +
    • <%= _("Last topics") %>
    <%= render :partial => 'article_common', :object => gallery %>
    diff --git a/app/views/search/_full_text_article.html.erb b/app/views/search/_full_text_article.html.erb index 0f1b746..d215eda 100644 --- a/app/views/search/_full_text_article.html.erb +++ b/app/views/search/_full_text_article.html.erb @@ -1,5 +1,7 @@
  • - <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %> +
    + <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %> +
    <%= render :partial => 'image', :object => text_article %> diff --git a/app/views/search/_full_uploaded_file.html.erb b/app/views/search/_full_uploaded_file.html.erb index b8aa1d4..5a5a09a 100644 --- a/app/views/search/_full_uploaded_file.html.erb +++ b/app/views/search/_full_uploaded_file.html.erb @@ -1,5 +1,7 @@
  • - <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %> +
    + <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %> +
    <%= render :partial => 'image', :object => uploaded_file %> diff --git a/plugins/solr/public/style.css b/plugins/solr/public/style.css index b7bfa04..f2a28b7 100644 --- a/plugins/solr/public/style.css +++ b/plugins/solr/public/style.css @@ -4,11 +4,8 @@ } #search-column-right .search-customize-options { - position: absolute; margin: 0; padding: 5px 0; - bottom: 0; - left: 0; } #search-column-right .search-results-box .vcard { diff --git a/public/stylesheets/search.css b/public/stylesheets/search.css index 7ce37f6..a308612 100644 --- a/public/stylesheets/search.css +++ b/public/stylesheets/search.css @@ -753,19 +753,13 @@ li.search-product-item hr { .search-content-first-column { width: 130px; min-height: 98px; - position: absolute; -} -.search-gallery .search-content-first-column { - width: 190px; + float: left; } .search-content-second-column { margin-left: 140px; width: auto; } -.search-gallery .search-content-second-column { - margin-left: 200px; -} .search-content-second-column tr:hover { background-color: none; @@ -789,7 +783,7 @@ ul.clean-list .search-content-second-column { width:795px; } ul.clean-list .search-gallery-content { - width:655px + width:655px; } a.search-image-pic { border: 1px solid #F2F2F2; @@ -819,7 +813,7 @@ a.search-image-pic { font-weight: bold; text-transform: uppercase; letter-spacing: 1px; - user-select: none; + user-select: none; border-radius: 5px; -moz-user-select: none; -khtml-user-select: none; @@ -844,8 +838,9 @@ a.search-image-pic { .search-gallery .search-gallery-items { float: left; margin: 0; - min-width: 130px; + width: 130px; position: relative; + overflow: hidden; } .search-gallery .search-gallery-items a.search-image-pic { -- libgit2 0.21.2