git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-09-10 16:49:06 +06:30
parent 8a2512e78d a42edf5519
commit b60584c6d7
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/login.scss
View File

@@ -96,7 +96,7 @@
} }
.style_image{ .style_image{
height : 138px; height : 137.5px;
padding : 20px 0 20px 0; padding : 20px 0 20px 0;
width : 70%; width : 70%;
opacity: 0.7; opacity: 0.7;

6
app/views/layouts/_header.html.erb
View File

@@ -69,6 +69,12 @@
</a> </a>
</p> </p>
</li> </li>
<!-- <li>
<p class="waves-effect waves-block p-l-30 m-b-5">
<i class="material-icons font-7 logout_icon shopinfo">add</i>
<span class="font-15 shopinfo" >Team Viewer</span>
</p>
</li> -->
<% end %> <% end %>
<li> <li>
<!-- <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete"> <!-- <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">

2
app/views/layouts/login_dashboard.html.erb
View File

@@ -122,7 +122,7 @@
</ul> </ul>
<div class="tab-content" style="max-height:550px; overflow:auto"> <div class="tab-content" style="max-height:650px; overflow:auto">
<% @roles.each do |role| %> <% @roles.each do |role| %>
<%if role != "administrator" %> <%if role != "administrator" %>