summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-07-07 00:31:59 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-07-09 01:43:46 -0400
commit6591485562ef590f27e3ddd3025adb8a30b8ca09 (patch)
tree6068f4fa8d84b4d9c3cc5a3048a29080e9253551
parent41e6b8d8d8bb183e9313219aa65ea6a786c76133 (diff)
downloadgitlab-ce-6591485562ef590f27e3ddd3025adb8a30b8ca09.tar.gz
Add Safari/iOS versions of the logo
-rw-r--r--app/assets/images/touch-icon-ipad-retina.pngbin0 -> 6959 bytes
-rw-r--r--app/assets/images/touch-icon-ipad.pngbin0 -> 3615 bytes
-rw-r--r--app/assets/images/touch-icon-iphone-retina.pngbin0 -> 5145 bytes
-rw-r--r--app/assets/images/touch-icon-iphone.pngbin0 -> 2827 bytes
-rw-r--r--app/views/layouts/_head.html.haml15
5 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/images/touch-icon-ipad-retina.png b/app/assets/images/touch-icon-ipad-retina.png
new file mode 100644
index 00000000000..eb8a3f09f37
--- /dev/null
+++ b/app/assets/images/touch-icon-ipad-retina.png
Binary files differ
diff --git a/app/assets/images/touch-icon-ipad.png b/app/assets/images/touch-icon-ipad.png
new file mode 100644
index 00000000000..d0e191ea75d
--- /dev/null
+++ b/app/assets/images/touch-icon-ipad.png
Binary files differ
diff --git a/app/assets/images/touch-icon-iphone-retina.png b/app/assets/images/touch-icon-iphone-retina.png
new file mode 100644
index 00000000000..482763186df
--- /dev/null
+++ b/app/assets/images/touch-icon-iphone-retina.png
Binary files differ
diff --git a/app/assets/images/touch-icon-iphone.png b/app/assets/images/touch-icon-iphone.png
new file mode 100644
index 00000000000..cf4cc583022
--- /dev/null
+++ b/app/assets/images/touch-icon-iphone.png
Binary files differ
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index dbc68c39bf1..64ae33619e6 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -7,14 +7,25 @@
%title= page_title
= favicon_link_tag 'favicon.ico'
- = stylesheet_link_tag "application", :media => "all"
- = stylesheet_link_tag "print", :media => "print"
+
+ = stylesheet_link_tag "application", media: "all"
+ = stylesheet_link_tag "print", media: "print"
+
= javascript_include_tag "application"
+
= csrf_meta_tags
+
= include_gon
+
%meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'}
%meta{name: 'theme-color', content: '#474D57'}
+ -# Apple Safari/iOS home screen icons
+ = favicon_link_tag 'touch-icon-iphone.png', rel: 'apple-touch-icon'
+ = favicon_link_tag 'touch-icon-ipad.png', rel: 'apple-touch-icon', sizes: '76x76'
+ = favicon_link_tag 'touch-icon-iphone-retina.png', rel: 'apple-touch-icon', sizes: '120x120'
+ = favicon_link_tag 'touch-icon-ipad-retina.png', rel: 'apple-touch-icon', sizes: '152x152'
+
= yield :meta_tags
= render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id')