Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
This commit is contained in:
commit
b8cd7097b0
6 files changed
+27
-28
No files matched your search
@@ -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>
|
||||
|
||||
Reference in new issue
Block a user