Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

load application.css for all media

Browse source
This commit is contained in:
Felix Niklas 2016-03-14 16:44:28 +01:00
parent 661c83d574
commit b0ac1ddc1e
4 changed files with 23 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/app/views/generic/table.jst.eco
View file

@ -2,10 +2,10 @@
<thead> <thead>
<tr> <tr>
<% if @sortable: %> <% if @sortable: %>
<th style="width: 36px"></th> <th style="width: 36px" class="table-draggable"></th>
<% end %> <% end %>
<% if @checkbox: %> <% if @checkbox: %>
<th style="width: 40px" class="no-padding"> <th style="width: 40px" class="table-checkbox">
<label class="checkbox-replacement"> <label class="checkbox-replacement">
<input type="checkbox" value="" name="bulk_all"> <input type="checkbox" value="" name="bulk_all">
<%- @Icon('checkbox', 'icon-unchecked') %> <%- @Icon('checkbox', 'icon-unchecked') %>
@ -14,7 +14,7 @@
</th> </th>
<% end %> <% end %>
<% if @radio: %> <% if @radio: %>
<th style="width: 40px" class="no-padding"></th> <th style="width: 40px" class="table-radio"></th>
<% end %> <% end %>
<% for item, i in @header: %> <% for item, i in @header: %>
<th class="js-tableHead<%= " #{ item.className }" if item.className %><%= " align-#{ item.align }" if item.align %>" style="width:<%= item.displayWidth %>px" data-column-key="<%= item.name %>"> <th class="js-tableHead<%= " #{ item.className }" if item.className %><%= " align-#{ item.align }" if item.align %>" style="width:<%= item.displayWidth %>px" data-column-key="<%= item.name %>">
@ -53,10 +53,10 @@
<% position++ %> <% position++ %>
<tr class="item<%= ' is-inactive' if object.active is false %>" data-id="<%= object.id %>" data-position="<%= position %>" > <tr class="item<%= ' is-inactive' if object.active is false %>" data-id="<%= object.id %>" data-position="<%= position %>" >
<% if @sortable: %> <% if @sortable: %>
<td><%- @Icon('draggable') %></td> <td class="table-draggable"><%- @Icon('draggable') %></td>
<% end %> <% end %>
<% if @checkbox: %> <% if @checkbox: %>
<td class="no-padding"> <td class="table-checkbox">
<label class="checkbox-replacement"> <label class="checkbox-replacement">
<input type="checkbox" value="<%= object.id %>" name="bulk"> <input type="checkbox" value="<%= object.id %>" name="bulk">
<%- @Icon('checkbox', 'icon-unchecked') %> <%- @Icon('checkbox', 'icon-unchecked') %>
@ -65,7 +65,7 @@
</td> </td>
<% end %> <% end %>
<% if @radio: %> <% if @radio: %>
<td class="no-padding"> <td class="table-radio">
<label class="radio-replacement"> <label class="radio-replacement">
<input type="radio" value="<%= object.id %>" name="radio"> <input type="radio" value="<%= object.id %>" name="radio">
<%- @Icon('radio', 'icon-unchecked') %> <%- @Icon('radio', 'icon-unchecked') %>

34
app/assets/stylesheets/print.scss
View file

@ -1,15 +1,14 @@
#app > *:not(.content):not(.active), #app > *:not(.content):not(.active),
#app > .hide, #app > .hide {
.icon,
.btn,
.avatar {
display: none; display: none;
} }
.table { .table {
margin: 1em 0; border: 1px solid hsl(0,0%,90%);
border: 1px solid; }
padding: 1em;
.table thead tr {
border-bottom: 1px solid hsl(0,0%,90%);
} }
/* /*
@ -32,7 +31,8 @@
.bulkAction, .bulkAction,
.overviews .checkbox-replacement, .overviews .checkbox-replacement,
.overviews .overview-header { .overviews .overview-header,
.table-checkbox {
display: none; display: none;
} }
@ -53,22 +53,8 @@
display: none; display: none;
} }
.ticket-title { .tabsSidebar-sidebarSpacer {
font-size: 2em; margin-right: 0;
}
.ticket-article-item {
margin: 1em 0;
border: 1px solid;
padding: 1em;
}
.article-meta-value {
font-weight: bold;
}
.article-content {
margin: 0.5em 0;
} }
.article-meta .article-meta-key { .article-meta .article-meta-key {

5
app/assets/stylesheets/zammad.scss
View file

@ -930,6 +930,11 @@ th.align-right {
fill: hsl(240,1%,77%); fill: hsl(240,1%,77%);
} }
.table-checkbox,
.table-radio {
padding: 0 !important;
}
.table .table-sort-arrow { .table .table-sort-arrow {
opacity: 1; opacity: 1;
fill: hsl(206,7%,33%); fill: hsl(206,7%,33%);

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

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title><%= Setting.get('product_name') %></title> <title><%= Setting.get('product_name') %></title>
<%= stylesheet_link_tag "application" %> <%= stylesheet_link_tag "application", :media => 'all' %>
<%= stylesheet_link_tag "application-print", :media => 'print' %> <%= stylesheet_link_tag "application-print", :media => 'print' %>
<% if Rails.configuration.assets.debug %> <% if Rails.configuration.assets.debug %>
<%= javascript_include_tag "application" %> <%= javascript_include_tag "application" %>