Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

This commit is contained in:
Christophe Vilayphiou committed 2012-05-02 16:27:09 +08:00
commit b8cd7097b0
6 files changed
+27 -28

No files matched your search

+2 -2
View File
@@ -14,7 +14,7 @@
</head>
<body>
<%= render 'layouts/orbit_bar' %>
<nav id="main-sidebar" class="my_scroll">
<div id="main-sidebar" class="my_scroll">
<div class="scrollbar">
<div class="track">
<div class="thumb">
@@ -29,7 +29,7 @@
</ul>
</div>
</div>
</nav>
</div>
<div id="main-wrap">
<%= yield %>
</div>