developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Christophe Vilayphiou 2012-04-12 07:13:13 +08:00
parent 486845460c 7bca339a5b
commit 5417c6fec0
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/bootstrap-orbit.css vendored
View File

@ -102,6 +102,14 @@ table .span1-2 {
float: none; float: none;
margin-left: 0; margin-left: 0;
} }
table .span1-3 {
min-width: 200px;
float: none;
margin-left: 0;
}
.qe-block .form-horizontal .form-actions { .qe-block .form-horizontal .form-actions {
text-align:right; text-align:right;
}
.modal.fade {
top: -50%;
} }

2
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb vendored
View File

@ -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-2"></th> <th class="span1-2"></th>
<th class="span1-2"></th> <th class="span1-3"></th>
</tr> </tr>
</thead> </thead>
<tbody id="tbody_bulletins" class="sort-holder"> <tbody id="tbody_bulletins" class="sort-holder">

2
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb vendored
View File

@ -23,7 +23,7 @@
<th class="sort span1-2 <%= is_sort_active?('tags') %>"> <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' %> <%= 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>
<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' %> <%= 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> </th>
</tr> </tr>