Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
This commit is contained in:
commit
5417c6fec0
|
@ -102,6 +102,14 @@ table .span1-2 {
|
|||
float: none;
|
||||
margin-left: 0;
|
||||
}
|
||||
table .span1-3 {
|
||||
min-width: 200px;
|
||||
float: none;
|
||||
margin-left: 0;
|
||||
}
|
||||
.qe-block .form-horizontal .form-actions {
|
||||
text-align:right;
|
||||
}
|
||||
.modal.fade {
|
||||
top: -50%;
|
||||
}
|
|
@ -7,7 +7,7 @@
|
|||
<th class="span1-2"></th>
|
||||
<th class="span1-2"></th>
|
||||
<th class="span1-2"></th>
|
||||
<th class="span1-2"></th>
|
||||
<th class="span1-3"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_bulletins" class="sort-holder">
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
<th class="sort span1-2 <%= is_sort_active?('tags') %>">
|
||||
<%= link_to t('bulletin.tags') + content_tag(:b, nil, :class => is_sort?('tags')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('tags'))), :class => 'js_history' %>
|
||||
</th>
|
||||
<th class="sort span1-2 <%= is_sort_active?('update_user_id') %>">
|
||||
<th class="sort span1-3 <%= is_sort_active?('update_user_id') %>">
|
||||
<%= link_to t('bulletin.last_modified') + content_tag(:b, nil, :class => is_sort?('update_user_id')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('update_user_id'))), :class => 'js_history' %>
|
||||
</th>
|
||||
</tr>
|
||||
|
|
Reference in New Issue