Commit 4d92265e39359ee3113b6c7cf7bed62abcba04be
1 parent
b9c1a728
Exists in
master
and in
29 other branches
Fix contents columns alignment
Showing
10 changed files
with
61 additions
and
41 deletions
Show diff stats
app/views/search/_full_article.html.erb
1 | <li class="search-article-item article-item"> | 1 | <li class="search-article-item article-item"> |
2 | - <%= link_to(article.title, article.url, :class => "search-result-title") %> | 2 | + <div> |
3 | + <%= link_to(article.title, article.url, :class => "search-result-title") %> | ||
4 | + </div> | ||
5 | + | ||
3 | <div class="search-content-first-column"> | 6 | <div class="search-content-first-column"> |
4 | <%= render :partial => 'image', :object => article %> | 7 | <%= render :partial => 'image', :object => article %> |
5 | </div> | 8 | </div> |
9 | + | ||
6 | <table class="noborder search-content-second-column"> | 10 | <table class="noborder search-content-second-column"> |
7 | <%= render :partial => 'article_common', :object => article %> | 11 | <%= render :partial => 'article_common', :object => article %> |
8 | </table> | 12 | </table> |
app/views/search/_full_blog.html.erb
1 | <li class="search-blog article-item"> | 1 | <li class="search-blog article-item"> |
2 | - <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %> | 2 | + <div> |
3 | + <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %> | ||
4 | + </div> | ||
5 | + | ||
3 | <div class="search-content-first-column"> | 6 | <div class="search-content-first-column"> |
4 | <%= render :partial => 'image', :object => blog %> | 7 | <%= render :partial => 'image', :object => blog %> |
5 | </div> | 8 | </div> |
9 | + | ||
6 | <table class="noborder search-content-second-column"> | 10 | <table class="noborder search-content-second-column"> |
7 | <tr class="search-blog-items"> | 11 | <tr class="search-blog-items"> |
8 | <td class="search-field-label"><%= _("Last posts") %></td> | 12 | <td class="search-field-label"><%= _("Last posts") %></td> |
app/views/search/_full_event.html.erb
1 | <li class="search-event-item article-item"> | 1 | <li class="search-event-item article-item"> |
2 | -<%= link_to(event.title, event.url, :class => "search-result-title") %> | ||
3 | -<div class="search-content-first-column"> | ||
4 | - <%= render :partial => 'image', :object => event %> | ||
5 | -</div> | ||
6 | -<table class="noborder search-content-second-column"> | ||
7 | - <% if event.start_date %> | ||
8 | - <tr class="search-article-event-date"> | ||
9 | - <td class="search-field-label"><%= _('Start date') %></td> | ||
10 | - <td class="article-item-date"><%= event.start_date %></td> | ||
11 | - </tr> | ||
12 | - <% end %> | ||
13 | - <% if event.end_date %> | ||
14 | - <tr class="search-article-event-date"> | ||
15 | - <td class="search-field-label"><%= _('End date') %></td> | ||
16 | - <td class="article-item-date"><%= event.end_date %></td> | ||
17 | - </tr> | ||
18 | - <% end %> | 2 | + <div> |
3 | + <%= link_to(event.title, event.url, :class => "search-result-title") %> | ||
4 | + </div> | ||
19 | 5 | ||
20 | - <%= render :partial => 'article_common', :object => event %> | ||
21 | -</table> | ||
22 | -<%= render :partial => 'article_last_change', :object => event %> | 6 | + <div class="search-content-first-column"> |
7 | + <%= render :partial => 'image', :object => event %> | ||
8 | + </div> | ||
23 | 9 | ||
24 | -<div style="clear: both"></div> | 10 | + <table class="noborder search-content-second-column"> |
11 | + <% if event.start_date %> | ||
12 | + <tr class="search-article-event-date"> | ||
13 | + <td class="search-field-label"><%= _('Start date') %></td> | ||
14 | + <td class="article-item-date"><%= event.start_date %></td> | ||
15 | + </tr> | ||
16 | + <% end %> | ||
17 | + <% if event.end_date %> | ||
18 | + <tr class="search-article-event-date"> | ||
19 | + <td class="search-field-label"><%= _('End date') %></td> | ||
20 | + <td class="article-item-date"><%= event.end_date %></td> | ||
21 | + </tr> | ||
22 | + <% end %> | ||
23 | + | ||
24 | + <%= render :partial => 'article_common', :object => event %> | ||
25 | + </table> | ||
26 | + <%= render :partial => 'article_last_change', :object => event %> | ||
27 | + | ||
28 | + <div style="clear: both"></div> | ||
25 | </li> | 29 | </li> |
app/views/search/_full_folder.html.erb
1 | <li class="search-folder-item article-item"> | 1 | <li class="search-folder-item article-item"> |
2 | - <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %> | 2 | + <div> |
3 | + <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %> | ||
4 | + </div> | ||
5 | + | ||
3 | <div class="search-content-first-column"> | 6 | <div class="search-content-first-column"> |
4 | <%= render :partial => 'image', :object => folder %> | 7 | <%= render :partial => 'image', :object => folder %> |
5 | </div> | 8 | </div> |
9 | + | ||
6 | <table class="noborder search-content-second-column"> | 10 | <table class="noborder search-content-second-column"> |
7 | <tr class="search-folder-items"> | 11 | <tr class="search-folder-items"> |
8 | <td class="search-field-label"><%= _("Last items") %></td> | 12 | <td class="search-field-label"><%= _("Last items") %></td> |
app/views/search/_full_forum.html.erb
1 | <li class="search-forum-item article-item"> | 1 | <li class="search-forum-item article-item"> |
2 | - <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %> | 2 | + <div> |
3 | + <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %> | ||
4 | + </div> | ||
5 | + | ||
3 | <div class="search-content-first-column"> | 6 | <div class="search-content-first-column"> |
4 | <%= render :partial => 'image', :object => forum %> | 7 | <%= render :partial => 'image', :object => forum %> |
5 | </div> | 8 | </div> |
9 | + | ||
6 | <table class="noborder search-content-second-column"> | 10 | <table class="noborder search-content-second-column"> |
7 | <tr class="search-forum-items"> | 11 | <tr class="search-forum-items"> |
8 | <td class="search-field-label"><%= _("Last topics") %></td> | 12 | <td class="search-field-label"><%= _("Last topics") %></td> |
app/views/search/_full_gallery.html.erb
1 | <li class="search-gallery article-item"> | 1 | <li class="search-gallery article-item"> |
2 | - <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %> | 2 | + <div> |
3 | + <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %> | ||
4 | + </div> | ||
5 | + | ||
3 | <div class="search-content-first-column"> | 6 | <div class="search-content-first-column"> |
4 | <%= render :partial => 'image', :object => gallery %> | 7 | <%= render :partial => 'image', :object => gallery %> |
5 | </div> | 8 | </div> |
9 | + | ||
6 | <table class="noborder search-content-second-column"> | 10 | <table class="noborder search-content-second-column"> |
7 | <%= render :partial => 'article_common', :object => gallery %> | 11 | <%= render :partial => 'article_common', :object => gallery %> |
8 | </table> | 12 | </table> |
app/views/search/_full_text_article.html.erb
1 | <li class="search-text-article-item article-item"> | 1 | <li class="search-text-article-item article-item"> |
2 | - <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %> | 2 | + <div> |
3 | + <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %> | ||
4 | + </div> | ||
3 | 5 | ||
4 | <div class="search-content-first-column"> | 6 | <div class="search-content-first-column"> |
5 | <%= render :partial => 'image', :object => text_article %> | 7 | <%= render :partial => 'image', :object => text_article %> |
app/views/search/_full_uploaded_file.html.erb
1 | <li class="search-uploaded-file-item article-item"> | 1 | <li class="search-uploaded-file-item article-item"> |
2 | - <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %> | 2 | + <div> |
3 | + <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %> | ||
4 | + </div> | ||
3 | 5 | ||
4 | <div class="search-content-first-column"> | 6 | <div class="search-content-first-column"> |
5 | <%= render :partial => 'image', :object => uploaded_file %> | 7 | <%= render :partial => 'image', :object => uploaded_file %> |
plugins/solr/public/style.css
@@ -4,11 +4,8 @@ | @@ -4,11 +4,8 @@ | ||
4 | } | 4 | } |
5 | 5 | ||
6 | #search-column-right .search-customize-options { | 6 | #search-column-right .search-customize-options { |
7 | - position: absolute; | ||
8 | margin: 0; | 7 | margin: 0; |
9 | padding: 5px 0; | 8 | padding: 5px 0; |
10 | - bottom: 0; | ||
11 | - left: 0; | ||
12 | } | 9 | } |
13 | 10 | ||
14 | #search-column-right .search-results-box .vcard { | 11 | #search-column-right .search-results-box .vcard { |
public/stylesheets/search.css
@@ -753,19 +753,13 @@ li.search-product-item hr { | @@ -753,19 +753,13 @@ li.search-product-item hr { | ||
753 | .search-content-first-column { | 753 | .search-content-first-column { |
754 | width: 130px; | 754 | width: 130px; |
755 | min-height: 98px; | 755 | min-height: 98px; |
756 | - position: absolute; | ||
757 | -} | ||
758 | -.search-gallery .search-content-first-column { | ||
759 | - width: 190px; | 756 | + float: left; |
760 | } | 757 | } |
761 | 758 | ||
762 | .search-content-second-column { | 759 | .search-content-second-column { |
763 | margin-left: 140px; | 760 | margin-left: 140px; |
764 | width: auto; | 761 | width: auto; |
765 | } | 762 | } |
766 | -.search-gallery .search-content-second-column { | ||
767 | - margin-left: 200px; | ||
768 | -} | ||
769 | 763 | ||
770 | .search-content-second-column tr:hover { | 764 | .search-content-second-column tr:hover { |
771 | background-color: none; | 765 | background-color: none; |
@@ -789,7 +783,7 @@ ul.clean-list .search-content-second-column { | @@ -789,7 +783,7 @@ ul.clean-list .search-content-second-column { | ||
789 | width:795px; | 783 | width:795px; |
790 | } | 784 | } |
791 | ul.clean-list .search-gallery-content { | 785 | ul.clean-list .search-gallery-content { |
792 | - width:655px | 786 | + width:655px; |
793 | } | 787 | } |
794 | a.search-image-pic { | 788 | a.search-image-pic { |
795 | border: 1px solid #F2F2F2; | 789 | border: 1px solid #F2F2F2; |
@@ -819,7 +813,7 @@ a.search-image-pic { | @@ -819,7 +813,7 @@ a.search-image-pic { | ||
819 | font-weight: bold; | 813 | font-weight: bold; |
820 | text-transform: uppercase; | 814 | text-transform: uppercase; |
821 | letter-spacing: 1px; | 815 | letter-spacing: 1px; |
822 | - user-select: none; | 816 | + user-select: none; |
823 | border-radius: 5px; | 817 | border-radius: 5px; |
824 | -moz-user-select: none; | 818 | -moz-user-select: none; |
825 | -khtml-user-select: none; | 819 | -khtml-user-select: none; |
@@ -844,8 +838,9 @@ a.search-image-pic { | @@ -844,8 +838,9 @@ a.search-image-pic { | ||
844 | .search-gallery .search-gallery-items { | 838 | .search-gallery .search-gallery-items { |
845 | float: left; | 839 | float: left; |
846 | margin: 0; | 840 | margin: 0; |
847 | - min-width: 130px; | 841 | + width: 130px; |
848 | position: relative; | 842 | position: relative; |
843 | + overflow: hidden; | ||
849 | } | 844 | } |
850 | 845 | ||
851 | .search-gallery .search-gallery-items a.search-image-pic { | 846 | .search-gallery .search-gallery-items a.search-image-pic { |