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

updating

Browse Source
This commit is contained in:
Yan
2017-10-03 18:44:27 +06:30
parent c28751a8e0
commit add2c26722
6 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/BSBMaterial/style.css
View File

@@ -2363,7 +2363,7 @@
/* General ===================================== */ /* General ===================================== */
body { body {
background-color: #e9e9e9; /*background-color: #e9e9e9;*/
-moz-transition: all 0.5s; -moz-transition: all 0.5s;
-o-transition: all 0.5s; -o-transition: all 0.5s;
-webkit-transition: all 0.5s; -webkit-transition: all 0.5s;
@@ -5156,7 +5156,7 @@ fieldset[disabled] .form-control {
-moz-border-radius: 0; -moz-border-radius: 0;
-ms-border-radius: 0; -ms-border-radius: 0;
border-radius: 0; border-radius: 0;
background-color: transparent; /*background-color: transparent;*/
font-size: 13px; font-size: 13px;
margin-bottom: 10px; } margin-bottom: 10px; }
.breadcrumb li a { .breadcrumb li a {

16
app/assets/stylesheets/application.scss
View File

@@ -75,3 +75,19 @@ section.content {
margin-bottom: 20px; margin-bottom: 20px;
} }
.checkbox label, label.checkbox-inline {
padding-left: 0;
}
.checkbox label input[type=checkbox], label.checkbox-inline input[type=checkbox] {
position: relative;
left: 0;
z-index: -1;
width: 13px;
height: 13px;
margin: 5px 5px 0 0;
overflow: hidden;
pointer-events: none;
opacity: 1;
}

9
app/views/settings/zones/edit.html.erb
View File

@@ -1,9 +1,12 @@
<div class="span12"> <div class="span12">
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li><a href="<%= settings_zones_path %>">Zones</a></li> <li class="breadcrumb-item"><a href="<%= settings_zones_path %>">Zones</a></li>
<li>Edit</li> <li class="breadcrumb-item active">Edit</li>
<span class="float-right">
<%= link_to 'Back', settings_zones_path %>
</span>
</ul> </ul>
</div> </div>
<%= render 'form', settings_zone: @settings_zone %> <%= render 'form', settings_zone: @settings_zone %>

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

@@ -1,15 +1,19 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li>Zones</li> <li class="breadcrumb-item active">Zones</li>
<span style="float: right"> <span class="float-right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_path,:class => 'btn btn-primary btn-sm' %> <%= link_to 'Back', dashboard_path %>
</span> </span>
</ul> </ul>
</div> </div>
<br />
<div class="m-b-10 clearfix">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_path,:class => 'btn btn-outline-primary float-right' %>
</div>
<br>
<div class="card"> <div class="card">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>

13
app/views/settings/zones/new.html.erb
View File

@@ -1,4 +1,15 @@
<h1>New Settings Zone</h1> <div class="page-header">
<ul class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= settings_zones_path %>">Zones</a></li>
<li class="breadcrumb-item active">Details</li>
<span class="float-right">
<%= link_to 'Back', settings_zones_path %>
</span>
</ul>
</div>
<h3>New Settings Zone</h3>
<%= render 'form', settings_zone: @settings_zone %> <%= render 'form', settings_zone: @settings_zone %>

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

@@ -1,9 +1,9 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li><a href="<%= settings_zones_path %>">Zones</a></li> <li class="breadcrumb-item"><a href="<%= settings_zones_path %>">Zones</a></li>
<li>Details</li> <li class="breadcrumb-item active">Details</li>
<span style="float: right"> <span class="float-right">
<%= link_to 'Back', settings_zones_path %> <%= link_to 'Back', settings_zones_path %>
</span> </span>
</ul> </ul>