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

Merge branch 'design_team' into dashboard

Browse Source
This commit is contained in:
Christophe Vilayphiou committed 2012-02-23 16:05:33 +08:00
2 parents 63d7810b35 1a6e497b3d
commit f8d1d7242d
13 files changed
+3425 -3451
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/stylesheets/bootstrap.css.erb
+3365 -3365
View File
File diff suppressed because it is too large. Load diff
app/views/layouts/_side_bar.html.erb
+1 -1
View File
@@ -34,4 +34,4 @@
<%= content_tag :li, :class => active_for_controllers(nil) do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), nil %>
<% end -%>
<% end -%>