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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2016-06-03 21:01:39 +02:00
commit c2e0279592
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3440,6 +3440,7 @@ footer {
display: inline-block; display: inline-block;
vertical-align: bottom; vertical-align: bottom;
position: relative; position: relative;
flex-shrink: 0;
&.size-30 { &.size-30 {
width: 30px; width: 30px;

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

@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0;">
<title><%= Setting.get('product_name') %></title> <title><%= Setting.get('product_name') %></title>
<%= stylesheet_link_tag "application", :media => 'all' %> <%= stylesheet_link_tag "application", :media => 'all' %>
<%= stylesheet_link_tag "application-print", :media => 'print' %> <%= stylesheet_link_tag "application-print", :media => 'print' %>