Home Explore Help
Sign In
SMusatov
/
zammad
mirror of https://github.com/zammad/zammad.git
1
0
Fork 0
Files
Browse Source

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

Martin Edenhofer 8 years ago
parent
afc1e1dc9b ea30b734ad
commit
c2e0279592
2 changed files with 2 additions and 0 deletions
Split View Show Diff Stats
  1. 1 0
      app/assets/stylesheets/zammad.scss
  2. 1 0
      app/views/layouts/application.html.erb

+ 1 - 0
app/assets/stylesheets/zammad.scss
View File 

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

+ 1 - 0
app/views/layouts/application.html.erb
View File 

@@ -2,6 +2,7 @@
 
 <html>
 
 <head>
 
   <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>
 
   <%= stylesheet_link_tag "application", :media => 'all' %>
 
   <%= stylesheet_link_tag "application-print", :media => 'print' %>