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

fixed conflic app.css

Browse Source
This commit is contained in:
Aung Myo
2017-10-13 15:58:06 +06:30
parent ae482b91f9 9a761e5402
commit 37d84c5361
11 changed files with 167 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,15 @@
<!-- <i class="material-icons">keyboard_arrow_down</i> -->
</a>
<ul class="dropdown-menu">
<!-- For Translation
<li>
<div class="switch">
<label>
<input type="checkbox" id="localize">
မြန်မာ
</label>
</div>
</li> -->
<li>
<%= link_to (t :logout),logout_path, method: :delete, data: {confirm: 'Are you sure?'} %>
<!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a> -->

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

@@ -19,7 +19,7 @@
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>
<body class="theme-blue">
<body class="theme-red">
<!-- Page Loader -->
<div class="page-loader-wrapper">
<div class="loader">

8
app/views/settings/zones/index.html.erb
View File

@@ -10,7 +10,7 @@
</div>
<br>
<div class="m-b-10 clearfix">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
<%= link_to t('.new', :default => t("views.btn.new")),new_settings_zone_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div>
<div class="row">
@@ -37,9 +37,9 @@
<td><%= settings_zone.created_by %></td>
<% end %>
<td>
<%= link_to 'Show', settings_zone_path(settings_zone),:class => 'btn btn-info btn-lg waves-effect' %>
<%= link_to 'Edit', edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %>
<%= link_to 'Destroy', settings_zone_path(settings_zone), :class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %>
<%= link_to (t :show), settings_zone_path(settings_zone),:class => 'btn btn-info btn-lg waves-effect' %>
<%= link_to (t :edit), edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %>
<%= link_to (t :destroy), settings_zone_path(settings_zone), :class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %>
</td>
</tr>
<% end %>